linux-next: manual merge of the ftrace tree with the uml tree

linux-next: manual merge of the ftrace tree with the uml tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  arch/um/Kconfig

between commit:

  043f5d3ffaf6 ("um: Remove set_fs")

from the uml tree and commit:

  4aae683f1327 ("tracing: Refactor TRACE_IRQFLAGS_SUPPORT in Kconfig")

from the ftrace 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 arch/um/Kconfig
index a855436d8646,0a699440c4c5..000000000000
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -21,8 -19,9 +21,9 @@@ config UM
  	select GENERIC_IRQ_SHOW
  	select GENERIC_CPU_DEVICES
  	select HAVE_GCC_PLUGINS
 -	select SET_FS
+ 	select TRACE_IRQFLAGS_SUPPORT
  	select TTY # Needed for line.c
 +	select HAVE_ARCH_VMAP_STACK
  
  config MMU
  	bool

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