* linux-next: manual merge of the l2-mtd tree with the at91 tree
@ 2011-09-22 5:36 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-09-22 5:36 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Jean-Christophe PLAGNIOL-VILLARD,
Dmitry Eremin-Solenikov, Nicolas Ferre
Hi Artem,
Today's linux-next merge of the l2-mtd tree got conflicts in
arch/arm/mach-at91/board-afeb-9260v1.c,
arch/arm/mach-at91/board-neocore926.c. arch/arm/mach-at91/board-rm9200dk.c,
arch/arm/mach-at91/board-sam9g20ek.c and
arch/arm/mach-at91/board-sam9m10g45ek.c between commit 36706ab70b26
("ARM: at91/boards: use -EINVAL for invalid gpio") from the at91 tree and
commit 1754aab9bb86 ("mtd: ATMEL, AVR32: inline nand partition table
access") from the l2-mtd tree.
Just context changes. I fixed them up (see below) and can carry the
fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
index 2d92043,a053e91..0000000
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@@ -142,9 -135,9 +136,10 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
.bus_width_16 = 0,
+ .det_pin = -EINVAL,
+ .parts = afeb9260_nand_partition,
+ .num_parts = ARRAY_SIZE(afeb9260_nand_partition),
};
diff --cc arch/arm/mach-at91/board-neocore926.c
index 0e6b86e,60f0cee..0000000
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -195,8 -188,8 +189,9 @@@ static struct atmel_nand_data __initdat
.rdy_pin = AT91_PIN_PB19,
.rdy_pin_active_low = 1,
.enable_pin = AT91_PIN_PD15,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = neocore926_nand_partition,
+ .num_parts = ARRAY_SIZE(neocore926_nand_partition),
};
static struct sam9_smc_config __initdata neocore926_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-rm9200dk.c
index e34e84e,b5f2faf..0000000
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@@ -153,8 -143,9 +147,9 @@@ static struct atmel_nand_data __initdat
.cle = 21,
.det_pin = AT91_PIN_PB1,
.rdy_pin = AT91_PIN_PC2,
- // .enable_pin = ... not there
+ .enable_pin = -EINVAL,
- .partition_info = nand_partitions,
+ .parts = dk_nand_partition,
+ .num_parts = ARRAY_SIZE(dk_nand_partition),
};
#define DK_FLASH_BASE AT91_CHIPSELECT_0
diff --cc arch/arm/mach-at91/board-sam9g20ek.c
index 757d74f,0031227..0000000
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@@ -170,8 -163,8 +164,9 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC13,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
index e3694b1,00d041c..0000000
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@@ -150,8 -143,8 +144,9 @@@ static struct atmel_nand_data __initdat
.cle = 22,
.rdy_pin = AT91_PIN_PC8,
.enable_pin = AT91_PIN_PC14,
- .partition_info = nand_partitions,
+ .det_pin = -EINVAL,
+ .parts = ek_nand_partition,
+ .num_parts = ARRAY_SIZE(ek_nand_partition),
};
static struct sam9_smc_config __initdata ek_nand_smc_config = {
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
2011-09-09 9:53 ` Nicolas Ferre
@ 2011-09-09 10:27 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2011-09-09 10:27 UTC (permalink / raw)
To: Nicolas Ferre
Cc: dedekind1, linux-next, linux-kernel, Dmitry Eremin-Solenikov,
Nico Erfurth, Jean-Christophe PLAGNIOL-VILLARD,
Russell King - ARM Linux
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
Hi Nicolas,
On Fri, 09 Sep 2011 11:53:35 +0200 Nicolas Ferre <nicolas.ferre@atmel.com> wrote:
>
> So, as I am not so used to this kind of situation, I wonder if I need
> to included those two patches from Russell's and Artem's git trees in
> our at91-next one or if I only carry on with current patch series
> until Linus merges all this himself?
Just carry on, the conflicts will be fixed up When Linus merges your tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
2011-09-09 6:45 ` Stephen Rothwell
@ 2011-09-09 9:53 ` Nicolas Ferre
2011-09-09 10:27 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Nicolas Ferre @ 2011-09-09 9:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: dedekind1, linux-next, linux-kernel, Dmitry Eremin-Solenikov,
Nico Erfurth, Jean-Christophe PLAGNIOL-VILLARD,
Russell King - ARM Linux
Le 09/09/2011 08:45, Stephen Rothwell :
> Hi Artem,
>
> On Fri, 09 Sep 2011 09:45:28 +0300 Artem Bityutskiy
> <dedekind1@gmail.com> wrote:
>>
>> OK, thanks, I guess you'll carry this modification so far, we'll
>> need to take care of the conflict when merging.
>
> Yep, no worries.
Stephen,
I have seen the two manual merges that you made concerning our
at91-next tree. This is when we realize how linux-next is a great tool ;-)
So, as I am not so used to this kind of situation, I wonder if I need
to included those two patches from Russell's and Artem's git trees in
our at91-next one or if I only carry on with current patch series
until Linus merges all this himself?
Best regards,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
2011-09-09 6:45 ` Artem Bityutskiy
@ 2011-09-09 6:45 ` Stephen Rothwell
2011-09-09 9:53 ` Nicolas Ferre
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-09-09 6:45 UTC (permalink / raw)
To: dedekind1
Cc: linux-next, linux-kernel, Dmitry Eremin-Solenikov, Nico Erfurth,
Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
Hi Artem,
On Fri, 09 Sep 2011 09:45:28 +0300 Artem Bityutskiy <dedekind1@gmail.com> wrote:
>
> OK, thanks, I guess you'll carry this modification so far, we'll need to
> take care of the conflict when merging.
Yep, no worries.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the l2-mtd tree with the at91 tree
2011-09-09 3:29 Stephen Rothwell
@ 2011-09-09 6:45 ` Artem Bityutskiy
2011-09-09 6:45 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Artem Bityutskiy @ 2011-09-09 6:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Dmitry Eremin-Solenikov, Nico Erfurth,
Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
On Fri, 2011-09-09 at 13:29 +1000, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> arch/arm/mach-at91/board-usb-a9260.c between commit 6939fd49787e ("at91:
> merge board USB-A9260 and USB-A9263 together") from the at91 tree and
> commit 29921652b159 ("mtd: ATMEL, AVR32: inline nand partition table
> access") from the l2-mtd tree.
>
> The former removed the file modified by the latter, so I did that.
OK, thanks, I guess you'll carry this modification so far, we'll need to
take care of the conflict when merging.
--
Best Regards,
Artem Bityutskiy
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the l2-mtd tree with the at91 tree
@ 2011-09-09 3:29 Stephen Rothwell
2011-09-09 6:45 ` Artem Bityutskiy
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-09-09 3:29 UTC (permalink / raw)
To: Artem Bityutskiy
Cc: linux-next, linux-kernel, Dmitry Eremin-Solenikov, Nico Erfurth,
Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
[-- Attachment #1: Type: text/plain, Size: 500 bytes --]
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 6939fd49787e ("at91:
merge board USB-A9260 and USB-A9263 together") from the at91 tree and
commit 29921652b159 ("mtd: ATMEL, AVR32: inline nand partition table
access") from the l2-mtd tree.
The former removed the file modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-22 5:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-22 5:36 linux-next: manual merge of the l2-mtd tree with the at91 tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-09-09 3:29 Stephen Rothwell
2011-09-09 6:45 ` Artem Bityutskiy
2011-09-09 6:45 ` Stephen Rothwell
2011-09-09 9:53 ` Nicolas Ferre
2011-09-09 10:27 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.