David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-02-20 00:34:07 -08:00

..

boot

x86/boot/compressed/64: Do not corrupt EDX on EFER.LME=1 setting

2019-02-06 18:56:18 +01:00

configs

PCI: consolidate PCI config entry in drivers/pci

2018-11-23 11:45:34 +09:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2018-12-27 13:53:32 -08:00

entry

x86/entry/64/compat: Fix stack switching for XEN PV

2019-01-18 00:39:33 +01:00

events

perf/x86: Add check_period PMU callback

2019-02-11 11:46:43 +01:00

hyperv

x86/hyper-v: Add HvFlushGuestAddressList hypercall support

2018-12-21 11:28:39 +01:00

ia32

x86/a.out: Clear the dump structure initially

2019-02-13 12:10:51 +01:00

include

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

2019-02-20 00:34:07 -08:00

kernel

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2019-02-10 09:57:42 -08:00

kvm

kvm: vmx: Fix entry number check for add_atomic_switch_msr()

2019-02-14 16:22:20 +01:00

lib

x86: explicitly align IO accesses in memcpy_{to,from}io

2019-02-01 09:07:48 -08:00

math-emu

Remove 'type' argument from access_ok() function

2019-01-03 18:57:57 -08:00

mm

x86/mm/cpa: Fix set_mce_nospec()

2019-02-08 14:31:56 +01:00

net

x32: bpf: implement jitting of JMP32

2019-01-26 13:33:02 -08:00

oprofile

x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()

2018-02-21 09:54:17 +01:00

pci

Merge tag 'pci-v4.21-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2019-01-05 17:57:34 -08:00

platform

x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls

2019-02-15 15:19:56 +01:00

power

mm: remove include/linux/bootmem.h

2018-10-31 08:54:16 -07:00

purgatory

kbuild: move bin2c back to scripts/ from scripts/basic/

2018-07-18 01:18:05 +09:00

ras

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

realmode

x86-64/realmode: Add instruction suffix

2018-02-20 09:33:41 +01:00

tools

x86: Clean up 'sizeof x' => 'sizeof(x)'

2018-10-29 07:13:28 +01:00

um

Remove 'type' argument from access_ok() function

2019-01-03 18:57:57 -08:00

video

…

xen

Merge tag 'for-linus-5.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2019-01-19 05:53:41 +12:00

.gitignore

x86/build: Add arch/x86/tools/insn_decoder_test to .gitignore

2018-02-13 14:10:29 +01:00

Kbuild

KVM: x86: Allow Qemu/KVM to use PVH entry point

2018-12-13 13:41:49 -05:00

Kconfig

x86/resctrl: Avoid confusion over the new X86_RESCTRL config

2019-02-02 10:34:52 +01:00

Kconfig.cpu

x86/cpu: Create Hygon Dhyana architecture support file

2018-09-27 16:14:05 +02:00

Kconfig.debug

x86/kconfig: Remove redundant 'default n' lines from all x86 Kconfig's

2018-10-17 08:39:42 +02:00

Makefile

jump_label: move 'asm goto' support test to Kconfig

2019-01-06 09:46:51 +09:00

Makefile_32.cpu

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Makefile.um

x86, powerpc: Remove -funit-at-a-time compiler option entirely

2018-12-09 11:55:32 +01:00