[lkml]   [2009]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the driver-core tree with the trivial tree
    On Wed, 3 Jun 2009, Stephen Rothwell wrote:

    > Today's linux-next merge of the driver-core tree got a conflict in
    > Documentation/trace/ftrace.txt between commit
    > 9976d9daf91d146724ad9c336f74c60d2195c386 ("trivial: Miscellaneous
    > documentation typo fixes") from the trivial tree and commit
    > b6b8b2b9588b3e09fea0da0e86f6b8bcba827b65 ("debugfs: Fix terminology
    > inconsistency of dir name to mount debugfs filesystem") from the
    > driver-core tree.
    > The latter removes the text that is patched by the former. I just used
    > the driver-core version. I suggest that the part of the trivial tree
    > patch that touches this file be dropped.

    Correct, the patch in trivial queue got obsoleted by the driver-core one.
    I have just dropped the version I had.


    Jiri Kosina
    SUSE Labs

     \ /
      Last update: 2009-06-03 10:11    [W:0.019 / U:1.376 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site