netdev - Re: linux-next: manual merge of the trivial tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 4 Feb 2010 10:52:34 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	David Miller <davem@...emloft.net>
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

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@...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

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,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
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