Re: linux-next: manual merge of the asm-generic tree with the input-current tree

Hi all, On Thu, 15 Mar 2018 09:56:56 +1100 Stephen Rothwell wrote: > > [Just adding Dimitry to cc] > > On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the asm-generic tree got a conflict in: > > >

Re: linux-next: manual merge of the asm-generic tree with the input-current tree

Hi all, On Thu, 15 Mar 2018 09:56:56 +1100 Stephen Rothwell wrote: > > [Just adding Dimitry to cc] > > On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the asm-generic tree got a conflict in: > > > > drivers/input/joystick/analog.c > > > >

Re: linux-next: manual merge of the asm-generic tree with the input-current tree

Hi all, [Just adding Dimitry to cc] On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell wrote: > > Hi Arnd, > > Today's linux-next merge of the asm-generic tree got a conflict in: > > drivers/input/joystick/analog.c > > between commit: > > c9ab800167e1 ("Input:

Re: linux-next: manual merge of the asm-generic tree with the input-current tree

Hi all, [Just adding Dimitry to cc] On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell wrote: > > Hi Arnd, > > Today's linux-next merge of the asm-generic tree got a conflict in: > > drivers/input/joystick/analog.c > > between commit: > > c9ab800167e1 ("Input: analog - use

linux-next: manual merge of the asm-generic tree with the input-current tree

Hi Arnd, Today's linux-next merge of the asm-generic tree got a conflict in: drivers/input/joystick/analog.c between commit: c9ab800167e1 ("Input: analog - use get_cycles() on PPC") from the input-current tree and commits: 739d875dd698 ("mn10300: Remove the architecture")

linux-next: manual merge of the asm-generic tree with the input-current tree

Hi Arnd, Today's linux-next merge of the asm-generic tree got a conflict in: drivers/input/joystick/analog.c between commit: c9ab800167e1 ("Input: analog - use get_cycles() on PPC") from the input-current tree and commits: 739d875dd698 ("mn10300: Remove the architecture")