From: Tony Lindgren <tony@atomide.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Luciano Coelho <luca@coelho.fi>,
Rob Herring <rob.herring@calxeda.com>,
Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Rob Landley <rob@landley.net>,
Russell King <linux@arm.linux.org.uk>,
Felipe Balbi <balbi@ti.com>,
Sachin Kamat <sachin.kamat@linaro.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bill Pemberton <wfp5p@virginia.edu>,
devicetree@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
Luciano Coelho <coelho@ti.com>
Subject: Re: [PATCH 1/4] wl1251: split wl251 platform data to a separate structure
Date: Mon, 9 Dec 2013 19:28:00 -0800 [thread overview]
Message-ID: <20131210032800.GE13171@atomide.com> (raw)
In-Reply-To: <20131115143254.GA7079@tuxdriver.com>
* John W. Linville <linville@tuxdriver.com> [131115 06:46]:
> On Thu, Nov 14, 2013 at 03:22:18PM -0800, Tony Lindgren wrote:
> > * Sebastian Reichel <sre@debian.org> [131114 15:04]:
> > > On Thu, Nov 14, 2013 at 10:51:33AM -0800, Tony Lindgren wrote:
> > > > [...]
> > > >
> > > > If this is not going into v3.13, these will cause conflicts
> > > > with the mach-omap2/board-*.c files for v3.14.
> > > >
> > > > So it might be best to do a minimal header patch first that
> > > > can be merged in by both linux-omap and wireless trees.
> > >
> > > I guess this patch is pretty minimal. It also seems to be acked by
> > > the involved Maintainers, so maybe just merge Patch 1 without the
> > > other patches?
> > >
> > > This does not solve the problem with the struct modification from
> > > the second patch, but I guess it's the more intrusive patch.
> >
> > Once at least the first two patches are ready, how about I queue
> > them after -rc1 and set up an immutable branch that can be merged
> > in by linux-omap tree and the wireless tree?
>
> That sounds reasonable to me.
OK sorry it took a while, I was chasing bugs and did not get around
to doing this until now. I've applied only the first two patches from
the v2 set of patches later on in this thread against v3.13-rc1 into
a signed tag wl1251-pdata-signed here:
http://git.kernel.org/cgit/linux/kernel/git/tmlind/linux-omap.git/tag/?id=wl1251-pdata-signed
John, please feel free to pull the branch above also into the wireless
tree so you can apply the remaining wl1251 patches from Sebastian.
This way things keep working without creating merge conflicts with the
linux-omap tree.
Regards,
Tony
next prev parent reply other threads:[~2013-12-10 3:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-27 16:14 [PATCH 0/4] wl1251 device tree support Sebastian Reichel
2013-10-27 16:14 ` [PATCH 1/4] wl1251: split wl251 platform data to a separate structure Sebastian Reichel
[not found] ` <1382890469-25286-2-git-send-email-sre-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org>
2013-11-05 12:13 ` Pavel Machek
2013-11-14 18:51 ` Tony Lindgren
2013-11-14 23:03 ` Sebastian Reichel
2013-11-14 23:22 ` Tony Lindgren
2013-11-15 14:32 ` John W. Linville
[not found] ` <20131115143254.GA7079-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
2013-11-15 14:55 ` Sebastian Reichel
2013-12-10 3:28 ` Tony Lindgren [this message]
2013-10-27 16:14 ` [PATCH 2/4] wl1251: move power GPIO handling into the driver Sebastian Reichel
2013-10-27 16:24 ` Alexander Shiyan
2013-10-27 20:12 ` Sebastian Reichel
2013-10-28 17:29 ` Grazvydas Ignotas
2013-10-28 19:23 ` Mark Brown
2013-10-28 23:26 ` Sebastian Reichel
2013-10-29 1:33 ` Mark Brown
[not found] ` <1382890469-25286-3-git-send-email-sre-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org>
2013-11-05 13:11 ` Pavel Machek
2013-10-27 16:14 ` [PATCH 3/4] wl1251: spi: add vio regulator support Sebastian Reichel
[not found] ` <1382890469-25286-4-git-send-email-sre-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org>
2013-11-05 13:12 ` Pavel Machek
2013-10-27 16:14 ` [PATCH 4/4] wl1251: spi: add device tree support Sebastian Reichel
2013-10-28 6:37 ` Kumar Gala
2013-10-28 17:15 ` Grazvydas Ignotas
2013-10-28 19:30 ` Kumar Gala
2013-10-28 22:38 ` Tomasz Figa
2013-10-29 8:28 ` Kumar Gala
[not found] ` <1382890469-25286-1-git-send-email-sre-8fiUuRrzOP0dnm+yROfE0A@public.gmane.org>
2013-12-06 0:22 ` [PATCHv2 0/5] wl1251 " Sebastian Reichel
2013-12-06 0:22 ` [PATCHv2 1/5] wl1251: split wl251 platform data to a separate structure Sebastian Reichel
2013-12-06 0:22 ` [PATCHv2 2/5] wl1251: move power GPIO handling into the driver Sebastian Reichel
2013-12-06 0:22 ` [PATCHv2 3/5] wl1251: spi: add vio regulator support Sebastian Reichel
2013-12-06 0:22 ` [PATCHv2 4/5] wl1251: spi: add device tree support Sebastian Reichel
2013-12-06 0:22 ` [PATCHv2 5/5] Documentation: dt: wireless: Add wl1251 Sebastian Reichel
2014-01-06 22:57 ` [PATCHv2 0/5] wl1251 device tree support Sebastian Reichel
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=20131210032800.GE13171@atomide.com \
--to=tony@atomide.com \
--cc=balbi@ti.com \
--cc=coelho@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=linville@tuxdriver.com \
--cc=luca@coelho.fi \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=pawel.moll@arm.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=sachin.kamat@linaro.org \
--cc=swarren@wwwdotorg.org \
--cc=wfp5p@virginia.edu \
/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).