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: <20100428152539.GB4483@kroah.com>
Date:	Wed, 28 Apr 2010 08:25:39 -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,
	Dominik Brodowski <linux@...inikbrodowski.net>
Subject: Re: linux-next: manual merge of the staging-next tree with the
 pcmcia tree

On Wed, Apr 28, 2010 at 04:11:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/netwave/netwave_cs.c between commit
> c8bf6e66c254bba7d0ea3f5d02420776dceac657 ("pcmcia: re-work
> pcmcia_request_irq()") from the pcmcia tree and commit
> 3c7475d0aaad3614f6b1db291310c577eee3fb33 ("Staging: netwave: fixed
> trailing whitespace style issue in netwave_cs.c") from the staging-next
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Fix looks fine, 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/