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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/mips/Kconfig between commit 597ce1723e0f ("MIPS: Support for 64-bit
FP with O32 binaries") from the mips tree and commit 19952a92037e
("stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between
architectures") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/mips/Kconfig
index 87dc0c3fe05f,c93d92beb3d6..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -2354,36 -2323,6 +2355,23 @@@ config SECCOM
  
  	  If unsure, say Y. Only embedded should say N here.
  
- config CC_STACKPROTECTOR
- 	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
- 	help
- 	  This option turns on the -fstack-protector GCC feature. This
- 	  feature puts, at the beginning of functions, a canary value on
- 	  the stack just before the return address, and validates
- 	  the value just before actually returning.  Stack based buffer
- 	  overflows (that need to overwrite this return address) now also
- 	  overwrite the canary, which gets detected and the attack is then
- 	  neutralized via a kernel panic.
- 
- 	  This feature requires gcc version 4.2 or above.
- 
 +config MIPS_O32_FP64_SUPPORT
 +	bool "Support for O32 binaries using 64-bit FP"
 +	depends on 32BIT || MIPS32_O32
 +	default y
 +	help
 +	  When this is enabled, the kernel will support use of 64-bit floating
 +	  point registers with binaries using the O32 ABI along with the
 +	  EF_MIPS_FP64 ELF header flag (typically built with -mfp64). On
 +	  32-bit MIPS systems this support is at the cost of increasing the
 +	  size and complexity of the compiled FPU emulator. Thus if you are
 +	  running a MIPS32 system and know that none of your userland binaries
 +	  will require 64-bit floating point, you may wish to reduce the size
 +	  of your kernel & potentially improve FP emulation performance by
 +	  saying N here.
 +
 +	  If unsure, say Y.
 +
  config USE_OF
  	bool
  	select OF

Attachment: pgp00000.pgp
Description: PGP signature