From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi•org>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Daniel Mack <daniel@zonque•org>, Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the target-updates tree with the kdbus tree
Date: Fri, 2 Oct 2015 13:36:38 +1000 [thread overview]
Message-ID: <20151002133638.3430e7da@canb.auug.org.au> (raw)
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/
reply other threads:[~2015-10-02 3:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151002133638.3430e7da@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel@zonque$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nab@linux-iscsi$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox