[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100203.200402.17600564.davem@davemloft.net>
Date: Wed, 03 Feb 2010 20:04:02 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: jkosina@...e.cz
Cc: sfr@...b.auug.org.au, linux-next@...r.kernel.org,
linux-kernel@...r.kernel.org, lsorense@...lub.uwaterloo.ca,
netdev@...r.kernel.org, daniel@...aq.de
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
From: Jiri Kosina <jkosina@...e.cz>
Date: Wed, 3 Feb 2010 11:39:47 +0100 (CET)
> 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@...aq.de>
> 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@...aq.de>
> Cc: Jiri Kosina <trivial@...nel.org>
> Cc: Joe Perches <joe@...ches.com>
> Cc: Junio C Hamano <gitster@...ox.com>
> Signed-off-by: Jiri Kosina <jkosina@...e.cz>
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
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists