From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Gaosheng Cui <cuigaosheng1@huawei.com>,
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 security tree with Linus' tree
Date: Mon, 21 Nov 2022 13:47:18 -0500 [thread overview]
Message-ID: <CAHC9VhSTLnEX58gGFCEDHo8K3CBkU33b2oqVKUvDhRyz33ibmw@mail.gmail.com> (raw)
In-Reply-To: <20221121142014.0ae7c8ff@canb.auug.org.au>
On Sun, Nov 20, 2022 at 10:20 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the security tree got a conflict in:
>
> security/commoncap.c
>
> between commit:
>
> 8cf0a1bc1287 ("capabilities: fix potential memleak on error path from vfs_getxattr_alloc()")
>
> from Linus' tree and commit:
>
> f6fbd8cbf3ed ("lsm,fs: fix vfs_getxattr_alloc() return type and caller error paths")
>
> from the security tree.
>
> I fixed it up (I just used the latter) and can carry the fix as
> necessary.
That's more or less what I've done with my builds, thanks Stephen.
I asked this on a previous conflict but never received an answer so
I'll ask it one more time: is there a recommended way to notify
linux-next of an upcoming conflict? I generally notice the merge
conflict within a few minutes of merging the patches into a -next
branch, and fix it shortly afterwards. I'm happy to provide a
heads-up, and a merge example, but I'm not sure what the process is
for that, if any. Or, would you simply prefer to notice it yourself?
I'm not bothered either way, I just thought you might appreciate the
heads-up.
--
paul-moore.com
next prev parent reply other threads:[~2022-11-21 18:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 3:20 linux-next: manual merge of the security tree with Linus' tree Stephen Rothwell
2022-11-21 18:47 ` Paul Moore [this message]
2022-11-21 21:55 ` Stephen Rothwell
2022-11-21 23:09 ` Paul Moore
-- strict thread matches above, loose matches on Subject: below --
2022-09-01 2:27 Stephen Rothwell
2022-09-01 13:56 ` Paul Moore
2019-08-21 3:09 Stephen Rothwell
2019-08-21 3:05 Stephen Rothwell
2019-08-21 3:01 Stephen Rothwell
2019-08-21 3:18 ` Stephen Rothwell
2019-08-12 4:48 Stephen Rothwell
2015-08-04 1:14 Stephen Rothwell
2013-02-04 3:06 Stephen Rothwell
2013-01-21 2:12 Stephen Rothwell
2013-01-21 3:10 ` Mimi Zohar
2013-01-21 4:30 ` Stephen Rothwell
2012-10-17 0:41 Stephen Rothwell
2012-10-17 0:52 ` Stephen Rothwell
2012-10-17 0:41 Stephen Rothwell
2012-10-17 0:41 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=CAHC9VhSTLnEX58gGFCEDHo8K3CBkU33b2oqVKUvDhRyz33ibmw@mail.gmail.com \
--to=paul@paul-moore.com \
--cc=cuigaosheng1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).