Commit 76ed6264 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/phy/aquantia/aquantia.h
  21934375 ("net: phy: aquantia: add missing include guards")
  61578f67 ("net: phy: aquantia: add support for PHY LEDs")

drivers/net/ethernet/wangxun/libwx/wx_hw.c
  bd07a981 ("net: txgbe: remove separate irq request for MSI and INTx")
  b501d261 ("net: txgbe: add FDIR ATR support")
https://lore.kernel.org/all/20240703112936.483c1975@canb.auug.org.au/

include/linux/mlx5/mlx5_ifc.h
  048a4036 ("net/mlx5: IFC updates for changing max EQs")
  99be5617 ("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
  4130c67c ("wifi: iwlwifi: mvm: check vif for NULL/ERR_PTR before dereference")
  3f312651 ("wifi: iwlwifi: mvm: add mvm-specific guard")

include/net/mac80211.h
  816c6bec ("wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP")
  5a009b42 ("wifi: mac80211: track changes in AP's TPE")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7829b376 033771c0

Documentation/admin-guide/kernel-parameters.txt

+0 −19
Original line number Diff line number Diff line
@@ -788,25 +788,6 @@ 
			Documentation/networking/netconsole.rst for an

			alternative.



		<DEVNAME>:<n>.<n>[,options]

			Use the specified serial port on the serial core bus.

			The addressing uses DEVNAME of the physical serial port

			device, followed by the serial core controller instance,

			and the serial port instance. The options are the same

			as documented for the ttyS addressing above.



			The mapping of the serial ports to the tty instances

			can be viewed with:



			$ ls -d /sys/bus/serial-base/devices/*:*.*/tty/*

			/sys/bus/serial-base/devices/00:04:0.0/tty/ttyS0



			In the above example, the console can be addressed with

			console=00:04:0.0. Note that a console addressed this

			way will only get added when the related device driver

			is ready. The use of an earlycon parameter in addition to

			the console may be desired for console output early on.



		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio16,<addr>[,options]

Documentation/driver-api/cxl/memory-devices.rst

+15 −0
Original line number Diff line number Diff line
@@ -328,6 +328,12 @@ CXL Memory Device 
.. kernel-doc:: drivers/cxl/mem.c

   :doc: cxl mem



.. kernel-doc:: drivers/cxl/cxlmem.h

   :internal:



.. kernel-doc:: drivers/cxl/core/memdev.c

   :identifiers:



CXL Port

--------

.. kernel-doc:: drivers/cxl/port.c
@@ -341,6 +347,15 @@ CXL Core 
.. kernel-doc:: drivers/cxl/cxl.h

   :internal:



.. kernel-doc:: drivers/cxl/core/hdm.c

   :doc: cxl core hdm



.. kernel-doc:: drivers/cxl/core/hdm.c

   :identifiers:



.. kernel-doc:: drivers/cxl/core/cdat.c

   :identifiers:



.. kernel-doc:: drivers/cxl/core/port.c

   :doc: cxl core

Documentation/kbuild/modules.rst

+4 −4
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ executed to make module versioning work. 


	modules_install

		Install the external module(s). The default location is

		/lib/modules/<kernel_release>/extra/, but a prefix may

		/lib/modules/<kernel_release>/updates/, but a prefix may

		be added with INSTALL_MOD_PATH (discussed in section 5).



	clean
@@ -417,7 +417,7 @@ directory: 


And external modules are installed in:



	/lib/modules/$(KERNELRELEASE)/extra/

	/lib/modules/$(KERNELRELEASE)/updates/



5.1 INSTALL_MOD_PATH

--------------------
@@ -438,10 +438,10 @@ And external modules are installed in: 
-------------------



	External modules are by default installed to a directory under

	/lib/modules/$(KERNELRELEASE)/extra/, but you may wish to

	/lib/modules/$(KERNELRELEASE)/updates/, but you may wish to

	locate modules for a specific functionality in a separate

	directory. For this purpose, use INSTALL_MOD_DIR to specify an

	alternative name to "extra."::

	alternative name to "updates."::



		$ make INSTALL_MOD_DIR=gandalf -C $KDIR \

		       M=$PWD modules_install

Documentation/userspace-api/ioctl/ioctl-number.rst

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ Code Seq# Include File Comments 
'Q'   all    linux/soundcard.h

'R'   00-1F  linux/random.h                                          conflict!

'R'   01     linux/rfkill.h                                          conflict!

'R'   20-2F  linux/trace_mmap.h

'R'   C0-DF  net/bluetooth/rfcomm.h

'R'   E0     uapi/linux/fsl_mc.h

'S'   all    linux/cdrom.h                                           conflict!

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ M: Joerg Roedel <joro@8bytes.org> 
R:	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

L:	iommu@lists.linux.dev

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git

F:	drivers/iommu/amd/

F:	include/linux/amd-iommu.h








@@ -11157,7 +11157,7 @@ M:	David Woodhouse <dwmw2@infradead.org>







M:	Lu Baolu <baolu.lu@linux.intel.com>









L:	iommu@lists.linux.dev









S:	Supported









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git









F:	drivers/iommu/intel/

















INTEL IPU3 CSI-2 CIO2 DRIVER








@@ -11530,7 +11530,7 @@ IOMMU DMA-API LAYER







M:	Robin Murphy <robin.murphy@arm.com>









L:	iommu@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git









F:	drivers/iommu/dma-iommu.c









F:	drivers/iommu/dma-iommu.h









F:	drivers/iommu/iova.c








@@ -11542,7 +11542,7 @@ M:	Will Deacon <will@kernel.org>







R:	Robin Murphy <robin.murphy@arm.com>









L:	iommu@lists.linux.dev









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git









F:	Documentation/devicetree/bindings/iommu/









F:	Documentation/userspace-api/iommu.rst









F:	drivers/iommu/








@@ -19324,7 +19324,7 @@ F:	drivers/perf/riscv_pmu_legacy.c







F:	drivers/perf/riscv_pmu_sbi.c

















RISC-V THEAD SoC SUPPORT









M:	Jisheng Zhang <jszhang@kernel.org>









M:	Drew Fustini <drew@pdp7.com>









M:	Guo Ren <guoren@kernel.org>









M:	Fu Wei <wefu@redhat.com>









L:	linux-riscv@lists.infradead.org