linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Saravana Kannan <saravanak@google.com>
Subject: Re: [GIT PULL] Driver core changes for 5.18-rc1
Date: Tue, 29 Mar 2022 08:03:17 +0200	[thread overview]
Message-ID: <YkKhJcLXeoh6qJEt@kroah.com> (raw)
In-Reply-To: <CAHk-=wgqY_5oWAFvp=zO_HqbdYsQLK+5O3DFgEpRM3MLjNZ9eQ@mail.gmail.com>

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@linuxfoundation.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

  reply	other threads:[~2022-03-29  6:03 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28 13:39 [GIT PULL] Driver core changes for 5.18-rc1 Greg KH
2022-03-28 19:43 ` Linus Torvalds
2022-03-29  6:03   ` Greg KH [this message]
2022-03-28 20:28 ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YkKhJcLXeoh6qJEt@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=saravanak@google.com \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).