On Sat, Aug 18, 2018 at 11:00:20AM -0700, Linus Torvalds wrote: > On Sat, Aug 18, 2018 at 8:57 AM Greg KH <gre...@linuxfoundation.org> 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.
Ah, wow, I totally read that diff backwards, you are right, thanks. greg k-h
