lkml.org 
[lkml]   [2021]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] Staging/IIO driver updates for 5.13-rc1
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@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.32d51a3a@canb.auug.org.au/
>
> https://lore.kernel.org/linux-next/20210331175151.67fcfe4d@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

\
 
 \ /
  Last update: 2021-04-26 17:13    [W:0.087 / U:0.376 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site