From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@zeniv•linux.org.uk>
Cc: Kees Cook <keescook@chromium•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 execve tree with the vfs tree
Date: Tue, 13 Dec 2022 10:12:47 +1100 [thread overview]
Message-ID: <20221213101247.1d252d9d@canb.auug.org.au> (raw)
In-Reply-To: <20221128143704.3fe8f7b1@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 954 bytes --]
Hi all,
On Mon, 28 Nov 2022 14:37:04 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the execve tree got a conflict in:
>
> fs/binfmt_elf.c
>
> between commit:
>
> 9a938eba8d28 ("kill coredump_params->regs")
>
> from the vfs tree and commit:
>
> 8f6e3f9e5a0f ("binfmt: Fix whitespace issues")
>
> from the execve tree.
>
> I fixed it up (I just use the former where they conflicted, so may have
> lost some white space fixups) 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.
This is now a conflict between the vfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-12-12 23:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 3:37 linux-next: manual merge of the execve tree with the vfs tree Stephen Rothwell
2022-12-12 23:12 ` Stephen Rothwell [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=20221213101247.1d252d9d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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