linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Date:	Tue, 22 Jul 2008 17:22:20 -0700
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Linus <torvalds@...ux-foundation.org>,
	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: Re: airprime.c resurrected. Bad merge?

On Wed, Jul 23, 2008 at 10:20:32AM +1000, Stephen Rothwell wrote:
> 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.

Yeah, the file should be removed.

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/