[lkml]   [2011]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the security-testing tree with the tree
    Hi James,

    On Thu, 30 Jun 2011 15:22:33 +1000 (EST) James Morris <> wrote:
    > On Thu, 30 Jun 2011, Stephen Rothwell wrote:
    > > I cannot merge commit bcd05ca10420 ("Merge branch 'for-security' of
    > > git:// into next")
    > > which is the child of the above two commits.
    > Actually, I may have accidentally pulled upstream commits in via the
    > above. I'll rebase my tree to the TOMOYO merge.

    It does pull in v3.0-rc5, but that is already in my tree today, so I
    still don't understand why the merge I did gets so messaed up.

    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2011-06-30 07:57    [W:0.020 / U:6.832 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site