From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Chanwoo Choi <cw00.choi@samsung.com>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the extcon tree with the usb tree
Date: Fri, 10 Jun 2022 20:51:29 +1000 [thread overview]
Message-ID: <20220610205129.18a3c372@canb.auug.org.au> (raw)
In-Reply-To: <YqMMzfFtWiZM8iOw@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
Hi Greg,
On Fri, 10 Jun 2022 11:20:13 +0200 Greg KH <greg@kroah.com> wrote:
> >
> > This merge resolution seems to have been lost somewhere along the way
> > :-(
>
> I've taken your resolution in the tree now, sorry for the delay.
Thanks. I have now dropped my copy.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-06-10 10:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 5:27 linux-next: manual merge of the extcon tree with the usb tree Stephen Rothwell
2022-04-26 9:42 ` Greg KH
2022-05-23 8:42 ` Stephen Rothwell
2022-06-04 1:18 ` Stephen Rothwell
2022-06-04 10:00 ` Greg KH
2022-06-10 9:20 ` Greg KH
2022-06-10 10:51 ` Stephen Rothwell [this message]
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=20220610205129.18a3c372@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrew.smirnov@gmail.com \
--cc=arnd@arndb.de \
--cc=cw00.choi@samsung.com \
--cc=dan.carpenter@oracle.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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).