Jeff Garzik wrote:
Tejun Heo wrote:
Hello, all.
This is the third take of improve-init-and-legacy patchset. This
patchset contains patches from Jeff Garzik, Alan Cox and me to
fix/clean up initializaton and legacy handling. Changes from the last
take[L] are
* adapted to Brian King's sas port alloc/init stuff (new patch added
#01-update-ata_host_init-and-rename-it-to-ata_port_init_shost)
* fix-new-legacy-handling patch merged into rework-legacy-handling as
Jeff suggested.
This patchset is against
libata-dev#upstream [U]
This patchset is available in the following git tree.
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-upstream
git://htj.dyndns.org/libata-tj tj-upstream
pulled
PATA drivers have been updated accordingly and available at (properly
merged)
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-pata-drivers
git://htj.dyndns.org/libata-tj tj-pata-drivers
pulled
Updated ALL branch is available at
http://htj.dyndns.org/git/?p=libata-tj.git;a=shortlog;h=tj-ALL
git://htj.dyndns.org/libata-tj tj-ALL
FWIW, I usually just update this manually. The process I used for this
email's pulls was
cd /spare/repo/libata-dev
git checkout upstream
git pull $url tj-upstream
git checkout pata-drivers
git pull . upstream
git pull $url tj-pata-drivers
git checkout ALL
git pull . pata-drivers
Thus, changes are pulled from upstream to downstream branches.
I see. For this patchset though, pulling pata-drivers that way would
give it a small window of commits (probably just one) where pata drivers
won't build properly. tj-pata-drivers was built by...
1. pulling #tj-upstream before removing old legacy handling
2. updating #tj-pata-drivers to use new legacy handling
3. killing old legacy handling in #tj-upstream
4. pulling again
Such that pata-drivers doesn't fail to build after upstream merge. I
won't make ALL branch from now on and tell you if merge needs some
special ordering.
Thanks.
--
tejun
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
