Messages in this thread | | | Date | Wed, 21 Sep 2011 22:44:04 -0400 (EDT) | From | Nicolas Pitre <> | Subject | Re: linux-next: manual merge of the arm-soc tree with the arm tree |
| |
On Thu, 22 Sep 2011, Stephen Rothwell wrote:
> 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.
That is correct.
Nicolas
| |