Merge tag 'v5.4-rc7' into android-mainline (682d8bf7) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
		Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>

Documentation/networking/tls-offload.rst

+4 −0

Original line number	Diff line number	Diff line
		@@ -436,6 +436,10 @@ by the driver:
		encryption.
		* ``tx_tls_ooo`` - number of TX packets which were part of a TLS stream
		but did not arrive in the expected order.
		* ``tx_tls_skip_no_sync_data`` - number of TX packets which were part of
		a TLS stream and arrived out-of-order, but skipped the HW offload routine
		and went to the regular transmit flow as they were retransmissions of the
		connection handshake.
		* ``tx_tls_drop_no_sync_data`` - number of TX packets which were part of
		a TLS stream dropped, because they arrived out of order and associated
		record could not be found.

MAINTAINERS

+12 −1

Original line number	Diff line number	Diff line
		@@ -3053,6 +3053,7 @@ M: Daniel Borkmann <daniel@iogearbox.net>
		R: Martin KaFai Lau <kafai@fb.com>
		R: Song Liu <songliubraving@fb.com>
		R: Yonghong Song <yhs@fb.com>
		R: Andrii Nakryiko <andriin@fb.com>
		L: netdev@vger.kernel.org
		L: bpf@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
		@@ -3737,7 +3738,6 @@ F: drivers/crypto/cavium/cpt/

		CAVIUM THUNDERX2 ARM64 SOC
		M: Robert Richter <rrichter@cavium.com>
		M: Jayachandran C <jnair@caviumnetworks.com>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm64/boot/dts/cavium/thunder2-99xx*
		@@ -10519,8 +10519,12 @@ F: mm/memblock.c
		F: Documentation/core-api/boot-time-mm.rst

		MEMORY MANAGEMENT
		M: Andrew Morton <akpm@linux-foundation.org>
		L: linux-mm@kvack.org
		W: http://www.linux-mm.org
		T: quilt https://ozlabs.org/~akpm/mmotm/
		T: quilt https://ozlabs.org/~akpm/mmots/
		T: git git://github.com/hnaz/linux-mm.git
		S: Maintained
		F: include/linux/mm.h
		F: include/linux/gfp.h
		@@ -17334,6 +17338,12 @@ F: include/linux/vbox_utils.h
		F: include/uapi/linux/vbox*.h
		F: drivers/virt/vboxguest/

		VIRTUAL BOX SHARED FOLDER VFS DRIVER:
		M: Hans de Goede <hdegoede@redhat.com>
		L: linux-fsdevel@vger.kernel.org
		S: Maintained
		F: drivers/staging/vboxsf/*

		VIRTUAL SERIO DEVICE DRIVER
		M: Stephen Chandler Paul <thatslyude@gmail.com>
		S: Maintained
		@@ -18034,6 +18044,7 @@ F: Documentation/vm/zsmalloc.rst
		ZSWAP COMPRESSED SWAP CACHING
		M: Seth Jennings <sjenning@redhat.com>
		M: Dan Streetman <ddstreet@ieee.org>
		M: Vitaly Wool <vitaly.wool@konsulko.com>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/zswap.c

Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 4
		SUBLEVEL = 0
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Kleptomaniac Octopus

		# DOCUMENTATION

arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,10 @@
		pinctrl-0 = <&pinctrl_pwm3>;
		};

		&snvs_pwrkey {
		status = "okay";
		};

		&ssi2 {
		status = "okay";
		};