From: Sergei Shtylyov <sshtylyov@mvista•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jeff Garzik <jeff@garzik•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sergei Shtylyov <sshtylyov@ru•mvista.com>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
Subject: Re: linux-next: manual merge of the libata tree with the at91 tree
Date: Fri, 28 Oct 2011 00:05:50 +0200 [thread overview]
Message-ID: <4EA9D5BE.6020508@mvista.com> (raw)
In-Reply-To: <20111025083819.0940cc9ecefac0d5390a23eb@canb.auug.org.au>
Hello.
On 24.10.2011 23:38, Stephen Rothwell wrote:
> Today's linux-next merge of the libata tree got a conflict in
> drivers/ata/pata_at91.c between commit 9585cf300d98 ("ARM: at91/pata: use
> gpio_is_valid to check the gpio") from the at91 tree and commit
> 8e3bfdb95ad7 ("pata_at91: call clk_put() on ata_host_activate() failure")
> from the libata tree.
I knew about this conflict and have informed Jean-Cristophe on
LAKML. I don't know why libata driver changes went in via the at91 tree...
> I fixed it up (see below) and can carry the fix as necessary.
Thanks.
MBR, Sergei
prev parent reply other threads:[~2011-10-27 22:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-24 21:38 linux-next: manual merge of the libata tree with the at91 tree Stephen Rothwell
2011-10-27 22:05 ` Sergei Shtylyov [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=4EA9D5BE.6020508@mvista.com \
--to=sshtylyov@mvista$(echo .)com \
--cc=jeff@garzik$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=plagnioj@jcrosoft$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sshtylyov@ru$(echo .)mvista.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