Messages in this thread | | | Date | Tue, 17 May 2011 17:21:03 +1000 | From | Stephen Rothwell <> | Subject | Re: 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] | |