Re: linux-next: manual merge of the llvmlinux tree with the tree

2014-09-15 Thread Behan Webster
On 09/14/14 23:38, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the llvmlinux tree got a conflict in drivers/gpu/drm/msm/hdmi/hdmi.c between commit fc886107c556 ("drm/msm: Change nested function to static function") from the watchdog tree and commit 8f2c494adad0 ("msm, hdmi: LLVML

linux-next: manual merge of the llvmlinux tree with the tree

2014-09-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the llvmlinux tree got a conflict in drivers/gpu/drm/msm/hdmi/hdmi.c between commit fc886107c556 ("drm/msm: Change nested function to static function") from the watchdog tree and commit 8f2c494adad0 ("msm, hdmi: LLVMLinux: Remove nested function from HDMI driver