linux-kernel - Re: linux-next: manual merge of the staging-next tree with the pcmcia 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] [day] [month] [year] [list]

Message-ID: <20100517180130.GC16419@kroah.com>
Date:	Mon, 17 May 2010 11:01:30 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Henk de Groot <henk.de.groot@...net.nl>,
	Dominik Brodowski <linux@...inikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging-next tree with the
 pcmcia tree

On Mon, May 17, 2010 at 03:49:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/wlags49_h2/wl_cs.c between commit
> eb14120f743d29744d9475bffec56ff4ad43a749 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 93822ad193f1b1d92422dc3d539456acbe1a85ef ("Staging: wlags49_hs2: Fix
> wlags49_hs2 driver after build fixes broke it") from the staging-next
> tree.
> 
> I fixed it up (see below - basically the staging-next version) and can
> carry the fix as necessary.

Looks good to me, thanks.

greg k-h
--
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/