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]

Date:	Mon, 2 Aug 2010 15:23:35 -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,
	"Prashant P. Shah" <pshah.mumbai@...il.com>,
	Dominik Brodowski <linux@...inikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging-next tree with the
 pcmcia tree

On Mon, Aug 02, 2010 at 01:57:46PM +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 commits
> 9b3efec734d2d79d82a6f5cef25a618d41a6b2c5 ("pcmcia: do not use io_req_t
> after call to pcmcia_request_io()") and
> cd8ae1e0a5d36406b518cea25446492f07ddddcf ("pcmcia: do not use io_req_t
> when calling pcmcia_request_io()") from the pcmcia tree and commit
> 6d98be390ab55bb5f617d69aedf9bec27d039b3b ("Staging: wl_cs.c: converted
> space to tabs in wl_cs.c") from the staging-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Those fixes are fine, thanks for doing this.

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/