Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 22 Nov 2022 08:55:50 +1100
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
Message-ID: <20221122085550.3b8bdef9@oak.ozlabs.ibm.com>
In-Reply-To: <CAHC9VhSTLnEX58gGFCEDHo8K3CBkU33b2oqVKUvDhRyz33ibmw@mail.gmail.com>
References: <20221121142014.0ae7c8ff@canb.auug.org.au>
        <CAHC9VhSTLnEX58gGFCEDHo8K3CBkU33b2oqVKUvDhRyz33ibmw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tkHXnsw91Tz5On1k5VMKro5";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/tkHXnsw91Tz5On1k5VMKro5
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/tkHXnsw91Tz5On1k5VMKro5
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN78+YACgkQAVBC80lX
0Gyg8AgAgBfDD9n/2AsJl9dO9Fpk7NYl7kVJWmUI3+JQTMSrYL46wrhb8OKCRo37
/DCG1SDU22L1BnN2oO4FST7NsVpYjL7XQKjTsUqHVhZEelwJuIRGR0wDbhsv2xVB
kFWQ/gSS9Rvc94VJzcr8J66CNAGDfzFfEfo1GuyIUfGQQj+aFtxPDiXEnYW/Rg3H
lXZNTftzWiY+SFBBqM/miVL/PEZL2LJuYUFOiCQBbTBJCBSb03y4kxkXezFUX8NV
h6YARMR5boRbU2OsVHu4G0MJwoguL+nVL+CGyqfjzO++BwsRGM7Qh/w4SwR0ZZWY
XxQ5urxjAe/nxTsgqUvsuowOPC/gnQ==
=f3rv
-----END PGP SIGNATURE-----

--Sig_/tkHXnsw91Tz5On1k5VMKro5--