[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1397201173.4420.0.camel@jlt4.sipsolutions.net>
Date: Fri, 11 Apr 2014 09:26:13 +0200
From: Johannes Berg <johannes@...solutions.net>
To: Stephen Warren <swarren@...dotorg.org>
Cc: Heikki Krogerus <heikki.krogerus@...ux.intel.com>,
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 Wed, 2014-04-09 at 09:32 -0600, Stephen Warren wrote:
> > 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.
Ok, I'll do that. Shout now if you don't want these patches merged :)
johannes
--
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