devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: "Arnd Bergmann" <arnd@arndb.de>,
	linux-arm-kernel@lists.infradead.org,
	"Eliad Peller" <eliad@wizery.com>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"Pawel Moll" <pawel.moll@arm.com>,
	"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
	"Enric Balletbo i Serra" <eballetbo@gmail.com>,
	"Sekhar Nori" <nsekhar@ti.com>,
	"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
	"Kevin Hilman" <khilman@deeprootsystems.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Benoît Cousson" <bcousson@baylibre.com>,
	"Kumar Gala" <galak@codeaurora.org>,
	"Javier Martinez Canillas" <javier@dowhile0.org>,
	"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
	"Luciano Coelho" <luca@coelho.fi>
Subject: Re: [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

  reply	other threads:[~2015-03-16 15:15 UTC|newest]

Thread overview: 33+ 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 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
     [not found]   ` <1426162154-8716-6-git-send-email-eliad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
2015-03-13  8:01     ` Javier Martinez Canillas
2015-03-13  8:17       ` Enric Balletbo Serra
2015-03-16 13:08         ` Pau Pajuel
     [not found]           ` <CAN692hmTGDDB3W5TtgfmQK5V9hUGpqVHpF=xK7F_v85cUjcRPw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-03-17  7:02             ` Eliad Peller
2015-03-13 15:27     ` Tony Lindgren
     [not found]       ` <20150313152751.GK5264-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2015-03-15  8:55         ` Eliad Peller
     [not found] ` <1426162154-8716-1-git-send-email-eliad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
2015-03-12 12:09   ` [PATCH v6 2/6] wl12xx: use frequency instead of enumerations for pdata clocks Eliad Peller
     [not found]     ` <1426162154-8716-3-git-send-email-eliad-Ix1uc/W3ht7QT0dZR+AlfA@public.gmane.org>
2015-03-13 15:00       ` Tony Lindgren
2015-03-15  8:43         ` Eliad Peller
     [not found]           ` <CAB3XZEcOytqpJ4pWoemLS3d+DCeA8C75MencDfGn_vhfEYrduw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-03-15 12:08             ` Arnd Bergmann
2015-03-16  6:50               ` Kalle Valo
2015-03-16 15:15                 ` Tony Lindgren [this message]
     [not found]                   ` <20150316151554.GO5264-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2015-03-20 14:00                     ` Kalle Valo
2015-03-20 14:54                       ` Tony Lindgren
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
     [not found]         ` <CAB3XZEdFMQexA69JEuw=VnqsNOEkWAM0+oWWmt6DaN9+hZ+vdw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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
     [not found]               ` <20150316152939.GP5264-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
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
     [not found]   ` <55030C42.6020206-d2DlULPkwbNWk0Htik3J/w@public.gmane.org>
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.com \
    --cc=arnd@arndb.de \
    --cc=bcousson@baylibre.com \
    --cc=devicetree@vger.kernel.org \
    --cc=eballetbo@gmail.com \
    --cc=eliad@wizery.com \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=javier@dowhile0.org \
    --cc=khilman@deeprootsystems.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=luca@coelho.fi \
    --cc=mark.rutland@arm.com \
    --cc=nsekhar@ti.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).