From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v6 2/6] wl12xx: use frequency instead of enumerations for pdata clocks
Date: Mon, 16 Mar 2015 08:15:55 -0700 [thread overview]
Message-ID: <20150316151554.GO5264@atomide.com> (raw)
In-Reply-To: <87lhixphag.fsf@kamboji.qca.qualcomm.com>
* Kalle Valo <kvalo@codeaurora•org> [150315 23:50]:
> Arnd Bergmann <arnd@arndb•de> 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.
OK great. In that case no need to rearrange the patches, I can
apply them into an immutable branch once the pending issues have
been fixed if Kalle acks them.
To avoid merge conflicts that branch is easiest done against
v4.0-rc4. Kalle and Arnd, does that work for you guys?
I can also base it on 5b7610f23562 ("ARM: OMAP2+: Fix wl12xx on
dm3730-evm with mainline u-boot") that's on top of -rc2 plus few
other fixes now merged to -rc4 mainline if we need a branch based
on an earlier tag.
Regards,
Tony
next prev parent reply other threads:[~2015-03-16 15:15 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-12 12:09 [PATCH v6 0/6] wlcore: add device-tree support Eliad Peller
2015-03-12 12:09 ` [PATCH v6 1/6] wlcore: set irq_trigger in board files instead of hiding behind a quirk Eliad Peller
2015-03-12 12:09 ` [PATCH v6 2/6] wl12xx: use frequency instead of enumerations for pdata clocks Eliad Peller
2015-03-13 15:00 ` Tony Lindgren
2015-03-15 8:43 ` Eliad Peller
2015-03-15 12:08 ` Arnd Bergmann
2015-03-16 6:50 ` Kalle Valo
2015-03-16 15:15 ` Tony Lindgren [this message]
2015-03-20 14:00 ` Kalle Valo
2015-03-20 14:54 ` Tony Lindgren
2015-03-12 12:09 ` [PATCH v6 3/6] dt: bindings: add TI's wilink wireless device Eliad Peller
2015-03-12 12:09 ` [PATCH v6 4/6] wlcore: add device-tree support Eliad Peller
2015-03-12 12:09 ` [PATCH v6 5/6] ARM: dts: add wl12xx/wl18xx bindings Eliad Peller
2015-03-13 8:01 ` Javier Martinez Canillas
2015-03-13 8:17 ` Enric Balletbo Serra
[not found] ` <CAN692hmTGDDB3W5TtgfmQK5V9hUGpqVHpF=xK7F_v85cUjcRPw@mail.gmail.com>
2015-03-17 7:02 ` Eliad Peller
2015-03-13 15:27 ` Tony Lindgren
2015-03-15 8:55 ` Eliad Peller
2015-03-12 12:09 ` [PATCH v6 6/6] wlcore: remove wl12xx_platform_data Eliad Peller
2015-03-13 15:13 ` Tony Lindgren
2015-03-15 8:50 ` Eliad Peller
2015-03-15 12:08 ` Arnd Bergmann
2015-03-16 15:29 ` Tony Lindgren
2015-03-16 18:25 ` Sebastian Reichel
2015-03-16 18:24 ` Tony Lindgren
2015-03-17 6:58 ` Eliad Peller
2015-03-16 20:58 ` Pali Rohár
2015-03-16 21:01 ` Tony Lindgren
2015-03-16 21:15 ` Pali Rohár
2015-03-16 21:25 ` Tony Lindgren
2015-03-13 16:11 ` [PATCH v6 0/6] wlcore: add device-tree support Sébastien Szymanski
2015-03-15 8:58 ` Eliad Peller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150316151554.GO5264@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox