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

Message-Id: <20120423151146.8c5687c65c4eab16f063954c@canb.auug.org.au>
Date:	Mon, 23 Apr 2012 15:11:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>
Subject: linux-next: manual merge of the staging tree with the usb tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
("USB: dt9812.c: remove err() usage") from the usb tree and commit
73e2918990c0 ("staging: Fix typo in multiple files") from the staging
tree.

The former supercedes the latter, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped