lkml.org 
[lkml]   [2016]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm64 tree with Linus' tree
Hi Catalin,

Today's linux-next merge of the arm64 tree got a conflict in:

drivers/perf/arm_pmu.c

between commit:

63fb0a9516b2 ("drivers/perf: arm_pmu: Fix NULL pointer dereference during probe")

from Linus' tree and commit:

282b87963556 ("drivers/perf: arm_pmu: Always consider IRQ0 as an error")

from the arm64 tree.

I fixed it up (I just used the version from the arm64 tree) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

--
Cheers,
Stephen Rothwell

\
 
 \ /
  Last update: 2016-09-17 09:59    [W:0.025 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site