[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5345680F.3040903@wwwdotorg.org>
Date: Wed, 09 Apr 2014 09:32:31 -0600
From: Stephen Warren <swarren@...dotorg.org>
To: Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
Johannes Berg <johannes@...solutions.net>
CC: Chen-Yu Tsai <wens@...e.org>, Rhyland Klein <rklein@...dia.com>,
Marc Dietrich <marvin24@....de>,
Linus Walleij <linus.walleij@...aro.org>,
Arnd Bergmann <arnd@...db.de>,
Alexandre Courbot <gnurou@...il.com>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-tegra@...r.kernel.org
Subject: Re: [PATCHv3 0/5] net: rfkill: gpio: cleanup and a few new acpi ids
On 04/09/2014 04:01 AM, Heikki Krogerus wrote:
> Hi,
>
> On Tue, Apr 08, 2014 at 10:37:55AM +0200, Johannes Berg wrote:
>> On Tue, 2014-04-01 at 17:02 +0300, Heikki Krogerus wrote:
>>> I hope this one is OK with everyone.
>>
>> It's fine with me. Are you expecting me to pick up any of these patches,
>> or do you want them to go through some other tree? Either way is fine
>> with me, but the first patch looks like something I probably shouldn't
>> be taking.
>
> The second patch depends on it.
>
> Stephen! Are you expecting any changes to board-paz00.c in this kernel
> cycle? If not, I think it would be easiest if Johannes, you take the
> whole set. What do you guys think?
I can't predict the future, but the chances are pretty slim - that file
is pretty tiny and doesn't have much churn.
The best approach is to put this series in its own topic branch. Then,
if any conflict does come up, I can simply merge the branch into the
Tegra treee and apply the conflicting patches on top.
--
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/
Powered by blists - more mailing lists