From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jeff Garzik <jeff@garzik.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Shane Huang <shane.huang@amd.com>,
Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: linux-next: manual merge of the libata tree with Linus' tree
Date: Mon, 22 Mar 2010 12:44:22 +1100 [thread overview]
Message-ID: <20100322124422.4a10bc4a.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next reply other threads:[~2010-03-22 1:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-22 1:44 Stephen Rothwell [this message]
2010-03-28 4:45 ` Jeff Garzik
2010-03-28 9:26 ` Stephen Rothwell
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=20100322124422.4a10bc4a.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=avorontsov@ru.mvista.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shane.huang@amd.com \
/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
all inboxes | Powered by JetHome®