Merge branch 'for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup into for-7.1 (a0b0f6c7) · Commits · git / linux-net

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -353,6 +353,7 @@ Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@opinsys.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>
		Jason Xing <kerneljasonxing@gmail.com> <kernelxing@tencent.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
		@@ -401,6 +402,7 @@ Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
		Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
		Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
		Jishnu Prakash <quic_jprakash@quicinc.com> <jprakash@codeaurora.org>
		Joe Damato <joe@dama.to> <jdamato@fastly.com>
		Joel Granados <joel.granados@kernel.org> <j.granados@samsung.com>
		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -1242,6 +1242,10 @@ N: Veaceslav Falico
		E: vfalico@gmail.com
		D: Co-maintainer and co-author of the network bonding driver.

		N: Thomas Falcon
		E: tlfalcon@linux.ibm.com
		D: Initial author of the IBM ibmvnic network driver

		N: János Farkas
		E: chexum@shadow.banki.hu
		D: romfs, various (mostly networking) fixes
		@@ -2415,6 +2419,10 @@ S: Am Muehlenweg 38
		S: D53424 Remagen
		S: Germany

		N: Jonathan Lemon
		E: jonathan.lemon@gmail.com
		D: OpenCompute PTP clock driver (ptp_ocp)

		N: Colin Leroy
		E: colin@colino.net
		W: http://www.geekounet.org/

Documentation/devicetree/bindings/net/can/nxp,sja1000.yaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ required:

		allOf:
		- $ref: can-controller.yaml#
		- $ref: /schemas/memory-controllers/mc-peripheral-props.yaml
		- if:
		properties:
		compatible:

MAINTAINERS

+6 −20

