From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Adrian Remonda <adrianremonda@gmail.com>
Subject: Re: linux-next: manual merge of the spi tree with the jc_docs tree
Date: Fri, 20 Mar 2015 07:41:06 -0600 [thread overview]
Message-ID: <20150320074106.74ed3ba5@lwn.net> (raw)
In-Reply-To: <20150320162354.3ed4a511@canb.auug.org.au>
On Fri, 20 Mar 2015 16:23:54 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the spi tree got a conflict in
> Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi:
> spidev_test: Added functionalities") from the jc_docs tree and commits
> b78ce7ed5409 ("spi: spidev_test: Cleaned hexadecimal dump"),
> 31a5c5a72b90 ("") and ("") from the spi tree.
Weird, I dropped all that; I wonder how I managed to undrop it? Will do
so again, sorry for the trouble.
jon
prev parent reply other threads:[~2015-03-20 13:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 5:23 linux-next: manual merge of the spi tree with the jc_docs tree Stephen Rothwell
2015-03-20 5:30 ` Stephen Rothwell
2015-03-20 12:33 ` Mark Brown
2015-03-20 13:41 ` Jonathan Corbet [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=20150320074106.74ed3ba5@lwn.net \
--to=corbet@lwn.net \
--cc=adrianremonda@gmail.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).