[lkml]   [2018]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: [GIT PULL] Staging/IIO driver patches for 4.19-rc1
On Sat, Aug 18, 2018 at 8:57 AM Greg KH <> 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.


 \ /
  Last update: 2018-08-18 20:01    [W:0.085 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site