From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>, Jonathan Corbet <corbet@lwn•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Adrian Remonda <adrianremonda@gmail•com>
Subject: linux-next: manual merge of the spi tree with the jc_docs tree
Date: Fri, 20 Mar 2015 16:23:54 +1100 [thread overview]
Message-ID: <20150320162354.3ed4a511@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Hi Mark,
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.
Clearly the one commit in the jc_docs tree is supposed to do the same
as three commits in the spi tree. The jc_docs tree version has an
older Author date, but a newer commit date ...
I fixed it up (by using the spi tree version of the file) and can carry
the fix as necessary (no action is required).
BTW, there is a function in there called "unespcape" whose comment
calls it "Unescape" which would make more sense.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-03-20 5:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 5:23 Stephen Rothwell [this message]
2015-03-20 5:30 ` linux-next: manual merge of the spi tree with the jc_docs tree Stephen Rothwell
2015-03-20 12:33 ` Mark Brown
2015-03-20 13:41 ` Jonathan Corbet
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=20150320162354.3ed4a511@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adrianremonda@gmail$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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