* linux-next: manual merge of the target-updates tree with the kdbus tree
@ 2015-10-02 3:36 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-10-02 3:36 UTC (permalink / raw)
To: Nicholas A. Bellinger, Greg KH
Cc: linux-next, linux-kernel, Daniel Mack, Christoph Hellwig
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in:
samples/Makefile
between commit:
2d41f8138508 ("kdbus: add walk-through user space example")
from the kdbus tree and commit:
f71933438300 ("configfs: remove old API")
from the target-updates 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 samples/Makefile
index f0ad51e5b342,48001d7e23f0..000000000000
--- a/samples/Makefile
+++ b/samples/Makefile
@@@ -1,5 -1,5 +1,5 @@@
# Makefile for Linux samples code
obj-$(CONFIG_SAMPLES) += kobject/ kprobes/ trace_events/ livepatch/ \
- hw_breakpoint/ kfifo/ kdb/ hidraw/ rpmsg/ seccomp/ \
- configfs/
+ hw_breakpoint/ kfifo/ kdb/ kdbus/ hidraw/ rpmsg/ \
- seccomp/
++ seccomp/ configfs/
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-02 3:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-02 3:36 linux-next: manual merge of the target-updates tree with the kdbus tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).