linux-kernel - Re: [GIT PULL] header cleanups for 6.8

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] [thread-next>] [day] [month] [year] [list]

Date: Thu, 11 Jan 2024 08:32:42 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Kent Overstreet <kent.overstreet@...ux.dev>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
 linux-kernel@...r.kernel.org, Andy Lutomirski <luto@...capital.net>, Boqun
 Feng <boqun.feng@...il.com>, Huacai Chen <chenhuacai@...nel.org>, Ingo
 Molnar <mingo@...hat.com>, Kees Cook <keescook@...omium.org>, Paul McKenney
 <paulmck@...nel.org>, Peter Zijlstra <peterz@...radead.org>, Thomas
 Gleixner <tglx@...utronix.de>, Waiman Long <longman@...hat.com>, WANG
 Xuerui <kernel@...0n.name>, Will Deacon <will@...nel.org>, Will Drewry
 <wad@...omium.org>, Suren Baghdasaryan <surenb@...gle.com>
Subject: Re: [GIT PULL] header cleanups for 6.8

Hi Kent,

On Wed, 10 Jan 2024 16:19:17 -0500 Kent Overstreet <kent.overstreet@...ux.dev> wrote:
>
> There were two merge conflicts in arch headers in next; they looked
> pretty trivial. But now I'm wondering - do we have standard
> tools/process for recording what the merge conflict and resolution were?
> I'm sure we must.

For simple conflicts (like these) the easiest thing to do is just provide
lore URLs to my notifications:

https://lore.kernel.org/all/20231218170015.6018162e@canb.auug.org.au/
https://lore.kernel.org/all/20231218170547.5714468f@canb.auug.org.au/

for more complex cases, you might want to do the merge with Linus' tree in a
temporary branch of your tree and add a note pointing that out in case Linus
wants to check his own resolutions against yours.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped