From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christian Brauner <christian@brauner.io>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Joel Fernandes (Google)" <joel@joelfernandes.org>
Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree
Date: Wed, 22 May 2019 07:52:35 +0200 [thread overview]
Message-ID: <20190522055235.GC13702@kroah.com> (raw)
In-Reply-To: <20190522110115.7350be3e@canb.auug.org.au>
On Wed, May 22, 2019 at 11:01:15AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pidfd tree got a conflict in:
>
> tools/testing/selftests/pidfd/Makefile
>
> between commit:
>
> ec8f24b7faaf ("treewide: Add SPDX license identifier - Makefile/Kconfig")
>
> from Linus' tree and commit:
>
> 233ad92edbea ("pidfd: add polling selftests")
>
> from the pidfd tree.
Sorry, you are going to get a number of these types of minor conflicts
now. That's the problem of touching thousands of files :(
thanks,
greg k-h
next prev parent reply other threads:[~2019-05-22 5:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 1:01 linux-next: manual merge of the pidfd tree with Linus' tree Stephen Rothwell
2019-05-22 5:52 ` Greg Kroah-Hartman [this message]
2019-05-22 7:48 ` Stephen Rothwell
2019-05-22 7:55 ` Christian Brauner
2019-05-22 8:05 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-06-06 5:40 Stephen Rothwell
2019-07-08 23:17 ` Stephen Rothwell
2019-07-01 10:35 Stephen Rothwell
2019-07-09 0:19 ` Stephen Rothwell
2019-07-04 8:44 Stephen Rothwell
2019-11-15 5:32 Stephen Rothwell
2023-07-02 23:42 Stephen Rothwell
2023-07-03 7:50 ` Christian Brauner
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=20190522055235.GC13702@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=christian@brauner.io \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.