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

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

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



Version bump conflict in batman-adv, take what's in net-next.

iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd620720 846e8dd4

Documentation/media/uapi/dvb/video_function_calls.rst

+0 −1
Original line number Diff line number Diff line
@@ -33,4 +33,3 @@ Video Function Calls 
    video-clear-buffer

    video-set-streamtype

    video-set-format
 
    video-set-attributes

Documentation/virtual/kvm/api.txt

+11 −1
Original line number Diff line number Diff line
@@ -4510,7 +4510,8 @@ Do not enable KVM_FEATURE_PV_UNHALT if you disable HLT exits. 
Architectures: s390

Parameters: none

Returns: 0 on success, -EINVAL if hpage module parameter was not set

	 or cmma is enabled

	 or cmma is enabled, or the VM has the KVM_VM_S390_UCONTROL

	 flag set



With this capability the KVM support for memory backing with 1m pages

through hugetlbfs can be enabled for a VM. After the capability is
@@ -4521,6 +4522,15 @@ hpage module parameter is not set to 1, -EINVAL is returned. 
While it is generally possible to create a huge page backed VM without

this capability, the VM will not be able to run.



7.14 KVM_CAP_MSR_PLATFORM_INFO



Architectures: x86

Parameters: args[0] whether feature should be enabled or not



With this capability, a guest may read the MSR_PLATFORM_INFO MSR. Otherwise,

a #GP would be raised when the guest tries to access. Currently, this

capability does not enable write permissions of this MSR for the guest.



8. Other capabilities.

----------------------

MAINTAINERS

+12 −2
Original line number Diff line number Diff line
@@ -12269,6 +12269,7 @@ F: Documentation/networking/rds.txt 


RDT - RESOURCE ALLOCATION

M:	Fenghua Yu <fenghua.yu@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	arch/x86/kernel/cpu/intel_rdt*
@@ -13458,9 +13459,8 @@ F: drivers/i2c/busses/i2c-synquacer.c 
F:	Documentation/devicetree/bindings/i2c/i2c-synquacer.txt



SOCIONEXT UNIPHIER SOUND DRIVER

M:	Katsuhiro Suzuki <suzuki.katsuhiro@socionext.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

S:	Orphan

F:	sound/soc/uniphier/



SOEKRIS NET48XX LED SUPPORT
@@ -15922,6 +15922,7 @@ F: net/x25/ 
X86 ARCHITECTURE (32-BIT AND 64-BIT)

M:	Thomas Gleixner <tglx@linutronix.de>

M:	Ingo Molnar <mingo@redhat.com>

M:	Borislav Petkov <bp@alien8.de>

R:	"H. Peter Anvin" <hpa@zytor.com>

M:	x86@kernel.org

L:	linux-kernel@vger.kernel.org
@@ -15950,6 +15951,15 @@ M: Borislav Petkov <bp@alien8.de> 
S:	Maintained

F:	arch/x86/kernel/cpu/microcode/*



X86 MM

M:	Dave Hansen <dave.hansen@linux.intel.com>

M:	Andy Lutomirski <luto@kernel.org>

M:	Peter Zijlstra <peterz@infradead.org>

L:	linux-kernel@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/mm

S:	Maintained

F:	arch/x86/mm/



X86 PLATFORM DRIVERS

M:	Darren Hart <dvhart@infradead.org>

M:	Andy Shevchenko <andy@infradead.org>

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Merciless Moray



# *DOCUMENTATION*

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,6 @@ static inline void vmemmap_remove_mapping(unsigned long start, 
	return hash__vmemmap_remove_mapping(start, page_size);

}

#endif

struct page *realmode_pfn_to_page(unsigned long pfn);



static inline pte_t pmd_pte(pmd_t pmd)

{