2020-05-19 21:26:33

by Paul Cercueil

[permalink] [raw]
Subject: [PATCH] MIPS: ingenic: Add missing include

Add missing include which adds the prototype to plat_time_init().

Fixes: f932449c11da ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
Signed-off-by: Paul Cercueil <[email protected]>
Reported-by: kbuild test robot <[email protected]>
---
arch/mips/jz4740/setup.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 81428ddcaa97..c627fbd90892 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -20,6 +20,7 @@
#include <asm/fw/fw.h>
#include <asm/prom.h>
#include <asm/reboot.h>
+#include <asm/time.h>

#define JZ4740_EMC_BASE_ADDR 0x13010000

--
2.26.2


2020-05-20 06:50:39

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH] MIPS: ingenic: Add missing include

On Tue, May 19, 2020 at 11:22:30PM +0200, Paul Cercueil wrote:
> Add missing include which adds the prototype to plat_time_init().
>
> Fixes: f932449c11da ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> Signed-off-by: Paul Cercueil <[email protected]>
> Reported-by: kbuild test robot <[email protected]>
> ---
> arch/mips/jz4740/setup.c | 1 +
> 1 file changed, 1 insertion(+)

applied to mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]

2020-05-20 09:22:20

by Philippe Mathieu-Daudé

[permalink] [raw]
Subject: Re: [PATCH] MIPS: ingenic: Add missing include

Hi Thomas,

On Wed, May 20, 2020 at 8:50 AM Thomas Bogendoerfer
<[email protected]> wrote:
>
> On Tue, May 19, 2020 at 11:22:30PM +0200, Paul Cercueil wrote:
> > Add missing include which adds the prototype to plat_time_init().
> >
> > Fixes: f932449c11da ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> > Signed-off-by: Paul Cercueil <[email protected]>
> > Reported-by: kbuild test robot <[email protected]>
> > ---
> > arch/mips/jz4740/setup.c | 1 +
> > 1 file changed, 1 insertion(+)
>
> applied to mips-next.

Since mips-next is not merged, can you simply squash the fix to the
incomplete f932449c11da please?

Thanks,

Phil.

>
> Thomas.
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea. [ RFC1925, 2.3 ]

2020-05-20 09:32:16

by Thomas Bogendoerfer

[permalink] [raw]
Subject: Re: [PATCH] MIPS: ingenic: Add missing include

On Wed, May 20, 2020 at 11:19:49AM +0200, Philippe Mathieu-Daud? wrote:
> Hi Thomas,
>
> On Wed, May 20, 2020 at 8:50 AM Thomas Bogendoerfer
> <[email protected]> wrote:
> >
> > On Tue, May 19, 2020 at 11:22:30PM +0200, Paul Cercueil wrote:
> > > Add missing include which adds the prototype to plat_time_init().
> > >
> > > Fixes: f932449c11da ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> > > Signed-off-by: Paul Cercueil <[email protected]>
> > > Reported-by: kbuild test robot <[email protected]>
> > > ---
> > > arch/mips/jz4740/setup.c | 1 +
> > > 1 file changed, 1 insertion(+)
> >
> > applied to mips-next.
>
> Since mips-next is not merged, can you simply squash the fix to the
> incomplete f932449c11da please?

no, I don't rebase mips-next.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]

2020-05-20 10:03:39

by Philippe Mathieu-Daudé

[permalink] [raw]
Subject: Re: [PATCH] MIPS: ingenic: Add missing include

On Wed, May 20, 2020 at 11:28 AM Thomas Bogendoerfer
<[email protected]> wrote:
>
> On Wed, May 20, 2020 at 11:19:49AM +0200, Philippe Mathieu-Daudé wrote:
> > Hi Thomas,
> >
> > On Wed, May 20, 2020 at 8:50 AM Thomas Bogendoerfer
> > <[email protected]> wrote:
> > >
> > > On Tue, May 19, 2020 at 11:22:30PM +0200, Paul Cercueil wrote:
> > > > Add missing include which adds the prototype to plat_time_init().
> > > >
> > > > Fixes: f932449c11da ("MIPS: ingenic: Drop obsolete code, merge the rest in setup.c")
> > > > Signed-off-by: Paul Cercueil <[email protected]>
> > > > Reported-by: kbuild test robot <[email protected]>
> > > > ---
> > > > arch/mips/jz4740/setup.c | 1 +
> > > > 1 file changed, 1 insertion(+)
> > >
> > > applied to mips-next.
> >
> > Since mips-next is not merged, can you simply squash the fix to the
> > incomplete f932449c11da please?
>
> no, I don't rebase mips-next.

OK. I had the understanding that mips-fixes was the stable branch not rebased,
and mips-next was not considered stable until merged in mainstream.
I took note of the changes, thanks.

>
> Thomas.
>
> --
> Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
> good idea. [ RFC1925, 2.3 ]