On Sun, Jan 05, 2020 at 12:53:33PM +0000, Jonathan Cameron wrote: > Hi Greg, > > I did see a merge conflict when merging this your staging/staging-next > around deletion of include/Kbuild > > I've not been following what has been going on around that, but simply > removing the file seems to be the obvious solution. Looks sane, now pulled and pushed out, thanks. greg k-h
