linux-kernel - Re: linux-next: manual merge of the char-misc tree with the mfd tree

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: <Yh09/r/nT2LeE82n@kroah.com>
Date:   Mon, 28 Feb 2022 22:26:22 +0100
From:   Greg KH <greg@...ah.com>
To:     Lee Jones <lee.jones@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Arnd Bergmann <arnd@...db.de>,
        Alistair Francis <alistair@...stair23.me>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Robert Marko <robert.marko@...tura.hr>
Subject: Re: linux-next: manual merge of the char-misc tree with the mfd tree

On Mon, Feb 28, 2022 at 12:46:44PM +0000, Lee Jones wrote:
> On Mon, 28 Feb 2022, Greg KH wrote:
> 
> > On Mon, Feb 28, 2022 at 09:01:49AM +0000, Lee Jones wrote:
> > > On Mon, 28 Feb 2022, Stephen Rothwell wrote:
> > > 
> > > > Hi all,
> > > > 
> > > > Today's linux-next merge of the char-misc tree got a conflict in:
> > > 
> > > I did ask for this *not* to be merged when it was in -testing.
> > 
> > Sorry, I missed that, I saw your ack on the patch so that's why I took
> > it.
> > 
> > > I'll follow-up with Greg.
> > 
> > Should I revert this from my tree?
> 
> I did try to catch it before a revert would have been required.

My fault.

> But yes, please revert it.

Will go do so now.

> The Ack is not standard and should not be merged.

I do not understand this, what went wrong here?

thanks,

greg k-h