linux-next: manual merge of the mm-nonmm-stable tree with the ftrace tree

linux-next: manual merge of the mm-nonmm-stable tree with the ftrace tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]

Hi all,

Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:

  init/Kconfig

between commit:

  a2a9d67a26ec ("bootconfig: Support embedding a bootconfig file in kernel")

from the ftrace tree and commit:

  1274aea127b2 ("initramfs: add INITRAMFS_PRESERVE_MTIME Kconfig option")

from the mm-nonmm-stable tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc init/Kconfig
index 006e086f2724,90cb1ac936db..000000000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -1370,25 -1361,16 +1370,35 @@@ config BOOT_CONFI
  
  	  If unsure, say Y.
  
 +config BOOT_CONFIG_EMBED
 +	bool "Embed bootconfig file in the kernel"
 +	depends on BOOT_CONFIG
 +	help
 +	  Embed a bootconfig file given by BOOT_CONFIG_EMBED_FILE in the
 +	  kernel. Usually, the bootconfig file is loaded with the initrd
 +	  image. But if the system doesn't support initrd, this option will
 +	  help you by embedding a bootconfig file while building the kernel.
 +
 +	  If unsure, say N.
 +
 +config BOOT_CONFIG_EMBED_FILE
 +	string "Embedded bootconfig file path"
 +	depends on BOOT_CONFIG_EMBED
 +	help
 +	  Specify a bootconfig file which will be embedded to the kernel.
 +	  This bootconfig will be used if there is no initrd or no other
 +	  bootconfig in the initrd.
 +
+ config INITRAMFS_PRESERVE_MTIME
+ 	bool "Preserve cpio archive mtimes in initramfs"
+ 	default y
+ 	help
+ 	  Each entry in an initramfs cpio archive carries an mtime value. When
+ 	  enabled, extracted cpio items take this mtime, with directory mtime
+ 	  setting deferred until after creation of any child entries.
+ 
+ 	  If unsure, say Y.
+ 
  choice
  	prompt "Compiler optimization level"
  	default CC_OPTIMIZE_FOR_PERFORMANCE

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]