[lkml]   [2008]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectairprime.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.
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2008-07-23 02:23    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean