Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37155447 authored by David S. Miller's avatar David S. Miller
Browse files

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



Merge net into net-next.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 629161f6 6c3c1eb3

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					READ_CAPACITY_16 command);

				f = NO_REPORT_OPCODES (don't use report opcodes

					command, uas only);

				g = MAX_SECTORS_240 (don't transfer more than

					240 sectors at a time, uas only);

				h = CAPACITY_HEURISTICS (decrease the

					reported device capacity by one

					sector if the number is odd);

Documentation/module-signing.txt

+3 −3
Original line number Diff line number Diff line
@@ -119,9 +119,9 @@ Most notably, in the x509.genkey file, the req_distinguished_name section 
should be altered from the default:



	[ req_distinguished_name ]

	O = Magrathea

	CN = Glacier signing key

	emailAddress = slartibartfast@magrathea.h2g2

	#O = Unspecified company

	CN = Build time autogenerated kernel key

	#emailAddress = unspecified.user@unspecified.company



The generated RSA key size can also be set with:

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10523,7 +10523,6 @@ F: include/linux/virtio_console.h 
F:	include/uapi/linux/virtio_console.h



VIRTIO CORE, NET AND BLOCK DRIVERS

M:	Rusty Russell <rusty@rustcorp.com.au>

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	virtualization@lists.linux-foundation.org

S:	Maintained

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ config ARM64 
	select GENERIC_EARLY_IOREMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

arch/arm64/include/asm/barrier.h

+16 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ do { \ 
do {									\

	compiletime_assert_atomic_type(*p);				\

	switch (sizeof(*p)) {						\

	case 1:								\

		asm volatile ("stlrb %w1, %0"				\

				: "=Q" (*p) : "r" (v) : "memory");	\

		break;							\

	case 2:								\

		asm volatile ("stlrh %w1, %0"				\

				: "=Q" (*p) : "r" (v) : "memory");	\

		break;							\

	case 4:								\

		asm volatile ("stlr %w1, %0"				\

				: "=Q" (*p) : "r" (v) : "memory");	\
@@ -81,6 +89,14 @@ do { \ 
	typeof(*p) ___p1;						\

	compiletime_assert_atomic_type(*p);				\

	switch (sizeof(*p)) {						\

	case 1:								\

		asm volatile ("ldarb %w0, %1"				\

			: "=r" (___p1) : "Q" (*p) : "memory");		\

		break;							\

	case 2:								\

		asm volatile ("ldarh %w0, %1"				\

			: "=r" (___p1) : "Q" (*p) : "memory");		\

		break;							\

	case 4:								\

		asm volatile ("ldar %w0, %1"				\

			: "=r" (___p1) : "Q" (*p) : "memory");		\