lkml.org 
[lkml]   [2012]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: unusual update of the security tree
Hi James,

On Thu, 6 Dec 2012 08:25:21 -0800 Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
> Have people pulled that thing into anything else? Because quite
> frankly, I think it's unsalvageable except with a rebase.

So to be explicit, I think you need to do this:

- tell as many people as possible that you are going to rebase
your tree
- reset your tree back to the point just before you pulled Casey's
tree (3f0cc6ae8662).
- Casey needs to rebase his tree on top of yours
- then after Casey has tested his tree again you can repull his
new tree.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-12-06 23:01    [W:2.077 / U:0.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site