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

From: Theodore Ts'o
Date: Thu Jul 13 2023 - 23:16:46 EST


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.

- Ted