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
..
alpha	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
arm	A number of pinctrl fixes for the v3.7 series:	2012-10-16 18:10:26 -07:00
arm64	UAPI headers for arm64 together with some clean-up to make it possible:	2012-10-13 11:20:04 +09:00
avr32	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
blackfin	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
c6x	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
cris	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
frv	FRV: Fix const sections change	2012-10-16 18:49:15 -07:00
h8300	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
hexagon	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
ia64	UAPI: Put a comment into uapi/asm-generic/kvm_para.h and use it from arches	2012-10-17 12:32:07 +01:00
m32r	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
m68k	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
microblaze	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
mips	UAPI: Place comments in empty arch Kbuilds to make them non-empty	2012-10-17 12:31:16 +01:00
mn10300	UAPI: Make arch/mn10300/include/uapi/asm/setup.h non-empty	2012-10-17 12:32:35 +01:00
openrisc	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
parisc	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
powerpc	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
s390	s390,uapi: do not use uapi/asm-generic/kvm_para.h	2012-10-19 11:07:18 +02:00
score	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
sh	UAPI: Make arch/sh/include/uapi/asm/hw_breakpoint.h non-empty	2012-10-17 12:32:35 +01:00
sparc	UAPI fixes 2012-10-17	2012-10-17 13:40:22 -07:00
tile	UAPI: The tile arch uses the generic ucontext.h file	2012-10-17 12:31:16 +01:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2012-10-13 10:05:52 +09:00
unicore32	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
x86	kbuild: Fix accidental revert in commit fe04ddf	2012-10-15 13:01:05 -07:00
xtensa	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
.gitignore
Kconfig	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00