From: Jeff Garzik <jeff@garzik.org>
To: Tejun Heo <htejun@gmail.com>
Cc: hancockr@shaw.ca, linux-ide@vger.kernel.org
Subject: Re: git repo and #upstream merging
Date: Mon, 17 Dec 2007 20:54:14 -0500 [thread overview]
Message-ID: <47672846.4050609@garzik.org> (raw)
In-Reply-To: <4763711A.8010204@gmail.com>
Tejun Heo wrote:
> Tejun Heo wrote:
>> This is the second take of improve-ACPI-corner-case-handling patchset
>> and contains the following ten patches.
>
> Jeff, this patchset can also be pulled from the following git tree.
>
> master.kernel.org:/pub/scm/linux/kernel/git/tj/libata-dev.git acpi-fixes
>
> Also, merging this into #upstream can cause some interesting conflicts
> w/ ACPI timing handling update patches. If you ACK the patchset, I'll
> prep merged git HEAD for you.
It was easier for me to
* merge the patches into #upstream-fixes
* rebase #upstream on top of #upstream-fixes,
while dropping the conflicting ACPI patches
And IMO that gives you a bit more freedom to do the merged git -- though
that obviously implies you will need to resend the ACPI patchset that
you had previously submitted.
Jeff
prev parent reply other threads:[~2007-12-18 1:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-15 6:04 [PATCHSET #upstram-fixes] libata-acpi: improve ACPI corner case handling, take #2 Tejun Heo
2007-12-15 6:04 ` [PATCH 01/10] libata-acpi: adjust constness in ata_acpi_gtm/stm() parameters Tejun Heo
2007-12-18 1:34 ` Jeff Garzik
2007-12-18 1:35 ` Jeff Garzik
2007-12-15 6:04 ` [PATCH 02/10] libata: update ata_*_printk() macros such that level can be a variable Tejun Heo
2007-12-15 6:04 ` [PATCH 03/10] libata: add more opcodes to ata.h Tejun Heo
2007-12-15 6:05 ` [PATCH 04/10] libata: ata_dev_disable() should be called from EH context Tejun Heo
2007-12-15 6:05 ` [PATCH 05/10] libata-acpi: add new hooks ata_acpi_dissociate() and ata_acpi_on_disable() Tejun Heo
2007-12-15 6:05 ` [PATCH 06/10] libata-acpi: implement and use ata_acpi_init_gtm() Tejun Heo
2007-12-15 6:05 ` [PATCH 07/10] libata-acpi: implement dev->gtf_cache and evaluate _GTF right after _STM during resume Tejun Heo
2007-12-15 6:05 ` [PATCH 08/10] libata-acpi: improve ACPI disabling Tejun Heo
2007-12-15 6:05 ` [PATCH 09/10] libata-acpi: improve _GTF execution error handling and reporting Tejun Heo
2007-12-15 6:05 ` [PATCH 10/10] libata-acpi: implement _GTF command filtering Tejun Heo
2007-12-15 6:15 ` git repo and #upstream merging Tejun Heo
2007-12-18 1:54 ` Jeff Garzik [this message]
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=47672846.4050609@garzik.org \
--to=jeff@garzik.org \
--cc=hancockr@shaw.ca \
--cc=htejun@gmail.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 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).