* linux-next: manual merge of the libata tree with the at91 tree
@ 2011-10-24 21:38 Stephen Rothwell
2011-10-27 22:05 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-10-24 21:38 UTC (permalink / raw)
To: Jeff Garzik
Cc: linux-next, linux-kernel, Sergei Shtylyov,
Jean-Christophe PLAGNIOL-VILLARD
[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]
Hi Jeff,
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 fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/ata/pata_at91.c
index 7822813,c6d1409..0000000
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@@ -414,10 -414,13 +414,13 @@@ static int __devinit pata_at91_probe(st
host->private_data = info;
- return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
- ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
- irq ? ata_sff_interrupt : NULL,
++ ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
+ gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
irq_flags, &pata_at91_sht);
+ if (!ret)
+ return 0;
+
err_put:
clk_put(info->mck);
return ret;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the libata tree with the at91 tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2011-10-27 22:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeff Garzik, linux-next, linux-kernel, Sergei Shtylyov,
Jean-Christophe PLAGNIOL-VILLARD
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-27 22:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).