Re: [GIT PULL] Staging/IIO driver changes for 5.11-rc1

[Greg KH]

On Tue, Dec 15, 2020 at 10:37:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 15 Dec 2020 11:17:49 +0100 Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > All have been in linux-next for a while with no reported issues.
> 
> There is, however, a semantic conflict with a commit that is now in
> Linus' tree:
> 
> https://lore.kernel.org/lkml/20201207164601.2b9cefc8@xxxxxxxxxxxxxxxx/

Ah, I missed that this hit Linus's tree already, I thought it was only
in linux-next.

As I can't fix it without doing the merge myself, either Linus can pull
this directly from lore using 'b4' or I can send it after he does the
merge.

Linus, your call.

thanks,

greg k-h