Messages in this thread | | | Date | Tue, 26 Aug 2014 15:48:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rd-docs tree with the trivial tree |
| |
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 [unhandled content-type:application/pgp-signature] | |