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

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

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

parents a2f0fad3 c8d17b45

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1481,6 +1481,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			By default, super page will be supported if Intel IOMMU

			has the capability. With this option, super page will

			not be supported.

		ecs_off [Default Off]

			By default, extended context tables will be supported if

			the hardware advertises that it has support both for the

			extended tables themselves, and also PASID support. With

			this option set, extended tables will not be used even

			on hardware which claims to support them.



	intel_idle.max_cstate=	[KNL,HW,ACPI,X86]

			0	disables intel_idle and fall back on acpi_idle.

Documentation/networking/udplite.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
	files/UDP-Lite-HOWTO.txt



   o The Wireshark UDP-Lite WiKi (with capture files):

       http://wiki.wireshark.org/Lightweight_User_Datagram_Protocol

       https://wiki.wireshark.org/Lightweight_User_Datagram_Protocol



   o The Protocol Spec, RFC 3828, http://www.ietf.org/rfc/rfc3828.txt

arch/blackfin/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/compiler.h>

#include <linux/types.h>

#include <asm/byteorder.h>

#include <asm/def_LPBlackfin.h>



#define __raw_readb bfin_read8

#define __raw_readw bfin_read16

arch/score/lib/string.S

+1 −1
Original line number Diff line number Diff line
@@ -175,10 +175,10 @@ ENTRY(__clear_user) 
	br	r3



	.section .fixup, "ax"

99:

	br	r3

	.previous

	.section __ex_table, "a"

	.align	2

99:

	.word	0b, 99b

	.previous

arch/x86/kvm/mmu.c

+7 −7
Original line number Diff line number Diff line
@@ -4215,13 +4215,13 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, 
	u64 entry, gentry, *spte;

	int npte;

	bool remote_flush, local_flush, zap_page;

	union kvm_mmu_page_role mask = (union kvm_mmu_page_role) {

		.cr0_wp = 1,

		.cr4_pae = 1,

		.nxe = 1,

		.smep_andnot_wp = 1,

		.smap_andnot_wp = 1,

	};

	union kvm_mmu_page_role mask = { };



	mask.cr0_wp = 1;

	mask.cr4_pae = 1;

	mask.nxe = 1;

	mask.smep_andnot_wp = 1;

	mask.smap_andnot_wp = 1;



	/*

	 * If we don't have indirect shadow pages, it means no page is