Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/phy/aquantia/aquantia.h 219343755eae ("net: phy: aquantia: add missing include guards") 61578f679378 ("net: phy: aquantia: add support for PHY LEDs") drivers/net/ethernet/wangxun/libwx/wx_hw.c bd07a9817846 ("net: txgbe: remove separate irq request for MSI and INTx") b501d261a5b3 ("net: txgbe: add FDIR ATR support") https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/ include/linux/mlx5/mlx5_ifc.h 048a403648fc ("net/mlx5: IFC updates for changing max EQs") 99be56171fa9 ("net/mlx5e: SHAMPO, Re-enable HW-GRO") https://lore.kernel.org/all/20240701133951.6926b2e3@canb.auug.org.au/ Adjacent changes: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 4130c67cd123 ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference") 3f3126515fbe ("wifi: iwlwifi: mvm: add mvm-specific guard") include/net/mac80211.h 816c6bec09ed ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP") 5a009b42e041 ("wifi: mac80211: track changes in AP's TPE")
Showing the changes to scripts (5 of 348 files). Show all
Unified · Split
| @@ -17,7 +17,7 @@ include $(srctree)/scripts/Kbuild.include · 16 unmodified lines | |||
| 17 | dst := $(INSTALL_DTBS_PATH) | 17 | dst := $(INSTALL_DTBS_PATH) |
| 18 | 18 | ||
| 19 | quiet_cmd_dtb_install = INSTALL $@ | 19 | quiet_cmd_dtb_install = INSTALL $@ |
| 20 | cmd_dtb_install = install -D $< $@ | 20 | cmd_dtb_install = install -D -m 0644 $< $@ |
| 21 | 21 | ||
| 22 | $(dst)/%: $(obj)/% | 22 | $(dst)/%: $(obj)/% |
| 23 | $(call cmd,dtb_install) | 23 | $(call cmd,dtb_install) |
| @@ -146,7 +146,7 @@ $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) · 145 unmodified lines | |||
| 146 | # Create .o file from a single .cc (C++) file | 146 | # Create .o file from a single .cc (C++) file |
| 147 | quiet_cmd_host-cxxobjs = HOSTCXX $@ | 147 | quiet_cmd_host-cxxobjs = HOSTCXX $@ |
| 148 | cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $< | 148 | cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $< |
| 149 | $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE | 149 | $(host-cxxobjs): $(obj)/%.o: $(obj)/%.cc FORCE |
| 150 | $(call if_changed_dep,host-cxxobjs) | 150 | $(call if_changed_dep,host-cxxobjs) |
| 151 | 151 | ||
| 152 | # Create executable from a single Rust crate (which may consist of | 152 | # Create executable from a single Rust crate (which may consist of |
| @@ -103,7 +103,7 @@ debian-orig: private version = $(shell dpkg-parsechangelog -S Version | sed 's/- · 102 unmodified lines | |||
| 103 | debian-orig: private orig-name = $(source)_$(version).orig.tar$(debian-orig-suffix) | 103 | debian-orig: private orig-name = $(source)_$(version).orig.tar$(debian-orig-suffix) |
| 104 | debian-orig: mkdebian-opts = --need-source | 104 | debian-orig: mkdebian-opts = --need-source |
| 105 | debian-orig: linux.tar$(debian-orig-suffix) debian | 105 | debian-orig: linux.tar$(debian-orig-suffix) debian |
| 106 | $(Q)if [ "$(df --output=target .. 2>/dev/null)" = "$(df --output=target $< 2>/dev/null)" ]; then \ | 106 | $(Q)if [ "$$(df --output=target .. 2>/dev/null)" = "$$(df --output=target $< 2>/dev/null)" ]; then \ |
| 107 | ln -f $< ../$(orig-name); \ | 107 | ln -f $< ../$(orig-name); \ |
| 108 | else \ | 108 | else \ |
| 109 | cp $< ../$(orig-name); \ | 109 | cp $< ../$(orig-name); \ |
| @@ -5,7 +5,7 @@ ifdef building_out_of_srctree · 4 unmodified lines | |||
| 5 | symlinks := $(patsubst $(src)/%,%,$(wildcard $(src)/*.py)) | 5 | symlinks := $(patsubst $(src)/%,%,$(wildcard $(src)/*.py)) |
| 6 | 6 | ||
| 7 | quiet_cmd_symlink = SYMLINK $@ | 7 | quiet_cmd_symlink = SYMLINK $@ |
| 8 | cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(src)/%,$@) $@ | 8 | cmd_symlink = ln -fsn $(patsubst $(obj)/%,$(abspath $(src))/%,$@) $@ |
| 9 | 9 | ||
| 10 | always-y += $(symlinks) | 10 | always-y += $(symlinks) |
| 11 | $(addprefix $(obj)/, $(symlinks)): FORCE | 11 | $(addprefix $(obj)/, $(symlinks)): FORCE |
| @@ -57,7 +57,8 @@ patch -p1 < %{SOURCE2} · 56 unmodified lines | |||
| 57 | %install | 57 | %install |
| 58 | mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE} | 58 | mkdir -p %{buildroot}/lib/modules/%{KERNELRELEASE} |
| 59 | cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz | 59 | cp $(%{make} %{makeflags} -s image_name) %{buildroot}/lib/modules/%{KERNELRELEASE}/vmlinuz |
| 60 | %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} modules_install | 60 | # DEPMOD=true makes depmod no-op. We do not package depmod-generated files. |
| 61 | %{make} %{makeflags} INSTALL_MOD_PATH=%{buildroot} DEPMOD=true modules_install | ||
| 61 | %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install | 62 | %{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install |
| 62 | cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE} | 63 | cp System.map %{buildroot}/lib/modules/%{KERNELRELEASE} |
| 63 | cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config | 64 | cp .config %{buildroot}/lib/modules/%{KERNELRELEASE}/config |
| @@ -70,10 +71,7 @@ ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEA · 6 unmodified lines | |||
| 70 | %endif | 71 | %endif |
| 71 | 72 | ||
| 72 | { | 73 | { |
| 73 | for x in System.map config kernel modules.builtin \ | 74 | echo "/lib/modules/%{KERNELRELEASE}" |
| 74 | modules.builtin.modinfo modules.order vmlinuz; do | ||
| 75 | echo "/lib/modules/%{KERNELRELEASE}/${x}" | ||
| 76 | done | ||
| 77 | 75 | ||
| 78 | for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \ | 76 | for x in alias alias.bin builtin.alias.bin builtin.bin dep dep.bin \ |
| 79 | devname softdep symbols symbols.bin; do | 77 | devname softdep symbols symbols.bin; do |