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

Message-Id: <20100408135903.546d3cfe.sfr@canb.auug.org.au>
Date:	Thu, 8 Apr 2010 13:59:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Samuel Ortiz <samuel@...tiz.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roel Kluin <roel.kluin@...il.com>
Subject: linux-next: manual merge of the irda tree with Linus' tree

Hi Samuel,

Today's linux-next merge of the irda tree got a conflict in
drivers/net/irda/irda-usb.c between commit
8e95a2026f3b43f7c3d676adaccd2de9532e8dcc ("drivers/net: Move && and || to
end of previous line") from Linus' tree and commit
1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 ("irda: test index before read
in stir421x_patch_device()") from the irda tree.

I used the version from the irda tree.  (I have no idea why this conflict
has just appeared given that those two commits have been in linux-next
since September and December, 2009.)
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped