On Sun, Apr 19, 2020 at 06:26:01PM +0100, Jonathan Cameron wrote: > Hi Greg, > > Just a quick note to say there is a trivial merge conflict in MAINTAINERS > due to Linus sorting the file using the parse-maintainers script. > > The resolution is fairly obvious but involves manually dropping > the line that ends up duplicated if you just grab the hunk from the > patch in here. > > Note that patch is here as the large number of bounces people are getting > has lead to requests for me to hurry that one through. Now merged, the MAINTAINERS thing was easy to sort out, thanks! greg k-h
