linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the trivial tree with the arm tree
@ 2013-04-26  5:27 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2013-04-26  5:27 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Masanari Iida, Marc Zyngier,
	Christoffer Dall, Russell King

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/kvm/arm.c between commit 3414bbfff98b ("ARM: KVM: move exit
handler selection to a separate file") from the arm tree and commit
b23f7a09f935 ("treewide: Fix typo in printk and comments") from the
trivial tree.

The former removed the code that the latter fixed, so I did that and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the trivial tree with the arm tree
  2010-02-08  4:48 Stephen Rothwell
@ 2010-02-09 10:09 ` Jiri Kosina
  0 siblings, 0 replies; 10+ messages in thread
From: Jiri Kosina @ 2010-02-09 10:09 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Tony Lindgren, Russell King,
	Daniel Mack, Ben Dooks

On Mon, 8 Feb 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-u300/include/mach/debug-macro.S between commit
> 7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
> register for addruart and loadsp") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks for the fix, I will leave this up to merge with Linus when either I 
or Linus will fix that up.

On Mon, 8 Feb 2010, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-s3c64xx/irq.c between commit
> 51022cf6591ae2945960d034788bdeffa28cde13 ("ARM: SAMSUNG: Move IRQ UART
> handling for newer devices to plat-samsung") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
> 
> The former removes the comment updated by the latter.

Removed the hunk, thanks.

On Mon, 8 Feb 2010, Stephen Rothwell wrote:

> Hi Jiri,
> 
> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-s5pc1xx/irq.c between commit
> be97162d47b2e067f9d21097650f2f0405dacc9f ("ARM: S5PC1XX: Use common UART
> IRQ handling code") from the arm tree and commit
> ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
> fixes") from the trivial tree.
> 
> The former removes the comment updated by the latter.

Removed this one as well.

Thanks!

-- 
Jiri Kosina
SUSE Labs, Novell Inc.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the trivial tree with the arm tree
@ 2010-02-08  4:48 Stephen Rothwell
  2010-02-09 10:09 ` Jiri Kosina
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2010-02-08  4:48 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Daniel Mack, Ben Dooks, Russell King

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-s5pc1xx/irq.c between commit
be97162d47b2e067f9d21097650f2f0405dacc9f ("ARM: S5PC1XX: Use common UART
IRQ handling code") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former removes the comment updated by the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the trivial tree with the arm tree
@ 2010-02-08  4:48 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2010-02-08  4:48 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Daniel Mack, Ben Dooks, Russell King

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-s3c64xx/irq.c between commit
51022cf6591ae2945960d034788bdeffa28cde13 ("ARM: SAMSUNG: Move IRQ UART
handling for newer devices to plat-samsung") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

The former removes the comment updated by the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the trivial tree with the arm tree
@ 2010-02-08  4:48 Stephen Rothwell
  0 siblings, 0 replies; 10+ messages in thread
From: Stephen Rothwell @ 2010-02-08  4:48 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Tony Lindgren, Russell King, Daniel Mack

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-u300/include/mach/debug-macro.S between commit
7f62dc4756eaf761570b96250630d48f80397d64 ("ARM: 5910/1: ARM: Add tmp
register for addruart and loadsp") from the arm tree and commit
ba5584a307a1166597fbbe970ffdf49c8b7ee42a ("tree-wide: Assorted spelling
fixes") from the trivial tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-u300/include/mach/debug-macro.S
index ca4a028,d591fe1..0000000
--- a/arch/arm/mach-u300/include/mach/debug-macro.S
+++ b/arch/arm/mach-u300/include/mach/debug-macro.S
@@@ -10,8 -10,8 +10,8 @@@
   */
  #include <mach/hardware.h>
  
 -	.macro	addruart,rx
 +	.macro	addruart, rx, tmp
- 	/* If we move the adress using MMU, use this. */
+ 	/* If we move the address using MMU, use this. */
  	mrc	p15, 0, \rx, c1, c0
  	tst	\rx, #1			@ MMU enabled?
  	ldreq	\rx,	  = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the trivial tree with the arm tree
  2009-11-25  7:29 Stephen Rothwell
@ 2009-11-25 11:26 ` Jiri Kosina
  0 siblings, 0 replies; 10+ messages in thread
From: Jiri Kosina @ 2009-11-25 11:26 UTC (permalink / raw)
  To: Stephen Rothwell, Russell King
  Cc: linux-next, linux-kernel, Uwe Kleine-König

On Wed, 25 Nov 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/plat-mxc/include/mach/mx2x.h between commit
> b9fc90a48a3d1794443e095d8585dcaeafb2195f ("imx: add namespace prefixes
> for symbols in mx2x.h") from the arm tree and commit
> 324bea84dda5e6ddea9464cdd957cb8cf94552d9 ("tree-wide: fix typos "offest"
> -> "offset"") from the trivial tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks. Probably the easiest way here is to hand it over to Russel.

I have dropped it from my tree -- Russel, please consider applying the 
patch below. Thanks.


From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Subject: [PATCH] arm: fix "offest" -> "offset" typo

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/arch/arm/plat-mxc/include/mach/mx2x.h b/arch/arm/plat-mxc/include/mach/mx2x.h
index db5d921..728f31c 100644
--- a/arch/arm/plat-mxc/include/mach/mx2x.h
+++ b/arch/arm/plat-mxc/include/mach/mx2x.h
@@ -25,7 +25,7 @@
 
 /* The following addresses are common between i.MX21 and i.MX27 */
 
-/* Register offests */
+/* Register offsets */
 #define AIPI_BASE_ADDR          0x10000000
 #define AIPI_BASE_ADDR_VIRT     0xF4000000
 #define AIPI_SIZE               SZ_1M

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the trivial tree with the arm tree
@ 2009-11-25  7:29 Stephen Rothwell
  2009-11-25 11:26 ` Jiri Kosina
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2009-11-25  7:29 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, "Uwe Kleine-König", Russell King

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/plat-mxc/include/mach/mx2x.h between commit
b9fc90a48a3d1794443e095d8585dcaeafb2195f ("imx: add namespace prefixes
for symbols in mx2x.h") from the arm tree and commit
324bea84dda5e6ddea9464cdd957cb8cf94552d9 ("tree-wide: fix typos "offest"
-> "offset"") from the trivial tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/plat-mxc/include/mach/mx2x.h
index 1766c7c,728f31c..0000000
--- a/arch/arm/plat-mxc/include/mach/mx2x.h
+++ b/arch/arm/plat-mxc/include/mach/mx2x.h
@@@ -25,49 -25,51 +25,49 @@@
  
  /* The following addresses are common between i.MX21 and i.MX27 */
  
- /* Register offests */
+ /* Register offsets */
 -#define AIPI_BASE_ADDR          0x10000000
 -#define AIPI_BASE_ADDR_VIRT     0xF4000000
 -#define AIPI_SIZE               SZ_1M
 -
 -#define DMA_BASE_ADDR           (AIPI_BASE_ADDR + 0x01000)
 -#define WDOG_BASE_ADDR          (AIPI_BASE_ADDR + 0x02000)
 -#define GPT1_BASE_ADDR          (AIPI_BASE_ADDR + 0x03000)
 -#define GPT2_BASE_ADDR          (AIPI_BASE_ADDR + 0x04000)
 -#define GPT3_BASE_ADDR          (AIPI_BASE_ADDR + 0x05000)
 -#define PWM_BASE_ADDR           (AIPI_BASE_ADDR + 0x06000)
 -#define RTC_BASE_ADDR           (AIPI_BASE_ADDR + 0x07000)
 -#define KPP_BASE_ADDR           (AIPI_BASE_ADDR + 0x08000)
 -#define OWIRE_BASE_ADDR         (AIPI_BASE_ADDR + 0x09000)
 -#define UART1_BASE_ADDR         (AIPI_BASE_ADDR + 0x0A000)
 -#define UART2_BASE_ADDR         (AIPI_BASE_ADDR + 0x0B000)
 -#define UART3_BASE_ADDR         (AIPI_BASE_ADDR + 0x0C000)
 -#define UART4_BASE_ADDR         (AIPI_BASE_ADDR + 0x0D000)
 -#define CSPI1_BASE_ADDR         (AIPI_BASE_ADDR + 0x0E000)
 -#define CSPI2_BASE_ADDR         (AIPI_BASE_ADDR + 0x0F000)
 -#define SSI1_BASE_ADDR          (AIPI_BASE_ADDR + 0x10000)
 -#define SSI2_BASE_ADDR          (AIPI_BASE_ADDR + 0x11000)
 -#define I2C_BASE_ADDR           (AIPI_BASE_ADDR + 0x12000)
 -#define SDHC1_BASE_ADDR         (AIPI_BASE_ADDR + 0x13000)
 -#define SDHC2_BASE_ADDR         (AIPI_BASE_ADDR + 0x14000)
 -#define GPIO_BASE_ADDR          (AIPI_BASE_ADDR + 0x15000)
 -#define AUDMUX_BASE_ADDR        (AIPI_BASE_ADDR + 0x16000)
 -#define CSPI3_BASE_ADDR         (AIPI_BASE_ADDR + 0x17000)
 -#define LCDC_BASE_ADDR          (AIPI_BASE_ADDR + 0x21000)
 -#define SLCDC_BASE_ADDR         (AIPI_BASE_ADDR + 0x22000)
 -#define USBOTG_BASE_ADDR        (AIPI_BASE_ADDR + 0x24000)
 -#define EMMA_PP_BASE_ADDR       (AIPI_BASE_ADDR + 0x26000)
 -#define EMMA_PRP_BASE_ADDR      (AIPI_BASE_ADDR + 0x26400)
 -#define CCM_BASE_ADDR           (AIPI_BASE_ADDR + 0x27000)
 -#define SYSCTRL_BASE_ADDR       (AIPI_BASE_ADDR + 0x27800)
 -#define JAM_BASE_ADDR           (AIPI_BASE_ADDR + 0x3E000)
 -#define MAX_BASE_ADDR           (AIPI_BASE_ADDR + 0x3F000)
 -
 -#define AVIC_BASE_ADDR          0x10040000
 -
 -#define SAHB1_BASE_ADDR         0x80000000
 -#define SAHB1_BASE_ADDR_VIRT    0xF4100000
 -#define SAHB1_SIZE              SZ_1M
 -
 -#define CSI_BASE_ADDR           (SAHB1_BASE_ADDR + 0x0000)
 +#define MX2x_AIPI_BASE_ADDR		0x10000000
 +#define MX2x_AIPI_BASE_ADDR_VIRT	0xf4000000
 +#define MX2x_AIPI_SIZE			SZ_1M
 +#define MX2x_DMA_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x01000)
 +#define MX2x_WDOG_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x02000)
 +#define MX2x_GPT1_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x03000)
 +#define MX2x_GPT2_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x04000)
 +#define MX2x_GPT3_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x05000)
 +#define MX2x_PWM_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x06000)
 +#define MX2x_RTC_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x07000)
 +#define MX2x_KPP_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x08000)
 +#define MX2x_OWIRE_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x09000)
 +#define MX2x_UART1_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0a000)
 +#define MX2x_UART2_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0b000)
 +#define MX2x_UART3_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0c000)
 +#define MX2x_UART4_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0d000)
 +#define MX2x_CSPI1_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0e000)
 +#define MX2x_CSPI2_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x0f000)
 +#define MX2x_SSI1_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x10000)
 +#define MX2x_SSI2_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x11000)
 +#define MX2x_I2C_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x12000)
 +#define MX2x_SDHC1_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x13000)
 +#define MX2x_SDHC2_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x14000)
 +#define MX2x_GPIO_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x15000)
 +#define MX2x_AUDMUX_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x16000)
 +#define MX2x_CSPI3_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x17000)
 +#define MX2x_LCDC_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x21000)
 +#define MX2x_SLCDC_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x22000)
 +#define MX2x_USBOTG_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x24000)
 +#define MX2x_EMMA_PP_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x26000)
 +#define MX2x_EMMA_PRP_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x26400)
 +#define MX2x_CCM_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x27000)
 +#define MX2x_SYSCTRL_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x27800)
 +#define MX2x_JAM_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x3e000)
 +#define MX2x_MAX_BASE_ADDR			(MX2x_AIPI_BASE_ADDR + 0x3f000)
 +
 +#define MX2x_AVIC_BASE_ADDR		0x10040000
 +
 +#define MX2x_SAHB1_BASE_ADDR		0x80000000
 +#define MX2x_SAHB1_BASE_ADDR_VIRT	0xf4100000
 +#define MX2x_SAHB1_SIZE			SZ_1M
 +#define MX2x_CSI_BASE_ADDR			(MX2x_SAHB1_BASE_ADDR + 0x0000)
  
  /*
   * This macro defines the physical to virtual address mapping for all the

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the trivial tree with the arm tree
  2009-09-07 15:14 ` Jiri Kosina
@ 2009-09-07 15:17   ` Russell King
  0 siblings, 0 replies; 10+ messages in thread
From: Russell King @ 2009-09-07 15:17 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: Stephen Rothwell, linux-next, linux-kernel, Joe Perches, wanzongshun

On Mon, Sep 07, 2009 at 05:14:38PM +0200, Jiri Kosina wrote:
> On Mon, 7 Sep 2009, Stephen Rothwell wrote:
> 
> > Today's linux-next merge of the trivial tree got a conflict in
> > arch/arm/mach-w90x900/w90p910.c between commit
> > 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
> > dev.c and modify some files of w90p910 platform") from the arm tree and
> > commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
> > unnecessary semicolons") from the trivial tree.
> > 
> > The former commit moved the code changed by the latter into a different
> > file (arch/arm/mach-w90x900/cpu.c - and removed the old file).  Its not
> > important enough to fix it there (so I just removed this file), but maybe
> > the part of the trivial commit touching this file could be sent to the
> > arm maintainer.
> 
> Sure, here we go. Russel, could you please apply this on top of your 
> current tree? (I have already dropped the bits touching arch/arm from 
> trivial queue). Thanks.

I'll have to split it up further, since I keep each platform class who
choses to send their stuff via me in separate branches.

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: linux-next: manual merge of the trivial tree with the arm tree
  2009-09-07  6:32 Stephen Rothwell
@ 2009-09-07 15:14 ` Jiri Kosina
  2009-09-07 15:17   ` Russell King
  0 siblings, 1 reply; 10+ messages in thread
From: Jiri Kosina @ 2009-09-07 15:14 UTC (permalink / raw)
  To: Stephen Rothwell, Russell King
  Cc: linux-next, linux-kernel, Joe Perches, wanzongshun

On Mon, 7 Sep 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> arch/arm/mach-w90x900/w90p910.c between commit
> 35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
> dev.c and modify some files of w90p910 platform") from the arm tree and
> commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
> unnecessary semicolons") from the trivial tree.
> 
> The former commit moved the code changed by the latter into a different
> file (arch/arm/mach-w90x900/cpu.c - and removed the old file).  Its not
> important enough to fix it there (so I just removed this file), but maybe
> the part of the trivial commit touching this file could be sent to the
> arm maintainer.

Sure, here we go. Russel, could you please apply this on top of your 
current tree? (I have already dropped the bits touching arch/arm from 
trivial queue). Thanks.



From: Joe Perches <joe@perches.com>
Subject: trivial: remove unnecessary semicolons

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

---

diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index 412aa49..799c11e 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 	 */
 	usba_udc_data.pdata.vbus_pin = -EINVAL;
 	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
 	if (data && data->vbus_pin > 0) {
 		at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 7281865..e87237b 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -99,7 +99,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 	 */
 	usba_udc_data.pdata.vbus_pin = -EINVAL;
 	usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+	memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
 	if (data && data->vbus_pin > 0) {
 		at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-w90x900/w90p910.c b/arch/arm/mach-w90x900/w90p910.c
index 1c97e49..0399a24 100644
--- a/arch/arm/mach-w90x900/w90p910.c
+++ b/arch/arm/mach-w90x900/w90p910.c
@@ -62,7 +62,7 @@ static DEFINE_CLK(atapi, 6);
 static DEFINE_CLK(emc, 7);
 static DEFINE_CLK(usbd, 8);
 static DEFINE_CLK(usbh, 9);
-static DEFINE_CLK(g2d, 10);;
+static DEFINE_CLK(g2d, 10);
 static DEFINE_CLK(pwm, 18);
 static DEFINE_CLK(ps2, 24);
 static DEFINE_CLK(kpi, 25);
diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
index 8aee763..c2106d5 100644
--- a/arch/arm/plat-mxc/irq.c
+++ b/arch/arm/plat-mxc/irq.c
@@ -53,7 +53,7 @@ int imx_irq_set_priority(unsigned char irq, unsigned char prio)
 	unsigned int mask = 0x0F << irq % 8 * 4;
 
 	if (irq >= MXC_INTERNAL_IRQS)
-		return -EINVAL;;
+		return -EINVAL;
 
 	temp = __raw_readl(avic_base + AVIC_NIPRIORITY(irq / 8));
 	temp &= ~mask;

^ permalink raw reply	[flat|nested] 10+ messages in thread

* linux-next: manual merge of the trivial tree with the arm tree
@ 2009-09-07  6:32 Stephen Rothwell
  2009-09-07 15:14 ` Jiri Kosina
  0 siblings, 1 reply; 10+ messages in thread
From: Stephen Rothwell @ 2009-09-07  6:32 UTC (permalink / raw)
  To: Jiri Kosina
  Cc: linux-next, linux-kernel, Joe Perches, wanzongshun, Russell King

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
arch/arm/mach-w90x900/w90p910.c between commit
35c9221acb133ecc9abd701a1fb6fa909d177a77 ("ARM: 5682/1: Add cpu.c and
dev.c and modify some files of w90p910 platform") from the arm tree and
commit 6f8fadf4a5c43f9f10f1910c71d8d9ff0b0a26ca ("trivial: remove
unnecessary semicolons") from the trivial tree.

The former commit moved the code changed by the latter into a different
file (arch/arm/mach-w90x900/cpu.c - and removed the old file).  Its not
important enough to fix it there (so I just removed this file), but maybe
the part of the trivial commit touching this file could be sent to the
arm maintainer.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2013-04-26  5:27 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-26  5:27 linux-next: manual merge of the trivial tree with the arm tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2010-02-08  4:48 Stephen Rothwell
2010-02-09 10:09 ` Jiri Kosina
2010-02-08  4:48 Stephen Rothwell
2010-02-08  4:48 Stephen Rothwell
2009-11-25  7:29 Stephen Rothwell
2009-11-25 11:26 ` Jiri Kosina
2009-09-07  6:32 Stephen Rothwell
2009-09-07 15:14 ` Jiri Kosina
2009-09-07 15:17   ` Russell King

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).