From: Tejun Heo <htejun@gmail.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: alan@lxorguk.ukuu.org.uk, linux-ide@vger.kernel.org
Subject: Re: [PATCHSET] libata: improve initialization and legacy handling, take#3
Date: Thu, 10 Aug 2006 20:32:35 +0900 [thread overview]
Message-ID: <44DB1953.3060803@gmail.com> (raw)
In-Reply-To: <44DB101F.2080505@pobox.com>
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
next prev parent reply other threads:[~2006-08-10 11:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-10 8:16 [PATCHSET] libata: improve initialization and legacy handling, take#3 Tejun Heo
2006-08-10 8:16 ` [PATCH 1/9] libata: update ata_host_init() and rename it to ata_port_init_shost() Tejun Heo
2006-08-10 8:16 ` [PATCH 4/9] libata: implement per-dev xfermask Tejun Heo
2006-08-10 8:16 ` [PATCH 5/9] libata: rework legacy handling to remove much of the cruft Tejun Heo
2006-08-10 8:16 ` [PATCH 6/9] libata: implement dummy port Tejun Heo
2006-08-10 8:16 ` [PATCH 3/9] [libata] Kill 'count' var in ata_device_add() Tejun Heo
2006-08-10 8:16 ` [PATCH 2/9] [libata] some function renaming Tejun Heo
2006-08-10 8:16 ` [PATCH 9/9] libata: kill unused hard_port_no and legacy_mode Tejun Heo
2006-08-10 8:16 ` [PATCH 8/9] libata: replace ap->hard_port_no with ap->port_no Tejun Heo
2006-08-10 8:16 ` [PATCH 7/9] libata: use dummy port for stolen legacy ports Tejun Heo
2006-08-10 10:53 ` [PATCHSET] libata: improve initialization and legacy handling, take#3 Jeff Garzik
2006-08-10 11:32 ` Tejun Heo [this message]
2006-08-10 11:59 ` Jeff Garzik
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=44DB1953.3060803@gmail.com \
--to=htejun@gmail.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.