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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/livepatch/Makefile

between commit:

  8c666d2ab576 ("selftests/livepatch: Test interaction with ftrace_enabled")

from the ftrace tree and commit:

  ecd25094c5f5 ("livepatch: Selftests of the API for tracking system state changes")

from the livepatching 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 tools/testing/selftests/livepatch/Makefile
index 1886d9d94b88,1cf40a9e7185..000000000000
--- a/tools/testing/selftests/livepatch/Makefile
+++ b/tools/testing/selftests/livepatch/Makefile
@@@ -5,6 -5,6 +5,7 @@@ TEST_PROGS := 
  	test-livepatch.sh \
  	test-callbacks.sh \
  	test-shadow-vars.sh \
- 	test-ftrace.sh
++	test-ftrace.sh \
+ 	test-state.sh
  
  include ../lib.mk

Attachment: pgpQ3nWcHqpNs.pgp
Description: OpenPGP digital signature