Original line number	Diff line number	Diff line
		@@ -993,10 +993,8 @@ F: Documentation/devicetree/bindings/thermal/amazon,al-thermal.yaml
		F: drivers/thermal/thermal_mmio.c

		AMAZON ETHERNET DRIVERS
		M: Shay Agroskin <shayagr@amazon.com>
		M: Arthur Kiyanovski <akiyano@amazon.com>
		R: David Arinzon <darinzon@amazon.com>
		R: Saeed Bishara <saeedb@amazon.com>
		M: David Arinzon <darinzon@amazon.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/networking/device_drivers/ethernet/amazon/ena.rst
		@@ -4617,7 +4615,6 @@ F: drivers/bluetooth/

		BLUETOOTH SUBSYSTEM
		M: Marcel Holtmann <marcel@holtmann.org>
		M: Johan Hedberg <johan.hedberg@gmail.com>
		M: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
		L: linux-bluetooth@vger.kernel.org
		S: Supported
		@@ -10171,8 +10168,8 @@ F: drivers/i2c/busses/i2c-cpm.c

		FREESCALE IMX / MXC FEC DRIVER
		M: Wei Fang <wei.fang@nxp.com>
		R: Frank Li <frank.li@nxp.com>
		R: Shenwei Wang <shenwei.wang@nxp.com>
		R: Clark Wang <xiaoning.wang@nxp.com>
		L: imx@lists.linux.dev
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -10484,7 +10481,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
		F: Documentation/trace/ftrace*
		F: arch////ftrace*
		F: arch///ftrace
		F: include/*/ftrace.h
		F: include//ftrace*
		F: kernel/trace/fgraph.c
		F: kernel/trace/ftrace*
		F: samples/ftrace
		@@ -12216,7 +12213,6 @@ IBM Power SRIOV Virtual NIC Device Driver
		M: Haren Myneni <haren@linux.ibm.com>
		M: Rick Lindsley <ricklind@linux.ibm.com>
		R: Nick Child <nnac123@linux.ibm.com>
		R: Thomas Falcon <tlfalcon@linux.ibm.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/ethernet/ibm/ibmvnic.*
		@@ -15375,10 +15371,8 @@ F: drivers/crypto/marvell/
		F: include/linux/soc/marvell/octeontx2/

		MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
		M: Mirko Lindner <mlindner@marvell.com>
		M: Stephen Hemminger <stephen@networkplumber.org>
		L: netdev@vger.kernel.org
		S: Odd fixes
		S: Orphan
		F: drivers/net/ethernet/marvell/sk*

		MARVELL LIBERTAS WIRELESS DRIVER
		@@ -15475,7 +15469,6 @@ MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER
		M: Sunil Goutham <sgoutham@marvell.com>
		M: Linu Cherian <lcherian@marvell.com>
		M: Geetha sowjanya <gakula@marvell.com>
		M: Jerin Jacob <jerinj@marvell.com>
		M: hariprasad <hkelam@marvell.com>
		M: Subbaraya Sundeep <sbhatta@marvell.com>
		L: netdev@vger.kernel.org
		@@ -15490,7 +15483,7 @@ S: Supported
		F: drivers/perf/marvell_pem_pmu.c

		MARVELL PRESTERA ETHERNET SWITCH DRIVER
		M: Taras Chornyi <taras.chornyi@plvision.eu>
		M: Elad Nachman <enachman@marvell.com>
		S: Supported
		W: https://github.com/Marvell-switching/switchdev-prestera
		F: drivers/net/ethernet/marvell/prestera/
		@@ -16164,7 +16157,6 @@ F: drivers/dma/mediatek/

		MEDIATEK ETHERNET DRIVER
		M: Felix Fietkau <nbd@nbd.name>
		M: Sean Wang <sean.wang@mediatek.com>
		M: Lorenzo Bianconi <lorenzo@kernel.org>
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -16357,8 +16349,6 @@ F: include/soc/mediatek/smi.h
		MEDIATEK SWITCH DRIVER
		M: Chester A. Unal <chester.a.unal@arinc9.com>
		M: Daniel Golle <daniel@makrotopia.org>
		M: DENG Qingfang <dqfext@gmail.com>
		M: Sean Wang <sean.wang@mediatek.com>
		L: netdev@vger.kernel.org
		S: Maintained
		F: drivers/net/dsa/mt7530-mdio.c
		@@ -19226,8 +19216,6 @@ F: tools/objtool/

		OCELOT ETHERNET SWITCH DRIVER
		M: Vladimir Oltean <vladimir.oltean@nxp.com>
		M: Claudiu Manoil <claudiu.manoil@nxp.com>
		M: Alexandre Belloni <alexandre.belloni@bootlin.com>
		M: UNGLinuxDriver@microchip.com
		L: netdev@vger.kernel.org
		S: Supported
		@@ -19813,7 +19801,6 @@ F: arch/*/boot/dts/
		F: include/dt-bindings/

		OPENCOMPUTE PTP CLOCK DRIVER
		M: Jonathan Lemon <jonathan.lemon@gmail.com>
		M: Vadim Fedorenko <vadim.fedorenko@linux.dev>
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -21457,9 +21444,8 @@ S: Supported
		F: drivers/scsi/qedi/

		QLOGIC QL4xxx ETHERNET DRIVER
		M: Manish Chopra <manishc@marvell.com>
		L: netdev@vger.kernel.org
		S: Maintained
		S: Orphan
		F: drivers/net/ethernet/qlogic/qed/
		F: drivers/net/ethernet/qlogic/qede/
		F: include/linux/qed/

crypto/Kconfig

+0 −9

Original line number	Diff line number	Diff line
		@@ -876,8 +876,6 @@ config CRYPTO_BLAKE2B
		- blake2b-384
		- blake2b-512

		Used by the btrfs filesystem.

		See https://blake2.net for further information.

		config CRYPTO_CMAC
		@@ -965,7 +963,6 @@ config CRYPTO_SHA256
		10118-3), including HMAC support.

		This is required for IPsec AH (XFRM_AH) and IPsec ESP (XFRM_ESP).
		Used by the btrfs filesystem, Ceph, NFS, and SMB.

		config CRYPTO_SHA512
		tristate "SHA-384 and SHA-512"
		@@ -1039,8 +1036,6 @@ config CRYPTO_XXHASH

		Extremely fast, working at speeds close to RAM limits.

		Used by the btrfs filesystem.

		endmenu

		menu "CRCs (cyclic redundancy checks)"
		@@ -1058,8 +1053,6 @@ config CRYPTO_CRC32C
		on Communications, Vol. 41, No. 6, June 1993, selected for use with
		iSCSI.

		Used by btrfs, ext4, jbd2, NVMeoF/TCP, and iSCSI.

		config CRYPTO_CRC32
		tristate "CRC32"
		select CRYPTO_HASH
		@@ -1067,8 +1060,6 @@ config CRYPTO_CRC32
		help
		CRC32 CRC algorithm (IEEE 802.3)

		Used by RoCEv2 and f2fs.

		endmenu

		menu "Compression"