From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Daniel Mack <daniel@zonque.org>,
Pranith Kumar <bobby.prani@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
David Herrmann <dh.herrmann@gmail.com>,
Djalal Harouni <tixxdz@opendz.org>
Subject: Re: linux-next: manual merge of the kdbus tree with Linus' tree
Date: Sun, 13 Sep 2015 21:25:34 -0700 [thread overview]
Message-ID: <20150914042534.GA27042@kroah.com> (raw)
In-Reply-To: <20150914105356.02aef8f0@canb.auug.org.au>
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
prev parent reply other threads:[~2015-09-14 4:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20150914042534.GA27042@kroah.com \
--to=greg@kroah.com \
--cc=akpm@linux-foundation.org \
--cc=bobby.prani@gmail.com \
--cc=daniel@zonque.org \
--cc=dh.herrmann@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=sfr@canb.auug.org.au \
--cc=tixxdz@opendz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).