linux-kernel - Re: [PATCH docs] docs: maintainers: suggest including lore link for conflicts known to linux-next

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 14 Jul 2023 08:44:22 -0700
From:   Jakub Kicinski <kuba@...nel.org>
To:     "Theodore Ts'o" <tytso@....edu>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>, corbet@....net,
        workflows@...r.kernel.org, linux-doc@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH docs] docs: maintainers: suggest including lore link for
 conflicts known to linux-next

On Thu, 13 Jul 2023 23:16:24 -0400 Theodore Ts'o wrote:
> On Thu, Jul 13, 2023 at 05:47:18PM -0700, Linus Torvalds wrote:
> > 
> > You can point to the email that Stephen sent (using lore), or you can
> > quote his resolution (or your own, if you do a test-merge, like many
> > people do) if you want.  It's not a requirement.  
> 
> Yeah, I normally do my own test merge.  I might check to see if it's
> the same as the one which is in linux-next, but the more importantly,
> I then run a full set of regression tests and make sure there are no
> new test failures caused by the merge resolution.

Alright, I guess we all end up intuiting in a similar way :)
In this case let's ditch the patch, it may do more harm than good.
Someone may read it as "if Stephen posted something - just point 
at it without thinking".