David Howells fd2c32a95b s390,uapi: do not use uapi/asm-generic/kvm_para.h ... It turns out that S390 shouldn't use uapi/asm-generic/kvm_para.h since it defines the functions in its non-UAPI kvm_para.h file. #including <asm-generic/kvm_para.h> will first pick up include/asm-generic/kvm_para.h, which defines conflicting functions. Instead, partially revert commit 0420c87e64, ungenericising this file and just inserting a comment to prevent the patch program from deleting it. cc: Yuanhan Liu <yuanhan.liu@intel.com> cc: fengguang.wu@intel.com Reported-by: Yuanhan Liu <yuanhan.liu@intel.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>		2012-10-19 11:07:18 +02:00
..
appldata	s390/vtimer: rework virtual timer interface	2012-07-20 11:15:08 +02:00
boot	s390: fix linker script for 31 bit builds	2012-10-18 17:50:10 +02:00
crypto	crypto: arch/s390 - cleanup - remove unneeded cra_list initialization	2012-08-01 17:47:29 +08:00
hypfs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-10-02 20:25:04 -07:00
include	s390,uapi: do not use uapi/asm-generic/kvm_para.h	2012-10-19 11:07:18 +02:00
kernel	s390/cache: fix data/instruction cache output	2012-10-18 17:50:11 +02:00
kvm	KVM updates for the 3.7 merge window	2012-10-04 09:30:33 -07:00
lib	s390/string: provide asm lib functions for memcpy and memcmp	2012-09-26 15:44:50 +02:00
math-emu
mm	s390/mm,vmem: fix vmem_add_mem()/vmem_remove_range()	2012-10-09 14:17:01 +02:00
net	s390/bpf,jit: add support for BPF_S_ANC_ALU_XOR_X instruction	2012-09-26 15:45:28 +02:00
oprofile	oprofile, s390: Fix uninitialized memory access when writing to oprofilefs	2012-08-27 14:49:23 +02:00
defconfig	s390: update defconfig	2012-09-26 15:45:29 +02:00
Kbuild	s390/bpf,jit: BPF Just In Time compiler for s390	2012-09-26 15:44:49 +02:00
Kconfig	s390/thp: select HAVE_ARCH_TRANSPARENT_HUGEPAGE	2012-10-18 17:50:10 +02:00
Kconfig.debug	s390/mm: add page table dumper	2012-10-09 14:16:58 +02:00
Makefile