-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Jiri, Jiri Kosina wrote: > On Wed, 3 Feb 2010, David Miller wrote: > >>> I think the best thing is me dropping the net/ and drivers/net hunks of >>> this patch and taking it through Davem's tree ... I have already dropped >>> those hunks from my tree. Dave, the patch is below, please consider >>> applying. >> ... >>> From: Daniel Mack <daniel@xxxxxxxx> >>> Subject: [PATCH] net: fix 'lenght' typo in comments and code >>> >>> Some misspelled occurences of 'octet' and some comments were also fixed >>> as I was on it. >>> >>> Signed-off-by: Daniel Mack <daniel@xxxxxxxx> >>> Cc: Jiri Kosina <trivial@xxxxxxxxxx> >>> Cc: Joe Perches <joe@xxxxxxxxxxx> >>> Cc: Junio C Hamano <gitster@xxxxxxxxx> >>> Signed-off-by: Jiri Kosina <jkosina@xxxxxxx> >> This doesn't apply to net-next-2.6 at all: >> >> error: patch failed: drivers/net/ppp_generic.c:1436 >> error: drivers/net/ppp_generic.c: patch does not apply >> error: drivers/net/stmmac/gmac.c: does not exist in index >> error: drivers/net/stmmac/mac100.c: does not exist in index The stmmac driver included in net-next has been restructured: for this reason both gmac.c and mac100.c files do not exist any more. Let me know if I can help on this; I mean I'm happy to apply this latest changes to the stmmac in net-next and send a new patch. Peppe > Daniel, could you please refresh the drivers/net/ and net/ bits of your > patch and resent it to netdev/Dave? > > I have already dropped it from my queue. > > Thanks, > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAktqwo0ACgkQ2Xo3j31MSSLr+QCeM4cA87vv6uQoY1rHf4Wl7Ye8 v1wAnAtI6RWt5wNUFJZRTQ2mEOP4EuE9 =G2hJ -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html