airprime.c resurrected. Bad merge? - Kernel

This is a discussion on airprime.c resurrected. Bad merge? - Kernel ; 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 ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: airprime.c resurrected. Bad merge?

  1. 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@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/

    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.9 (GNU/Linux)

    iEYEARECAAYFAkiGeVAACgkQjjKRsyhoI8yuFgCaAiSgt2iMSR a9asDz7ObUvhHS
    2hoAn1w1e8pmoGBZ/SYj+9sGWIYiamFb
    =GDgm
    -----END PGP SIGNATURE-----


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

+ Reply to Thread