[lkml]   [2010]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the workqueues tree with the Linus' tree
    Hi Tejun,

    On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <> wrote:
    > I was thinking about sending pull request w/ a note describing how to
    > resolve the conflict. Would pulling in master before requesting pull
    > be better?

    Either would work. Linus is fine with doing merge fixups and, after all,
    I figured it out. :-)

    A description always helps, of course.

    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2010-07-23 13:45    [W:0.018 / U:0.060 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site