linux-kernel - airprime.c resurrected. Bad merge?

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]

Date:	Wed, 23 Jul 2008 10:20:32 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus <torvalds@...ux-foundation.org>
Cc:	Greg KH <greg@...ah.com>, Alan Cox <alan@...rguk.ukuu.org.uk>,
	LKML <linux-kernel@...r.kernel.org>, linux-next@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: airprime.c resurrected. Bad merge?

Hi Linus,

We have in your tree today:

commit 640c1bce86d1e11ee6a1263fdf6170d3210b1684 "USB: delete airprime
driver" which removes (among other things) drivers/usb/serial/airprime.c.

followed later by:

commit 95da310e66ee8090119596c70ca8432e57f9a97f "usb_serial: API all
change" which seems to have completely resurrected the same file (but
none of the other bit removed by the above commit).

In linux-next I had resolved that conflict by removing the file.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped