Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935880Ab3DPOl7 (ORCPT ); Tue, 16 Apr 2013 10:41:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29733 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935469Ab3DPOl5 (ORCPT ); Tue, 16 Apr 2013 10:41:57 -0400 Message-ID: <516D5956.2090409@redhat.com> Date: Tue, 16 Apr 2013 10:59:50 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130402 Thunderbird/17.0.5 MIME-Version: 1.0 To: Samuel Ortiz CC: Andrey Smirnov , Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree References: <20130410134813.b1bff6027f64f14d75d43927@canb.auug.org.au> <20130410064253.GA4874@zurbaran> <20130410064828.6c946ad8@redhat.com> <20130416135137.GA31283@zurbaran> In-Reply-To: <20130416135137.GA31283@zurbaran> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1465 Lines: 42 Em 16-04-2013 10:51, Samuel Ortiz escreveu: > Hi Mauro, > > On Wed, Apr 10, 2013 at 06:48:28AM -0300, Mauro Carvalho Chehab wrote: >> Em Wed, 10 Apr 2013 08:42:53 +0200 >> Samuel Ortiz escreveu: >> >>> Hi Stephen, >>> >>> On Wed, Apr 10, 2013 at 01:48:13PM +1000, Stephen Rothwell wrote: >>>> Hi Samuel, >>>> >>>> Today's linux-next merge of the mfd tree got a conflict in >>>> drivers/mfd/Kconfig between commit 3f8ec5df11aa ("[media] mfd: Add header >>>> files and Kbuild plumbing for SI476x MFD core") from the v4l-dvb tree and >>>> commit ab85b120e692 ("mfd: Kconfig alphabetical re-ordering") from the >>>> mfd tree. >>> I'm surprised the v4l-dvb tree is carrying this patchset because I haven't >>> ACKed it. >> >> Sorry. Not sure why I understood that you gave your ack. Perhaps I miss-read >> one of the comments of that thread. > I haven't heard back from Andrey yet. If I don't get anything from him on > Wednesday, would you mind reverting this patchset ? I have not ACKed it > because it breaks bisectability, and it conflicts with mfd-next. Sure. Just ping me and I'll revert it. > > Andrey, any plans to adress my comments from last week ? > > Cheers, > Samuel. > Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/