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
..
book3s	powerpc/64s: Fix possible corruption on big endian due to pgd/pud_present()	2019-02-17 15:24:45 +11:00
nohash	mm: treewide: remove unused address argument from pte_alloc functions	2019-01-04 13:13:47 -08:00
8xx_immap.h
accounting.h	powerpc/time: Only set CONFIG_ARCH_HAS_SCALED_CPUTIME on PPC64	2018-10-20 13:26:47 +11:00
agp.h
archrandom.h
asm-405.h
asm-compat.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
asm-const.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
asm-offsets.h
asm-prototypes.h	jump_label: move 'asm goto' support test to Kconfig	2019-01-06 09:46:51 +09:00
async_tx.h
atomic.h	powerpc updates for 4.19	2018-08-17 11:32:50 -07:00
backlight.h
barrier.h	powerpc/fsl: Add barrier_nospec implementation for NXP PowerPC Book3E	2018-08-08 00:32:24 +10:00
bitops.h
bootx.h
btext.h
bug.h	signal/powerpc: Specialize _exception_pkey for handling pkey exceptions	2018-09-21 15:52:43 +02:00
bugs.h
cache.h	powerpc: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32	2018-11-26 22:33:37 +11:00
cacheflush.h
cell-pmu.h
cell-regs.h
checksum.h
cmpxchg.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
code-patching-asm.h	powerpc/asm: Add a patch_site macro & helpers for patching instructions	2018-08-08 00:32:25 +10:00
code-patching.h	powerpc: add modify_instruction() and modify_instruction_site()	2018-12-19 18:56:32 +11:00
compat.h	asm-generic: Move common compat types to asm-generic/compat.h	2018-08-29 15:42:20 +02:00
context_tracking.h
copro.h	mm: convert return type of handle_mm_fault() caller to vm_fault_t	2018-08-17 16:20:28 -07:00
cpm.h
cpm1.h
cpm2.h
cpu_has_feature.h
cpufeature.h
cpuidle.h	powernv/cpuidle: Use parsed device tree values for cpuidle_init	2018-07-31 19:56:44 +10:00
cputable.h	powerpc/83xx: handle machine check caused by watchdog timer	2018-12-21 20:56:41 -06:00
cputhreads.h	powerpc: Detect the presence of big-cores via "ibm, thread-groups"	2018-10-13 22:21:25 +11:00
cputime.h	powerpc/time: Only set CONFIG_ARCH_HAS_SCALED_CPUTIME on PPC64	2018-10-20 13:26:47 +11:00
current.h
dbdma.h
dbell.h	powerpc: clean inclusions of asm/feature-fixups.h	2018-07-30 22:48:17 +10:00
dcr-generic.h
dcr-mmio.h
dcr-native.h	powerpc: clean the inclusion of stringify.h	2018-07-30 22:48:17 +10:00
dcr-regs.h
dcr.h
debug.h	powerpc: declare set_breakpoint() static	2018-07-30 22:48:18 +10:00
debugfs.h
delay.h
device.h
disassemble.h
dma-direct.h
dma-mapping.h	DMA mapping updates for Linux 4.21	2018-12-28 14:12:21 -08:00
dma.h
drmem.h	powerpc/pseries/memory-hotplug: Only update DT once per memory DLPAR request	2018-09-19 22:08:12 +10:00
dt_cpu_ftrs.h	powerpc: clean inclusions of asm/feature-fixups.h	2018-07-30 22:48:17 +10:00
edac.h
eeh.h	powerpc/eeh: Cleanup eeh_ops.wait_state()	2018-10-13 22:21:25 +11:00
eeh_event.h
ehv_pic.h
elf.h
emergency-restart.h
emulated_ops.h
epapr_hcalls.h
error-injection.h	powerpc: Add support for function error injection	2018-10-20 13:26:43 +11:00
exception-64e.h
exception-64s.h	powerpc/64s/hash: Convert SLB miss handlers to C	2018-10-14 18:04:09 +11:00
exec.h
extable.h
fadump.h	powerpc/fadump: Do not allow hot-remove memory from fadump reserved area.	2018-12-21 11:32:49 +11:00
fb.h
feature-fixups.h	powerpc/fsl: Add infrastructure to fixup branch predictor flush	2018-12-20 22:53:39 +11:00
firmware.h	powerpc/pseries: PAPR persistent memory support	2018-10-19 00:56:17 +11:00
fixmap.h	powerpc: handover page flags with a pgprot_t parameter	2018-10-14 18:04:09 +11:00
floppy.h
fs_pd.h
fsl_85xx_cache_sram.h
fsl_gtm.h
fsl_hcalls.h
fsl_lbc.h
fsl_pamu_stash.h
fsl_pm.h
ftrace.h
futex.h	Remove 'type' argument from access_ok() function	2019-01-03 18:57:57 -08:00
grackle.h
hardirq.h
head-64.h	powerpc/64s: Drop unused loc parameter to MASKABLE_EXCEPTION macros	2018-08-07 21:49:38 +10:00
heathrow.h
highmem.h	powerpc: remove unnecessary inclusion of asm/tlbflush.h	2018-07-30 22:48:20 +10:00
hmi.h
hugetlb.h	powerpc/mm: remove unused variable	2018-12-19 18:56:32 +11:00
hvcall.h	KVM: PPC: Book3S: Introduce new hcall H_COPY_TOFROM_GUEST to access quadrants 1 & 2	2018-12-17 11:33:50 +11:00
hvconsole.h
hvcserver.h
hvsi.h
hw_breakpoint.h	powerpc updates for 4.19	2018-08-17 11:32:50 -07:00
hw_irq.h
hydra.h
i8259.h
ibmebus.h
icswx.h
ide.h
ima.h
imc-pmu.h
immap_cpm2.h
io-defs.h
io-workarounds.h
io.h	powerpc: implement CONFIG_DEBUG_VIRTUAL	2018-12-19 18:56:26 +11:00
io_event_irq.h
iommu.h	DMA mapping updates for Linux 4.21	2018-12-28 14:12:21 -08:00
ipic.h	powerpc/ipic: Remove unused ipic_set_priority()	2018-12-17 22:12:30 +11:00
irq.h
irq_work.h
irqflags.h
isa-bridge.h
jump_label.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
Kbuild	powerpc: generate uapi header and system call table files	2018-12-21 14:46:50 +11:00
kdebug.h
kdump.h
kexec.h
keylargo.h
kgdb.h	powerpc/kgdb: add kgdb_arch_set/remove_breakpoint()	2018-10-20 13:26:47 +11:00
kmap_types.h
kprobes.h
kvm_asm.h	KVM: PPC: Book3S: Simplify external interrupt handling	2018-10-09 16:04:27 +11:00
kvm_book3s.h	KVM: PPC: Book3S HV: Introduce kvmhv_update_nest_rmap_rc_list()	2018-12-21 14:39:35 +11:00
kvm_book3s_32.h
kvm_book3s_64.h	KVM: PPC: Book3S HV: Introduce kvmhv_update_nest_rmap_rc_list()	2018-12-21 14:39:35 +11:00
kvm_book3s_asm.h	KVM: PPC: Book3S HV: Framework and hcall stubs for nested virtualization	2018-10-09 16:04:27 +11:00
kvm_booke.h	KVM: PPC: Use ccr field in pt_regs struct embedded in vcpu struct	2018-10-09 16:04:27 +11:00
kvm_booke_hv_asm.h	powerpc: clean inclusions of asm/feature-fixups.h	2018-07-30 22:48:17 +10:00
kvm_fpu.h
kvm_host.h	KVM: Make kvm_set_spte_hva() return int	2018-12-21 11:28:41 +01:00
kvm_para.h
kvm_ppc.h	KVM: PPC: Add load_from_eaddr and store_to_eaddr to the kvmppc_ops struct	2018-12-17 11:33:50 +11:00
libata-portmap.h
linkage.h
livepatch.h
local.h
lppaca.h
lv1call.h
machdep.h	powerpc: handover page flags with a pgprot_t parameter	2018-10-14 18:04:09 +11:00
macio.h
mc146818rtc.h
mce.h	powerpc/pseries: Flush SLB contents on SLB MCE errors.	2018-09-19 21:59:22 +10:00
mediabay.h
membarrier.h
mm-arch-hooks.h
mman.h
mmu.h	powerpc/mm: Eliminate not possible mmu features at compile time	2018-12-19 18:56:32 +11:00
mmu_context.h	powerpc/vfio/iommu/kvm: Do not pin device memory	2018-12-21 16:20:46 +11:00
mmzone.h
module.h
mpc5xxx.h
mpc6xx.h
mpc52xx.h
mpc52xx_psc.h
mpc85xx.h
mpc5121.h
mpc8260.h
mpic.h	powerpc/msi: Fix compile error on mpc83xx	2018-10-21 19:32:07 +11:00
mpic_msgr.h
mpic_timer.h
msi_bitmap.h
nmi.h
nvram.h
ohare.h
opal-api.h	powerpc/powernv: Make possible for user to force a full ipl cec reboot	2018-10-03 15:39:45 +10:00
opal.h	powerpc/powernv: Move opal_power_control_init() call in opal_init().	2018-12-21 11:32:49 +11:00
oprofile_impl.h
paca.h	powerpc/64s/hash: Add some SLB debugging tests	2018-10-14 18:04:09 +11:00
page.h	powerpc: use mm zones more sensibly	2018-12-20 22:21:20 +11:00
page_32.h	powerpc/8xx: reintroduce 16K pages with HW assistance	2018-12-04 19:45:01 +11:00
page_64.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
parport.h
pasemi_dma.h
pci-bridge.h	powerpc/powernv: Move npu struct from pnv_phb to pci_controller	2018-12-21 16:20:46 +11:00
pci.h	powerpc/powernv/npu: Add compound IOMMU groups	2018-12-21 16:20:46 +11:00
percpu.h
perf_event.h	powerpc/perf: Update perf_regs structure to include SIER	2018-12-20 20:53:11 +11:00
perf_event_fsl_emb.h
perf_event_server.h	powerpc/perf: Add constraints for power9 l2/l3 bus events	2018-12-20 20:53:11 +11:00
pgalloc.h
pgtable-be-types.h
pgtable-types.h	powerpc/8xx: reintroduce 16K pages with HW assistance	2018-12-04 19:45:01 +11:00
pgtable.h	powerpc: use mm zones more sensibly	2018-12-20 22:21:20 +11:00
pkeys.h
plpar_wrappers.h
pmac_feature.h
pmac_low_i2c.h
pmac_pfunc.h
pmc.h
pmi.h
pnv-ocxl.h
pnv-pci.h	PCI: hotplug: Drop hotplug_slot_info	2018-09-18 17:52:15 -05:00
powernv.h
ppc-opcode.h	ppc: bpf: implement jitting of JMP32	2019-01-26 13:33:02 -08:00
ppc-pci.h	powerpc/eeh: Cleanup eeh_pe_state_mark()	2018-10-13 22:21:25 +11:00
ppc4xx.h
ppc4xx_ocm.h
ppc_asm.h	powerpc/fsl: Add macro to flush the branch predictor	2018-12-20 22:58:57 +11:00
probes.h
processor.h	treewide: remove current_text_addr	2018-10-31 08:54:12 -07:00
prom.h
ps3.h
ps3av.h
ps3gpu.h
ps3stor.h
pte-walk.h
ptrace.h	powerpc/64: Fix kernel stack 16-byte alignment	2018-11-15 14:48:43 +11:00
reg.h	powerpc/83xx: handle machine check caused by watchdog timer	2018-12-21 20:56:41 -06:00
reg_8xx.h
reg_a2.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
reg_booke.h
reg_fsl_emb.h	powerpc: clean the inclusion of stringify.h	2018-07-30 22:48:17 +10:00
rheap.h
rio.h
rtas.h	powerpc/pseries: add missing cpumask.h include file	2018-10-26 21:58:58 +11:00
runlatch.h
scom.h
seccomp.h
sections.h
security_features.h	powerpc/64s: Add support for software count cache flush	2018-08-08 00:32:26 +10:00
serial.h
setjmp.h
setup.h	powerpc/fsl: Add nospectre_v2 command line argument	2018-12-20 22:59:03 +11:00
sfp-machine.h	powerpc/math-emu: Update macros from GCC	2018-12-04 19:45:01 +11:00
shmparam.h
signal.h
slice.h	powerpc/mm: define an empty slice_init_new_context_exec()	2018-12-19 18:56:32 +11:00
smp.h	powerpc: Detect the presence of big-cores via "ibm, thread-groups"	2018-10-13 22:21:25 +11:00
smu.h
sparsemem.h	powerpc/mm: Increase the max addressable memory to 2PB	2018-10-14 18:04:09 +11:00
spinlock.h	powerpc: move ASM_CONST and stringify_in_c() into asm-const.h	2018-07-30 22:48:16 +10:00
spinlock_types.h
spu.h
spu_csa.h
spu_info.h
spu_priv1.h
sstep.h
stackprotector.h	powerpc/64: add stack protector support	2018-10-03 15:40:03 +10:00
stacktrace.h	powerpc: Add show_user_instructions()	2018-08-08 00:32:30 +10:00
string.h	powerpc/lib: Implement strlen() in assembly for PPC32	2018-08-07 21:49:30 +10:00
swab.h
swiotlb.h
switch_to.h
synch.h	powerpc: clean the inclusion of stringify.h	2018-07-30 22:48:17 +10:00
syscall.h	powerpc: split compat syscall table out from native table	2018-12-21 14:46:50 +11:00
syscalls.h
tce.h
termios.h
thread_info.h	powerpc/64s/hash: Add a SLB preload cache	2018-10-14 18:04:09 +11:00
time.h	powerpc: change CONFIG_6xx to CONFIG_PPC_BOOK3S_32	2018-11-26 22:33:37 +11:00
timex.h
tlb.h	powerpc: change CONFIG_PPC_STD_MMU_32 to CONFIG_PPC_BOOK3S_32	2018-11-26 22:33:37 +11:00
tlbflush.h	powerpc: split asm/tlbflush.h	2018-07-30 22:48:21 +10:00
tm.h
topology.h	powerpc/topology: Get topology for shared processors at boot	2018-08-21 16:01:59 +10:00
trace.h	powerpc/mm: Trace tlbia instruction	2018-10-20 13:26:47 +11:00
trace_clock.h
tsi108.h
tsi108_irq.h
tsi108_pci.h
types.h
uaccess.h	Fix access_ok() fallout for sparc32 and powerpc	2019-01-04 09:58:25 -08:00
udbg.h
uic.h
unaligned.h
uninorth.h
unistd.h	powerpc: add __NR_syscalls along with NR_syscalls	2018-12-21 14:46:50 +11:00
uprobes.h
user.h	powerpc/aout: Fix struct user definition to use user_pt_regs	2018-10-19 15:09:04 +11:00
vas.h
vdso.h
vdso_datapage.h
vga.h
vio.h
word-at-a-time.h
xics.h
xilinx_intc.h
xilinx_pci.h
xive-regs.h
xive.h	powerpc/xive: Remove xive_kexec_teardown_cpu()	2018-08-07 21:49:28 +10:00
xmon.h
xor.h
xor_altivec.h