Re: linux-next: manual merge of the arm-soc tree with the arm64 tree

2019-03-01 Thread Catalin Marinas
On Fri, Mar 01, 2019 at 09:10:36AM +1100, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in: > > arch/arm64/Kconfig.platforms > > between commit: > > a29c78234942 ("arm64: Kconfig.platforms: fix warning unmet direct > dependencies") > > from the arm64

linux-next: manual merge of the arm-soc tree with the arm64 tree

2019-02-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in: arch/arm64/Kconfig.platforms between commit: a29c78234942 ("arm64: Kconfig.platforms: fix warning unmet direct dependencies") from the arm64 tree and commits: 67b9282387c5 ("arm64: imx8mq: select GPCv2 irqchip driv

linux-next: manual merge of the arm-soc tree with the arm64 tree

2012-10-04 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm64/include/asm/unistd32.h between commit cce72b4219ee ("arm64: Use the generic compat_sys_sendfile() implementation") from the arm64 tree and commit 890139529d45 ("UAPI: Fix the guards on various asm/unistd.h files") fr

linux-next: manual merge of the arm-soc tree with the arm64 tree

2012-09-24 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/clocksource/Makefile between commit 985c0679dfa4 ("arm64: Generic timers support") from the arm64 tree and commit ee4af5696720 ("ARM: bcm2835: add system timer") from the arm-soc tree. I fixed it up (see below) and can