From: Paul Moore <paul@paul-moore.com>
To: Stephen Rothwell <sfr@rothwell.id.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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 18:09:09 -0500 [thread overview]
Message-ID: <CAHC9VhQcxSJHM-mM--EFY9tJKDr-8x-B2__QV10vw7t1ShqQWA@mail.gmail.com> (raw)
In-Reply-To: <20221122085550.3b8bdef9@oak.ozlabs.ibm.com>
On Mon, Nov 21, 2022 at 4:56 PM Stephen Rothwell <sfr@rothwell.id.au> wrote:
>
> Hi Paul,
>
> On Mon, 21 Nov 2022 13:47:18 -0500 Paul Moore <paul@paul-moore.com> wrote:
> >
> > 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.
>
> Sorry about that. Some maintainers will just send a "heads up" email
> with a suggested resolution patch (but I don't get very many). That
> can be very helpful for complicated (or non obvious) conflicts. I
> still generally look at how to fix them myself (and report them), but
> it can save me considerable time in particularly obscure cases.
Okay, I'll make a mental note to send a FYI to the linux-next list
next time I notice a merge conflict. The real trick will be to see if
I actually manage to remember the next time I see one ;)
--
paul-moore.com
next prev parent reply other threads:[~2022-11-21 23:09 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
2022-11-21 21:55 ` Stephen Rothwell
2022-11-21 23:09 ` Paul Moore [this message]
-- 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=CAHC9VhQcxSJHM-mM--EFY9tJKDr-8x-B2__QV10vw7t1ShqQWA@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 \
--cc=sfr@rothwell.id.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).