From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Christian Brauner <christian@brauner•io>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Joel Fernandes (Google)" <joel@joelfernandes•org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the pidfd tree
Date: Mon, 8 Jul 2019 12:01:14 +1000 [thread overview]
Message-ID: <20190708120114.5ca1613d@canb.auug.org.au> (raw)
In-Reply-To: <20190515131629.405837b0@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]
Hi all,
On Wed, 15 May 2019 13:16:29 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> include/linux/pid.h
>
> between commit:
>
> 51f1b521a515 ("pidfd: add polling support")
>
> from the pidfd tree and commit:
>
> c02e28a1bb18 ("kernel/pid.c: convert struct pid:count to refcount_t")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc include/linux/pid.h
> index 1484db6ca8d1,0be5829ddd80..000000000000
> --- a/include/linux/pid.h
> +++ b/include/linux/pid.h
> @@@ -3,7 -3,7 +3,8 @@@
> #define _LINUX_PID_H
>
> #include <linux/rculist.h>
> +#include <linux/wait.h>
> + #include <linux/refcount.h>
>
> enum pid_type
> {
I am still getting this conflict (the commits have changed). Just a
reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-07-08 2:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 3:16 linux-next: manual merge of the akpm-current tree with the pidfd tree Stephen Rothwell
2019-07-08 2:01 ` Stephen Rothwell [this message]
2019-07-12 12:53 ` Joel Fernandes
2019-07-12 13:02 ` Christian Brauner
2019-07-12 13:54 ` Joel Fernandes
-- strict thread matches above, loose matches on Subject: below --
2021-01-27 11:43 Stephen Rothwell
2021-01-28 2:04 ` Miaohe Lin
2021-02-14 21:54 ` Stephen Rothwell
2021-02-24 22:41 ` Stephen Rothwell
2020-09-22 8:54 Stephen Rothwell
2019-05-22 1:43 Stephen Rothwell
2019-05-24 8:15 ` Joel Fernandes
2019-07-08 23:12 ` Stephen Rothwell
2019-04-23 8:46 Stephen Rothwell
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=20190708120114.5ca1613d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=christian@brauner$(echo .)io \
--cc=joel@joelfernandes$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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