RE: linux-next: manual merge of the omap tree with the arm tree

[Shilimkar, Santosh]

> > Today's linux-next merge of the omap tree got a conflict in
> > arch/arm/mach-omap2/board-4430sdp.c between commit
> > 085b54d99b8ee999e7905b8f16e201e0da8ba369 ("ARM: OMAP4: Add UART4
> > support") from the arm tree and commit
> > 4c29fa3e47342666e12e46f35f40dd90b12cd1a4 ("OMAP: remove OMAP_TAG_UART")
> > from the omap tree.
> >
> > Just context changes (I think).  I fixed it up (see below) and can carry
> > the fix as necessary.
> 
> Thanks yeh the fix looks right. I'll take a look if I can squeeze
> something
> like that into my queue so the merge conflict disappears.

There is another issue with the same merge I noticed which not seems to be correct.
http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=commit;h=a11128de5baf523cf73176170659902fe1335527

< Code snippet >

102 static struct plat_serial8250_port serial_platform_data2[] = {
103         {
104                 .membase        = OMAP2_IO_ADDRESS(OMAP_UART3_BASE),
105                 .mapbase        = OMAP_UART3_BASE,
106                 .irq            = 74,
107                 .flags          = UPF_BOOT_AUTOCONF,
108                 .iotype         = UPIO_MEM,
109                 .regshift       = 2,
110                 .uartclk        = OMAP24XX_BASE_BAUD * 16,
111         }, {
112 #ifdef CONFIG_ARCH_OMAP4
113                 .membase        = IO_ADDRESS(OMAP_UART4_BASE),
114                 .mapbase        = OMAP_UART4_BASE,
115                 .irq            = 70,
116                 .flags          = UPF_BOOT_AUTOCONF,
117                 .iotype         = UPIO_MEM,
118                 .regshift       = 2,
119                 .uartclk        = OMAP24XX_BASE_BAUD * 16,
120         }, {
121 #endif
122                 .flags          = 0
123         }
124 };

This patch (ARM: OMAP4: Add UART4) was generated when there was single structure holding all three UARTs and fourth UART was added accordingly. And now it's been merged with serial.c which has UART's structures separated already.
Below patch fixes the same but don't know what is the way to get merged in such cases. 

Tony,
Could you please review it?