Commit 84ba10d6 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

Merge remote-tracking branch 'tip/x86/urgent' into edac-for-5.1 



... to pick up dependent change:

  00ae831d ("x86/cpu: Add Atom Tremont (Jacobsville)")

introducing the model number define which will be needed by the new
i10nm_edac driver for 10nm Intel Atoms.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parents 912ebd99 e6d42931

Documentation/x86/resctrl_ui.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Fenghua Yu <fenghua.yu@intel.com> 
Tony Luck <tony.luck@intel.com>

Vikas Shivappa <vikas.shivappa@intel.com>



This feature is enabled by the CONFIG_RESCTRL and the X86 /proc/cpuinfo

This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo

flag bits:

RDT (Resource Director Technology) Allocation - "rdt_a"

CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -16638,6 +16638,15 @@ S: Maintained 
F:	drivers/platform/x86/

F:	drivers/platform/olpc/



X86 PLATFORM DRIVERS - ARCH

R:	Darren Hart <dvhart@infradead.org>

R:	Andy Shevchenko <andy@infradead.org>

L:	platform-driver-x86@vger.kernel.org

L:	x86@kernel.org

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

S:	Maintained

F:	arch/x86/platform



X86 VDSO

M:	Andy Lutomirski <luto@kernel.org>

L:	linux-kernel@vger.kernel.org

arch/c6x/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/uapi/asm-generic/Kbuild.asm



generic-y += kvm_para.h

generic-y += shmparam.h

generic-y += ucontext.h

arch/h8300/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/uapi/asm-generic/Kbuild.asm



generic-y += kvm_para.h

generic-y += shmparam.h

generic-y += ucontext.h

arch/hexagon/include/uapi/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
include include/uapi/asm-generic/Kbuild.asm



generic-y += shmparam.h

generic-y += ucontext.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE