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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <X9iiwr5Lf8l8TOpP@kroah.com>
Date:   Tue, 15 Dec 2020 12:49:22 +0100
From:   Greg KH <gregkh@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     devel@...uxdriverproject.org,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] Staging/IIO driver changes for 5.11-rc1

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@...uxfoundation.org> 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@canb.auug.org.au/

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