lkml.org 
[lkml]   [2022]   [Nov]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the security tree with Linus' tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-11-21 23:17    [W:0.092 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site