Hi Len, On Thu, 25 Jun 2009 12:42:14 -0400 (EDT) Len Brown <lenb@xxxxxxxxxx> wrote: > > On Wed, 24 Jun 2009, Corentin Chary wrote: > > > On Wed, Jun 24, 2009 at 7:41 AM, Len Brown<lenb@xxxxxxxxxx> wrote: > > > > Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c > > > I did take a swing at merging the conflicts, but got lost. > > > So it is probably best if you refresh those last 8 eeepc-laptop.c > > > patches and send them again. > > > Isn't that fixed by http://lkml.org/lkml/2009/6/21/169 ? That is just showing how I resolved the conflict when I merged the wireless tree into linux-next that day ... > Hmm, apparently so -- I didn't receive that note. > I suppose if Stephen signed off on it, I could have applied it > and not dropped the tail of your patch series from rc1... so it is not a patch that can be applied. > Anyway, thanks for refreshing the patches, > I've checked them in and they'll be in my -rc2 push. Thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpnlgMU7TTqU.pgp
Description: PGP signature
