lkml.org 
[lkml]   [2014]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-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]
    \
     
     \ /
      Last update: 2014-08-26 08:21    [W:4.076 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site