Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the livepatching tree with the ftrace tree
@ 2019-11-15  5:03 Stephen Rothwell
  2019-11-27  0:48 ` Stephen Rothwell
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-15  5:03 UTC (permalink / raw)
  To: Jiri Kosina, Josh Poimboeuf, Miroslav Benes, Petr Mladek,
	Joe Lawrence, Steven Rostedt
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the livepatching tree with the ftrace tree
  2019-11-15  5:03 linux-next: manual merge of the livepatching tree with the ftrace tree Stephen Rothwell
@ 2019-11-27  0:48 ` Stephen Rothwell
  0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2019-11-27  0:48 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Jiri Kosina, Josh Poimboeuf, Miroslav Benes, Petr Mladek,
	Joe Lawrence, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

On Fri, 15 Nov 2019 16:03:19 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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

This is now a conflict between the ftrace tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-15  5:03 linux-next: manual merge of the livepatching tree with the ftrace tree Stephen Rothwell
2019-11-27  0:48 ` Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git