Hi Greg, Here the backported patch linux-4.1.y. The conflict was caused by the backport 5fe45c8dbe3f1927db62fbbbc37b64cbe41967b4 - serial: 8250_pci: Add support for Pericom PI7C9X795[1248] I only made a test build for the change, but I see not problems since the conflict was in the part where the defines of the device-ids are moved. -- Thanks, Soeren -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html