From: Jeff Garzik <jeff@garzik•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shane Huang <shane.huang@amd•com>,
Anton Vorontsov <avorontsov@ru•mvista.com>
Subject: Re: linux-next: manual merge of the libata tree with Linus' tree
Date: Sun, 28 Mar 2010 00:45:57 -0400 [thread overview]
Message-ID: <4BAEDF05.9070006@garzik.org> (raw)
In-Reply-To: <20100322124422.4a10bc4a.sfr@canb.auug.org.au>
On 03/21/2010 09:44 PM, Stephen Rothwell wrote:
> Hi Jeff,
>
> Today's linux-next merge of the libata tree got a conflict in
> drivers/ata/ahci.c between commit
> 5db5b0215af94a36d4bf10900ff9707b6d5c1610 ("ahci: pp->active_link is not
> reliable when FBS is enabled") from Linus' tree and commit
> efd7cb719e07433588ee5c6a99b1208b0aff6295 ("ahci: Move generic code into
> libahci") from the libata tree.
>
> I applied the changes to drivers/ata/ahci.c from the former commit to
> drivers/ata/libahci.c (where the latter commit moves it).
Should be fixed now...
next prev parent reply other threads:[~2010-03-28 4:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 1:44 linux-next: manual merge of the libata tree with Linus' tree Stephen Rothwell
2010-03-28 4:45 ` Jeff Garzik [this message]
2010-03-28 9:26 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-02-17 2:14 Stephen Rothwell
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=4BAEDF05.9070006@garzik.org \
--to=jeff@garzik$(echo .)org \
--cc=avorontsov@ru$(echo .)mvista.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shane.huang@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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