linux-next: manual merge of the tip tree with the tile tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/Kconfig between commit ca3a3d347e23 ("ipc: provide generic
compat versions of IPC syscalls") from the tile tree and commits
5fd92e65a68b ("x32: Allow x32 to be configured") and 0bf6276392e9 ("x32:
Warn and disable rather than error if binutils too old") from the tip
tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/x86/Kconfig
index 0ca57e0,21ec4bf..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2174,10 -2195,22 +2194,23 @@@ config IA32_AOU
  	---help---
  	  Support old a.out binaries in the 32bit emulation.
  
+ config X86_X32
+ 	bool "x32 ABI for 64-bit mode (EXPERIMENTAL)"
+ 	depends on X86_64 && IA32_EMULATION && EXPERIMENTAL
+ 	---help---
+ 	  Include code to run binaries for the x32 native 32-bit ABI
+ 	  for 64-bit processors.  An x32 process gets access to the
+ 	  full 64-bit register file and wide data path while leaving
+ 	  pointers at 32 bits for smaller memory footprint.
+ 
+ 	  You will need a recent binutils (2.22 or later) with
+ 	  elf32_x86_64 support enabled to compile a kernel with this
+ 	  option set.
+ 
  config COMPAT
  	def_bool y
- 	depends on IA32_EMULATION
+ 	depends on IA32_EMULATION || X86_X32
 +	select ARCH_WANT_OLD_COMPAT_IPC
  
  config COMPAT_FOR_U64_ALIGNMENT
  	def_bool COMPAT

Attachment: pgp00000.pgp
Description: PGP signature