linux-kernel - Re: [PATCH 1/6] Staging: w35und: Merge wbhal_f.h to wbhal

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] [day] [month] [year] [list]

Message-ID: <1294207862.5248.37.camel@jaguar>
Date:	Wed, 05 Jan 2011 08:11:02 +0200
From:	Pekka Enberg <penberg@...nel.org>
To:	Pavel Machek <pavel@....cz>
Cc:	Greg KH <greg@...ah.com>, gregkh@...e.de,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/6] Staging: w35und: Merge wbhal_f.h to wbhal_s.h

On Sun, 2011-01-02 at 10:02 +0100, Pavel Machek wrote:
> Hi!
> 
> >> This patch doesn't apply at all, what was it made against?
> >
> > They're actually patches that predate the ones you merged recently from  
> > me. I just pulled your tree to mine and did "git format-patch" without  
> > thinking about it too much.
> >
> >> Care to refresh this whole series so it can be applied?
> >
> > Sure, I can do that.
> 
> Thanks... and ACK for the whole series.

Interesting enough, Greg had already merged them before I resent them:

http://git.kernel.org/?p=linux/kernel/git/gregkh/staging-2.6.git;a=commitdiff;h=72ca8819f7f4ac4ddf82ab72ee614075821a3d00

I guess either me or Git was confused to think they hadn't been merged.
It also explains why the patches didn't apply. ;-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/