linux-next: manual merge of the trivial tree with the arm tree

Stephen Rothwell

unread,

Feb 7, 2010, 11:50:02 PM2/7/10

to

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 s...@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

Stephen Rothwell

unread,

Feb 7, 2010, 11:50:02 PM2/7/10

to

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 s...@canb.auug.org.au

http://www.canb.auug.org.au/~sfr/

Stephen Rothwell

unread,

Feb 7, 2010, 11:50:03 PM2/7/10

to

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

Jiri Kosina

unread,

Feb 9, 2010, 5:10:02 AM2/9/10

to

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/