From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: "Arnd Bergmann" <arnd@arndb•de>,
"Linux-Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
"Sagar Dharia" <sdharia@codeaurora•org>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro•org>,
"David Kershner" <david.kershner@unisys•com>
Subject: Re: linux-next: manual merge of the staging tree with the char-misc-next tree
Date: Wed, 20 Dec 2017 21:14:24 +1100 [thread overview]
Message-ID: <20171220211424.3cd25fb6@canb.auug.org.au> (raw)
In-Reply-To: <20171220085557.GA25945@kroah.com>
Hi Greg,
On Wed, 20 Dec 2017 09:55:57 +0100 Greg KH <greg@kroah•com> wrote:
>
> Looks good! Sorry for the conflict, I knew it was going to happen :(
I don't mind the trivial ones like this ...
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2017-12-20 10:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 2:32 linux-next: manual merge of the staging tree with the char-misc-next tree Stephen Rothwell
2017-12-20 8:55 ` Greg KH
2017-12-20 10:14 ` 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=20171220211424.3cd25fb6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=david.kershner@unisys$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sdharia@codeaurora$(echo .)org \
--cc=srinivas.kandagatla@linaro$(echo .)org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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