Re: linux-next: manual merge of the trivial tree with the mips tree

Hi Jiri, On Wed, 23 Jan 2013 14:03:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the trivial tree got a conflict in > arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit > baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit > d82603c6da75 ("

linux-next: manual merge of the trivial tree with the mips tree

Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit d82603c6da75 ("treewide: Replace incomming with incoming in all comments and strings")