From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Randy Dunlap <rdunlap@infradead•org>, Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pranith Kumar <bobby.prani@gmail•com>,
Christoph Lameter <cl@linux•com>
Subject: linux-next: manual merge of the rd-docs tree with the trivial tree
Date: Tue, 26 Aug 2014 15:48:23 +1000 [thread overview]
Message-ID: <20140826154823.086bed75@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Randy,
Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/this_cpu_ops.txt between commit 0c3ed93c1c2c ("doc: fix
acronym for read-modify-write") from the trivial tree and commit
1a62db155b94 ("doc: this_cpu_ops.txt: Update description of
this_cpu_ops") from the rd-docs tree.
I fixed it up (the latter is a superset of the former) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-08-26 5:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-26 5:48 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-09 7:14 linux-next: manual merge of the rd-docs tree with the trivial tree Stephen Rothwell
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=20140826154823.086bed75@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bobby.prani@gmail$(echo .)com \
--cc=cl@linux$(echo .)com \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)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