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

[Stephen Rothwell]

Hi all,

[Just adding Dimitry to cc]

On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 get_cycles() on PPC")
> 
> from the input-current tree and commits:
> 
>   739d875dd698 ("mn10300: Remove the architecture")
>   588020dcb92a ("treewide: simplify Kconfig dependencies for removed archs")
> 
> from the asm-generic 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/input/joystick/analog.c
> index a942c4ccd2af,eefac7978f93..000000000000
> --- a/drivers/input/joystick/analog.c
> +++ b/drivers/input/joystick/analog.c
> @@@ -163,7 -163,7 +163,7 @@@ static unsigned int get_time_pit(void
>   #define GET_TIME(x)	do { x = (unsigned int)rdtsc(); } while (0)
>   #define DELTA(x,y)	((y)-(x))
>   #define TIME_NAME	"TSC"
> - #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_PPC) || defined(CONFIG_RISCV) || defined(CONFIG_TILE)
>  -#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV)
> ++#elif defined(__alpha__) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_PPC) || defined(CONFIG_RISCV)
>   #define GET_TIME(x)	do { x = get_cycles(); } while (0)
>   #define DELTA(x,y)	((y)-(x))
>   #define TIME_NAME	"get_cycles"

Attachment: pgpZLfwAWMuKY.pgp
Description: OpenPGP digital signature