lkml.org 
[lkml]   [2011]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the tip tree with the wireless tree
Hi Paul,

On Tue, 17 May 2011 00:05:58 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> One of these is mine in -tip (0744371aeb). Please let me know what
> I should be doing about it.

In this case, I would say absolutely nothing (assuming I did the
resolution correctly) :-) If I can figure it out, Linus can as well and
will do so when these trees hit his in a week or so.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-05-17 09:23    [W:7.396 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site