From mboxrd@z Thu Jan 1 00:00:00 1970 From: kvalo@codeaurora.org (Kalle Valo) Date: Mon, 16 Mar 2015 08:50:31 +0200 Subject: [PATCH v6 2/6] wl12xx: use frequency instead of enumerations for pdata clocks In-Reply-To: <3103538.jZ037SODdT@wuerfel> (Arnd Bergmann's message of "Sun, 15 Mar 2015 13:08:54 +0100") References: <1426162154-8716-1-git-send-email-eliad@wizery.com> <20150313150047.GI5264@atomide.com> <3103538.jZ037SODdT@wuerfel> Message-ID: <87lhixphag.fsf@kamboji.qca.qualcomm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Arnd Bergmann writes: > On Sunday 15 March 2015 10:43:35 Eliad Peller wrote: >> >> > The other option would be to have the whole series in a immutable >> > branch against v3.0-rc1 that can be merged into both wirelss tree >> > and omap tree. >> > >> i think that could be easier. >> >> or maybe you can just take them all through the omap tree? the wlcore >> tree is not under active development, so i don't expect conflicts >> there. > > I'm fine with both these approaches. I prefer these going through the omap tree. Like Eliad said, drivers/net/wireless/ti does not get that many changes nowadays so the chances of this patchset conflicting with something is very small. -- Kalle Valo