* linux-next: manual merge of the asm-generic tree with the input-current tree
@ 2018-03-14 22:37 Stephen Rothwell
2018-03-14 22:56 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-03-14 22:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
David Howells, Michael Ellerman
[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the asm-generic tree with the input-current tree
2018-03-14 22:37 linux-next: manual merge of the asm-generic tree with the input-current tree Stephen Rothwell
@ 2018-03-14 22:56 ` Stephen Rothwell
2018-04-03 23:06 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-03-14 22:56 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
David Howells, Michael Ellerman, Dmitry Torokhov
[-- Attachment #1: Type: text/plain, Size: 1917 bytes --]
Hi all,
[Just adding Dimitry to cc]
On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the asm-generic tree with the input-current tree
2018-03-14 22:56 ` Stephen Rothwell
@ 2018-04-03 23:06 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2018-04-03 23:06 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Arnd Bergmann, Linux-Next Mailing List,
Linux Kernel Mailing List, David Howells, Michael Ellerman
[-- Attachment #1: Type: text/plain, Size: 2187 bytes --]
Hi all,
On Thu, 15 Mar 2018 09:56:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> [Just adding Dimitry to cc]
>
> On Thu, 15 Mar 2018 09:37:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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"
This conflict now exists between the input-current tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-03 23:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-14 22:37 linux-next: manual merge of the asm-generic tree with the input-current tree Stephen Rothwell
2018-03-14 22:56 ` Stephen Rothwell
2018-04-03 23:06 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).