* linux-next: manual merge of the kdbus tree with Linus' tree
@ 2015-09-14 0:53 Stephen Rothwell
2015-09-14 4:25 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-09-14 0:53 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Daniel Mack, Pranith Kumar,
Andrew Morton, Mathieu Desnoyers, David Herrmann, Djalal Harouni
Hi Greg,
Today's linux-next merge of the kdbus tree got a conflict in:
tools/testing/selftests/Makefile
between commit:
b6d973441675 ("selftests: add membarrier syscall test")
from Linus' tree and commit:
b7270dd9f7d4 ("kdbus: add selftests")
from the kdbus tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc tools/testing/selftests/Makefile
index 89b05e2222c9,b57100cefb74..000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -4,9 -4,8 +4,10 @@@ TARGETS += efivarf
TARGETS += exec
TARGETS += firmware
TARGETS += ftrace
+TARGETS += futex
TARGETS += kcmp
+ TARGETS += kdbus
+TARGETS += membarrier
TARGETS += memfd
TARGETS += memory-hotplug
TARGETS += mount
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the kdbus tree with Linus' tree
2015-09-14 0:53 linux-next: manual merge of the kdbus tree with Linus' tree Stephen Rothwell
@ 2015-09-14 4:25 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2015-09-14 4:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Daniel Mack, Pranith Kumar,
Andrew Morton, Mathieu Desnoyers, David Herrmann, Djalal Harouni
On Mon, Sep 14, 2015 at 10:53:56AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the kdbus tree got a conflict in:
>
> tools/testing/selftests/Makefile
>
> between commit:
>
> b6d973441675 ("selftests: add membarrier syscall test")
>
> from Linus' tree and commit:
>
> b7270dd9f7d4 ("kdbus: add selftests")
>
> from the kdbus tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb•auug.org.au
>
> diff --cc tools/testing/selftests/Makefile
> index 89b05e2222c9,b57100cefb74..000000000000
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@@ -4,9 -4,8 +4,10 @@@ TARGETS += efivarf
> TARGETS += exec
> TARGETS += firmware
> TARGETS += ftrace
> +TARGETS += futex
> TARGETS += kcmp
> + TARGETS += kdbus
> +TARGETS += membarrier
> TARGETS += memfd
> TARGETS += memory-hotplug
> TARGETS += mount
Looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-14 4:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-14 0:53 linux-next: manual merge of the kdbus tree with Linus' tree Stephen Rothwell
2015-09-14 4:25 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox