Re: [GIT PULL] Staging/IIO driver patches for 4.19-rc1

[Linus Torvalds]

On Sat, Aug 18, 2018 at 8:57 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> Note, you will have a merge problem with a device tree IIO file and the
> MAINTAINERS file, both resolutions are easy, just take all changed.

Heh, no. In neither case should I take all changes: the IIO was
"delete both sides"), and in the MAINTAINERS file, which was delete
one side, add another, somebody can't even sort stuff alphabetically.

> There will be a skein file merge issue as well, but that file got
> deleted so just drop that.

Yes indeed.

           Linus