linux-kernel - Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <516D5956.2090409@redhat.com>
Date:	Tue, 16 Apr 2013 10:59:50 -0300
From:	Mauro Carvalho Chehab <mchehab@...hat.com>
To:	Samuel Ortiz <sameo@...ux.intel.com>
CC:	Andrey Smirnov <andrew.smirnov@...il.com>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the mfd tree with the v4l-dvb tree

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 <sameo@...ux.intel.com> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/