Re: linux-next: manual merge of the gpio tree with the mfd tree

[Linus Walleij]

Hi Stephen, Linus

On Tue, Jul 9, 2019 at 2:16 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> > Today's linux-next merge of the gpio tree got a conflict in:
> >
> >   drivers/gpio/Makefile
> >
> > between commit:
> >
> >   18bc64b3aebf ("gpio: Initial support for ROHM bd70528 GPIO block")
> >
> > from the mfd tree and commit:
> >
> >   db16bad6efd9 ("gpio: Sort GPIO drivers in Makefile")
> >
> > from the gpio tree.
(...)
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.

Of course I forgot to mention that in my pull request to Torvalds.

Linus: there might be some trival merge conflict in the Makefile
because Geert made a patch restructuring the Makefile and a
new GPIO driver was merged orthogonally in the MFD tree.

The resolution should be trivial, and the end result that we see
less of this because now the files are in alphabetic order so
we (or so it is believed) get a rectangular distribution of
conflicts since all filenames are equally plausible (yeah right).
It's a best effort to keep some sane order at least.

Yours,
Linus Walleij