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

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  scripts/link-vmlinux.sh

between commit:

  7d153696e5db ("kbuild: do not include include/config/auto.conf from shell scripts")

from the kbuild tree and commit:

  4f1f18311591 ("scripts: ftrace - move the sort-processing in ftrace_init")

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 scripts/link-vmlinux.sh
index 5189c9a12066,dd9955f45774..000000000000
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@@ -412,11 -411,8 +412,8 @@@ if is_enabled CONFIG_BUILDTIME_TABLE_SO
  	fi
  fi
  
- info SYSMAP System.map
- mksysmap vmlinux System.map
- 
  # step a (see comment above)
 -if [ -n "${CONFIG_KALLSYMS}" ]; then
 +if is_enabled CONFIG_KALLSYMS; then
  	mksysmap ${kallsyms_vmlinux} .tmp_System.map
  
  	if ! cmp -s System.map .tmp_System.map; then

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