Commit 1118aa4c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

net/wireless/nl80211.c
  b27f07c5 ("wifi: nl80211: fix puncturing bitmap policy")
  cbbaf2bb ("wifi: nl80211: add a command to enable/disable HW timestamping")
https://lore.kernel.org/all/20230314105421.3608efae@canb.auug.org.au



tools/testing/selftests/net/Makefile
  62199e3f ("selftests: net: Add VXLAN MDB test")
  13715acf ("selftest: Add test for bind() conflicts.")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 79a22238 478a351c

.mailmap

+9 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru> 
Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>

Alexandre Ghiti <alex@ghiti.fr> <alexandre.ghiti@canonical.com>

Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
@@ -121,7 +122,7 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dikshita Agarwal <dikshita@qti.qualcomm.com> <dikshita@codeaurora.org>

Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
@@ -136,6 +137,9 @@ Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com> 
Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@intel.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason.ekstrand@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Felix Kuhling <fxkuehl@gmx.de>

Felix Moeller <felix@derklecks.de>
@@ -191,6 +195,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com> 
Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
@@ -210,6 +215,9 @@ Jens Axboe <axboe@suse.de> 
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>

Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>

Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>

Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>

Documentation/ABI/stable/sysfs-block

+9 −0
Original line number Diff line number Diff line
@@ -705,6 +705,15 @@ Description: 
		zoned will report "none".





What:		/sys/block/<disk>/hidden

Date:		March 2023

Contact:	linux-block@vger.kernel.org

Description:

		[RO] the block device is hidden. it doesn’t produce events, and

		can’t be opened from userspace or using blkdev_get*.

		Used for the underlying components of multipath devices.





What:		/sys/block/<disk>/stat

Date:		February 2008

Contact:	Jerome Marchand <jmarchan@redhat.com>

Documentation/driver-api/vfio.rst

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ group and can access them as follows:: 
VFIO User API

-------------------------------------------------------------------------------



Please see include/linux/vfio.h for complete API documentation.

Please see include/uapi/linux/vfio.h for complete API documentation.



VFIO bus driver API

-------------------------------------------------------------------------------

Documentation/filesystems/ext4/blockgroup.rst

+3 −3
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ descriptors. Instead, the superblock and a single block group descriptor 
block is placed at the beginning of the first, second, and last block

groups in a meta-block group. A meta-block group is a collection of

block groups which can be described by a single block group descriptor

block. Since the size of the block group descriptor structure is 32

bytes, a meta-block group contains 32 block groups for filesystems with

a 1KB block size, and 128 block groups for filesystems with a 4KB

block. Since the size of the block group descriptor structure is 64

bytes, a meta-block group contains 16 block groups for filesystems with

a 1KB block size, and 64 block groups for filesystems with a 4KB

blocksize. Filesystems can either be created using this new block group

descriptor layout, or existing filesystems can be resized on-line, and

the field s_first_meta_bg in the superblock will indicate the first

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ defined: 
	return

	-ECHILD and it will be called again in ref-walk mode.



``_weak_revalidate``

``d_weak_revalidate``

	called when the VFS needs to revalidate a "jumped" dentry.  This

	is called when a path-walk ends at dentry that was not acquired

	by doing a lookup in the parent directory.  This includes "/",