On Sat, Feb 3, 2018 at 2:30 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
> There was a small merge conflict in MAINTAINERS in linux-next, but that
> should be easy to fix.

Well, that one wouldn't have happened at all if the i2c people knew
how to sort things..

It also grew a few other conflicts since linux-next, but hopefully I
got those right too.

              Linus