Ben Hutchings <b...@decadent.org.uk> writes: > On Mon, 2012-06-04 at 22:07 +0200, Bjørn Mork wrote: >> A few changes since the bug was reported: >> >> - v3.2.19 includes a few fixes in cdc-wdm which conflict with the >> backport. The easiest way to merge these is to first revert them, do >> the backport, and then reapply the fixes as cherry-picks from >> mainline. > > Having to revert is not ideal, but it's OK.
The advantage is that all mainline patches apply cleanly. I can prepare a set without the reverts if you want that, but that would mean a number of context adjustments in the backport. > [...] >> The resulting drivers will be identical to the 3.5-rc1 versions, with >> the exception of the module_usb_driver() macro and the >> disable_hub_initiated_lpm patch: > [...] > > I'm quite happy to add module_usb_driver() if it helps to make cleaner > backports. I don't think it helps much. The mainline patch applying the macro to the drivers cannot be used anyway, as that is a bulk change touching a large number of drivers at once. And this part of the driver is rarely used as context, so it doesn't affect backporting other patches. Better just leave it as it is. Bjørn -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87zk8iuql6....@nemi.mork.no
