On Tue, Apr 27, 2021 at 12:26:48AM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 26 Apr 2021 14:46:10 +0200 Greg KH <gre...@linuxfoundation.org> wrote: > > > > All of these have been in linux-next for a while with no reported > > issues. > > There was just these: > > https://lore.kernel.org/linux-next/20210329165525.32d51...@canb.auug.org.au/ > > https://lore.kernel.org/linux-next/20210331175151.67fcf...@canb.auug.org.au/ > > (the scmi tree commit mentioned in the latter is now in the arm-soc tree) > > Not issues as such, but worth mentioning the conflicts and resolutions.
Yeah, merge issues with other trees are hard to resolve in the single tree here, not much I can just yet, have to wait for them to hit Linus's tree. thanks, greg k-h _______________________________________________ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
