Messages in this thread | | | Date | Thu, 11 Jan 2024 08:32:42 +1100 | From | Stephen Rothwell <> | Subject | Re: [GIT PULL] header cleanups for 6.8 |
| |
Hi Kent,
On Wed, 10 Jan 2024 16:19:17 -0500 Kent Overstreet <kent.overstreet@linux.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 [unhandled content-type:application/pgp-signature] | |