Re: linux-next: manual merge of the jc_docs tree with the mm-unstable tree

[Mark Brown]

On Wed, Jul 15, 2026 at 09:20:29AM -0700, Andrew Morton wrote:
> On Wed, 15 Jul 2026 16:40:19 +0100 Mark Brown <broonie@xxxxxxxxxx> wrote:

> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging.  You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.

> There was no "see below".

It was a noop resolution (just take your copy) so didn't generate a diff
and I forgot to do a diff -c instead, sorry.

Attachment: signature.asc
Description: PGP signature