Received-SPF: pass (google.com: domain of linux-kernel+bounces-22816-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 11 Jan 2024 08:32:42 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
 linux-kernel@vger.kernel.org, Andy Lutomirski <luto@amacapital.net>, Boqun
 Feng <boqun.feng@gmail.com>, Huacai Chen <chenhuacai@kernel.org>, Ingo
 Molnar <mingo@redhat.com>, Kees Cook <keescook@chromium.org>, Paul McKenney
 <paulmck@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Thomas
 Gleixner <tglx@linutronix.de>, Waiman Long <longman@redhat.com>, WANG
 Xuerui <kernel@xen0n.name>, Will Deacon <will@kernel.org>, Will Drewry
 <wad@chromium.org>, Suren Baghdasaryan <surenb@google.com>
Subject: Re: [GIT PULL] header cleanups for 6.8
Message-ID: <20240111083215.1e5298f4@oak>
In-Reply-To: <ualbkbj75ulsbwbjuphntw7ztb45r2q7iysvxvklmyv5ndnvh7@zxr56mv33vyv>
References: <ualbkbj75ulsbwbjuphntw7ztb45r2q7iysvxvklmyv5ndnvh7@zxr56mv33vyv>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/tmnL2H+ZIxa/u./tNlrenwK";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/tmnL2H+ZIxa/u./tNlrenwK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Kent,

On Wed, 10 Jan 2024 16:19:17 -0500 Kent Overstreet <kent.overstreet@linux.d=
ev> 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/tmnL2H+ZIxa/u./tNlrenwK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWfDPoACgkQAVBC80lX
0Gy9PQf+P4yruHSDMzYIO5JA6UGhjunRM7cUcAyAIAitj+iSdy96KvWkNLmq5I0E
7ax4ahojE063Xs+n01v4iHsjE3TWRJtnyjOTPGMppA8SroZZKFrigp0YcSKM2vn1
y6DAvn2vbtX7Og0rmC2i9vfNEfuTFPuWbyAQoGRgmHrvFsm2kT5qYJZyQYunZL7J
ZH31TnyOoX2Naisop+g4E5S0x6lhr7SUrSoNv9993aLEBQVKDrUH5IjxTjRqtudE
3fz5JC7U/KnlMP3pg/HYmN/YlkcJt1M7pe4bjWuefxW8ZsiFpEMTpePLTvlPJ7rP
4jSLo6U7ULrKYehjDlO/9Qg0J3qlnA==
=zANN
-----END PGP SIGNATURE-----

--Sig_/tmnL2H+ZIxa/u./tNlrenwK--