linux-kernel - Re: [GIT PULL] Driver core changes for 5.18-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] [day] [month] [year] [list]

Message-ID: <YkKhJcLXeoh6qJEt@kroah.com>
Date:   Tue, 29 Mar 2022 08:03:17 +0200
From:   Greg KH <gregkh@...uxfoundation.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Saravana Kannan <saravanak@...gle.com>
Subject: Re: [GIT PULL] Driver core changes for 5.18-rc1

On Mon, Mar 28, 2022 at 12:43:39PM -0700, Linus Torvalds wrote:
> On Mon, Mar 28, 2022 at 6:39 AM Greg KH <gregkh@...uxfoundation.org> wrote:
> >
> > There will be a merge conflict in drivers/power/supply/ab8500_chargalg.c
> > with your tree, the merge conflict should be easy (take all the
> > changes).
> 
> And by "take all the changes", I'm sure you mean "take none of them,
> since the code was removed upstream in the meantime".
> 
> Easy typo to make.

Heh, yes, "typo".  :(

You are right, I did the merge the wrong way, yours was correct, thanks
for catching that.

greg k-h