* airprime.c resurrected. Bad merge?
@ 2008-07-23 0:20 Stephen Rothwell
2008-07-23 0:22 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2008-07-23 0:20 UTC (permalink / raw)
To: Linus; +Cc: Greg KH, Alan Cox, LKML, linux-next, Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 583 bytes --]
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: airprime.c resurrected. Bad merge?
2008-07-23 0:20 airprime.c resurrected. Bad merge? Stephen Rothwell
@ 2008-07-23 0:22 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2008-07-23 0:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linus, Alan Cox, LKML, linux-next, Andrew Morton
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-07-23 0:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-23 0:20 airprime.c resurrected. Bad merge? Stephen Rothwell
2008-07-23 0:22 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).