From: tj@kernel.org (Tejun Heo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 3/8] ata: libahci_platform: move port_map parameters into the AHCI structure
Date: Wed, 30 Jul 2014 12:50:32 -0400 [thread overview]
Message-ID: <20140730165032.GD23734@htj.dyndns.org> (raw)
In-Reply-To: <20140730164721.GA15772@kwain>
On Wed, Jul 30, 2014 at 06:47:21PM +0200, Antoine T?nart wrote:
> On Wed, Jul 30, 2014 at 11:35:26AM -0400, Tejun Heo wrote:
> > On Wed, Jul 30, 2014 at 10:20:38AM +0200, Antoine T?nart wrote:
> > > How do you want me to send the series? There is two conflicts when
> > > applying to libata/for-3.17:
> > > - patch 4/8: it takes into account a patch not in libata/for-3.17 but
> > > added before rc7. It should be better to first merge rc7, otherwise
> > > some modifications won't make sense.
> > > - patch 6/8: "fsl,imx53-ahci" was removed from the documentation in
> > > libata/for-3.17 but not in rc7. Resolving the conflict is really
> > > simple.
> > >
> > > I think it's better to apply the whole thing after merging rc7 into
> > > libata/for-3.17, because it will only have a really simple conflict to
> > > resolve.
> > >
> > > Please tell me what do you prefer before I send the updated version.
> >
> > Hmmm... does pulling in libata/for-3.16-fixes into libata/for-3.17
> > resolves the conflict? If so, please send the patch on top of the
> > merged branch. I wanna avoid pulling in -rc7 wholesale at this point.
>
> Works for me. I'll cook and send a series based on top of
> libata/for-3.16-fixes merged into libata/for-3.17.
I pulled libata/for-3.16-fixes into for-3.17, so you can just base on
that one.
Thanks.
--
tejun
next prev parent reply other threads:[~2014-07-30 16:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 9:17 [PATCH v11 0/8] ARM: berlin: add AHCI support Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 1/8] phy: add a driver for the Berlin SATA PHY Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 2/8] Documentation: bindings: add " Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 3/8] ata: libahci_platform: move port_map parameters into the AHCI structure Antoine Ténart
2014-07-29 14:40 ` Tejun Heo
2014-07-30 8:20 ` Antoine Ténart
2014-07-30 15:35 ` Tejun Heo
2014-07-30 16:47 ` Antoine Ténart
2014-07-30 16:50 ` Tejun Heo [this message]
2014-07-24 9:17 ` [PATCH v11 4/8] ata: libahci: allow to use multiple PHYs Antoine Ténart
2014-07-28 10:29 ` Hans de Goede
2014-07-28 17:27 ` Tejun Heo
2014-07-29 7:14 ` Antoine Ténart
2014-07-30 9:12 ` Kishon Vijay Abraham I
2014-07-24 9:17 ` [PATCH v11 5/8] ata: ahci_platform: add a generic AHCI compatible Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 6/8] Documentation: bindings: document the sub-nodes AHCI bindings Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 7/8] ARM: berlin: add the AHCI node for the BG2Q Antoine Ténart
2014-07-24 9:17 ` [PATCH v11 8/8] ARM: berlin: enable the eSATA interface on the BG2Q DMP Antoine Ténart
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=20140730165032.GD23734@htj.dyndns.org \
--to=tj@kernel.org \
--cc=linux-arm-kernel@lists.infradead.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).