From: Christian Brauner <brauner@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Kees Cook <keescook@chromium.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree
Date: Mon, 3 Jul 2023 09:50:49 +0200 [thread overview]
Message-ID: <20230703-dreharbeiten-waggon-4a4432ecb886@brauner> (raw)
In-Reply-To: <20230703094250.40be7092@canb.auug.org.au>
On Mon, Jul 03, 2023 at 09:42:50AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pidfd tree got conflicts in:
>
> kernel/pid.c
> kernel/pid_namespace.c
>
> between commits:
>
> b69f0aeb0689 ("pid: Replace struct pid 1-element array with flex-array")
> dd546618ba70 ("pid: use struct_size_t() helper")
>
> from Linus' tree and commit:
>
> 757777eef55b ("pid: Replace struct pid 1-element array with flex-array")
>
> from the pidfd tree.
>
> I fixed it up (I used the former version) 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.
I'm dropping the patch since we fixed this in mainline.
next prev parent reply other threads:[~2023-07-03 7:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-02 23:42 linux-next: manual merge of the pidfd tree with Linus' tree Stephen Rothwell
2023-07-03 7:50 ` Christian Brauner [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-15 5:32 Stephen Rothwell
2019-07-04 8:44 Stephen Rothwell
2019-07-01 10:35 Stephen Rothwell
2019-07-09 0:19 ` Stephen Rothwell
2019-06-06 5:40 Stephen Rothwell
2019-06-06 5:40 ` Stephen Rothwell
2019-07-08 23:17 ` Stephen Rothwell
2019-05-22 1:01 Stephen Rothwell
2019-05-22 5:52 ` Greg Kroah-Hartman
2019-05-22 7:48 ` Stephen Rothwell
2019-05-22 7:55 ` Christian Brauner
2019-05-22 8:05 ` 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=20230703-dreharbeiten-waggon-4a4432ecb886@brauner \
--to=brauner@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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).