From: Stephen Rothwell <sfr@rothwell.id.au>
To: Paul Moore <paul@paul-moore.com>
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: Tue, 22 Nov 2022 08:55:50 +1100 [thread overview]
Message-ID: <20221122085550.3b8bdef9@oak.ozlabs.ibm.com> (raw)
In-Reply-To: <CAHC9VhSTLnEX58gGFCEDHo8K3CBkU33b2oqVKUvDhRyz33ibmw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1043 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-11-21 22:16 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 [this message]
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=20221122085550.3b8bdef9@oak.ozlabs.ibm.com \
--to=sfr@rothwell.id.au \
--cc=cuigaosheng1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul@paul-moore.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.