From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Wed, 9 Jul 2008 09:40:37 +1000 > Hi John, > > On Tue, 8 Jul 2008 16:30:44 -0400 "John W. Linville" <linville@xxxxxxxxxxxxx> wrote: > > > > I just sent a pull request for Dave that will result in a merge > > conflict in linux-next. I have a sample merge available here: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 merge-test > > > > Just a heads-up... :-) > > > > John > > > > P.S. These are one-liners (including the one from yesterday). > > Nevertheless, it can't hurt to provide a reference "just in > > case"... :-) > > Appreciated, thanks. I just merged net-2.6 into net-next-2.6 and sorted all of the merge issues out, so I hope you won't bump into anything :) -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
