Stephen Rothwell <s...@canb.auug.org.au> writes: > Hi all, > > Today's linux-next merge of the powerpc tree got a conflict in: > > arch/powerpc/kernel/setup-common.c > > between commit: > > 349524bc0da6 ("powerpc: Don't preempt_disable() in show_cpuinfo()") > > from the powerpc-fixes tree and commit: > > f5f563012a70 ("powerpc: Make newline in cpuinfo unconditional") > > from the powerpc tree. > > I fixed it up (see below) 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.
Nah that guy is a jerk. Thanks for the report. cheers