Re: airprime.c resurrected. Bad merge?

[Greg KH]

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/