Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (7611cbb9) · Commits · EulixOS / Software / Kernel

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
		Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
		Al Viro <viro@ftp.linux.org.uk>
		Al Viro <viro@zenIV.linux.org.uk>
		Andi Kleen <ak@linux.intel.com> <ak@suse.de>
		Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
		Andreas Herrmann <aherrman@de.ibm.com>
		Andrew Morton <akpm@linux-foundation.org>
		@@ -132,6 +133,7 @@ Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		@@ -178,6 +180,7 @@ Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
		Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
		Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ Description: read only
		This sysfs interface exposes the number of cores per chip
		present in the system.

		What: /sys/devices/hv_24x7/interface/cpumask
		What: /sys/devices/hv_24x7/cpumask
		Date: July 2020
		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
		Description: read only

Documentation/admin-guide/ext4.rst

+13 −10

Original line number	Diff line number	Diff line
		@@ -489,6 +489,9 @@ Files in /sys/fs/ext4/<devname>:
		multiple of this tuning parameter if the stripe size is not set in the
		ext4 superblock

		mb_max_inode_prealloc
		The maximum length of per-inode ext4_prealloc_space list.

		mb_max_to_scan
		The maximum number of extents the multiblock allocator will search to
		find the best extent.
		@@ -529,21 +532,21 @@ Files in /sys/fs/ext4/<devname>:
		Ioctls
		======

		There is some Ext4 specific functionality which can be accessed by applications
		through the system call interfaces. The list of all Ext4 specific ioctls are
		shown in the table below.
		Ext4 implements various ioctls which can be used by applications to access
		ext4-specific functionality. An incomplete list of these ioctls is shown in the
		table below. This list includes truly ext4-specific ioctls (``EXT4_IOC_*``) as
		well as ioctls that may have been ext4-specific originally but are now supported
		by some other filesystem(s) too (``FS_IOC_*``).

		Table of Ext4 specific ioctls
		Table of Ext4 ioctls

		EXT4_IOC_GETFLAGS
		FS_IOC_GETFLAGS
		Get additional attributes associated with inode. The ioctl argument is
		an integer bitfield, with bit values described in ext4.h. This ioctl is
		an alias for FS_IOC_GETFLAGS.
		an integer bitfield, with bit values described in ext4.h.

		EXT4_IOC_SETFLAGS
		FS_IOC_SETFLAGS
		Set additional attributes associated with inode. The ioctl argument is
		an integer bitfield, with bit values described in ext4.h. This ioctl is
		an alias for FS_IOC_SETFLAGS.
		an integer bitfield, with bit values described in ext4.h.

		EXT4_IOC_GETVERSION, EXT4_IOC_GETVERSION_OLD
		Get the inode i_generation number stored for each inode. The

Documentation/admin-guide/kernel-parameters.txt

+1 −4

Original line number	Diff line number	Diff line
		@@ -1233,8 +1233,7 @@
		efi= [EFI]
		Format: { "debug", "disable_early_pci_dma",
		"nochunk", "noruntime", "nosoftreserve",
		"novamap", "no_disable_early_pci_dma",
		"old_map" }
		"novamap", "no_disable_early_pci_dma" }
		debug: enable misc debug output.
		disable_early_pci_dma: disable the busmaster bit on all
		PCI bridges while in the EFI boot stub.
		@@ -1251,8 +1250,6 @@
		novamap: do not call SetVirtualAddressMap().
		no_disable_early_pci_dma: Leave the busmaster bit set
		on all PCI bridges while in the EFI boot stub
		old_map [X86-64]: switch to the old ioremap-based EFI
		runtime services mapping. [Needs CONFIG_X86_UV=y]

		efi_no_storage_paranoia [EFI; X86]
		Using this parameter you can use more than 50% of

Documentation/devicetree/bindings/clock/imx23-clock.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
		title: Clock bindings for Freescale i.MX23

		maintainers:
		- Shawn Guo <shawn.guo@linaro.org>
		- Shawn Guo <shawnguo@kernel.org>

		description: \|
		The clock consumer should specify the desired clock by having the clock