Re: [GIT PULL] Staging/IIO driver updates for 5.13-rc1
From: Greg KH
Date: Mon Apr 26 2021 - 11:11:37 EST
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 <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> > All of these have been in linux-next for a while with no reported
> > issues.
> There was just these:
> (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