From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King - ARM Linux Subject: Re: [PATCH 07/14] media: omap3isp: remove unused clkdev Date: Sun, 5 Apr 2015 15:20:34 +0100 Message-ID: <20150405142034.GG4027@n2100.arm.linux.org.uk> References: <20150403171149.GC13898@n2100.arm.linux.org.uk> <36620233.VbNiGUfDRt@avalon> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <36620233.VbNiGUfDRt@avalon> Sender: linux-omap-owner@vger.kernel.org To: Laurent Pinchart Cc: alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-sh@vger.kernel.org, Mauro Carvalho Chehab , sakari.ailus@iki.fi List-Id: alsa-devel@alsa-project.org 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 > > Acked-by: Laurent Pinchart > > 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.