On Tue, Nov 11, 2008 at 11:37:38AM +0000, Alan Cox wrote: > > It is not normal practice to merge add-device-id patches through > > bus-specific trees. We do not do such things with PCI IDs, for example. > > We've also been parallel applying patches via myself through Jeff and via > Bart since the beginnings of libata without a problem. So it ain't > broke .... 795659ef0ee175d47723f806e7a29427b171e61b . Let's just try to apply new IDs to both files, and not cherry-pick parts of such a patch? Best, Dominik -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html