On Sat, Apr 04, 2015 at 12:44:35AM +0300, Laurent Pinchart wrote: > Hi Russell, > > Thank you for the patch; > > On Friday 03 April 2015 18:12:58 Russell King wrote: > > No merged platform supplies xclks via platform data. As we want to > > slightly change the clkdev interface, rather than fixing this unused > > code, remove it instead. > > > > Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> > > Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > > with one caveat though : it conflicts with patches queued for v4.1 in the > media tree. I'll post a rebased version in a reply to your e-mail. How would > you like to handle the conflict ? How bad is the conflict? -- FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net. -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
