Messages in this thread | | | Date | Thu, 22 Sep 2011 11:49:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the arm tree |
| |
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-nuc93x/Makefile.boot between commit 86783a0c544d ("ARM: 7022/1: allow to detect conflicting zreladdrs") from the arm tree and commit 6adc1e7ff19d ("ARM: mach-nuc93x: delete") from the arm-soc tree.
The latter removes the file that the former updates, so i did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |