* [PATCH] MIPS: ingenic: Add missing include
@ 2020-05-19 21:22 Paul Cercueil
2020-05-20 6:45 ` Thomas Bogendoerfer
0 siblings, 1 reply; 5+ messages in thread
From: Paul Cercueil @ 2020-05-19 21:22 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: od, linux-mips, linux-kernel, Paul Cercueil, kbuild test robot
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 <paul@crapouillou.net>
Reported-by: kbuild test robot <lkp@intel.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Add missing include
2020-05-19 21:22 [PATCH] MIPS: ingenic: Add missing include Paul Cercueil
@ 2020-05-20 6:45 ` Thomas Bogendoerfer
2020-05-20 9:19 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-20 6:45 UTC (permalink / raw)
To: Paul Cercueil; +Cc: od, linux-mips, linux-kernel, kbuild test robot
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 <paul@crapouillou.net>
> Reported-by: kbuild test robot <lkp@intel.com>
> ---
> 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 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Add missing include
2020-05-20 6:45 ` Thomas Bogendoerfer
@ 2020-05-20 9:19 ` Philippe Mathieu-Daudé
2020-05-20 9:27 ` Thomas Bogendoerfer
0 siblings, 1 reply; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-20 9:19 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Paul Cercueil, od, open list:BROADCOM NVRAM DRIVER, open list,
kbuild test robot
Hi Thomas,
On Wed, May 20, 2020 at 8:50 AM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> 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 <paul@crapouillou.net>
> > Reported-by: kbuild test robot <lkp@intel.com>
> > ---
> > 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 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Add missing include
2020-05-20 9:19 ` Philippe Mathieu-Daudé
@ 2020-05-20 9:27 ` Thomas Bogendoerfer
2020-05-20 10:01 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Bogendoerfer @ 2020-05-20 9:27 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paul Cercueil, od, open list:BROADCOM NVRAM DRIVER, open list,
kbuild test robot
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
> <tsbogend@alpha.franken.de> 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 <paul@crapouillou.net>
> > > Reported-by: kbuild test robot <lkp@intel.com>
> > > ---
> > > 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 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] MIPS: ingenic: Add missing include
2020-05-20 9:27 ` Thomas Bogendoerfer
@ 2020-05-20 10:01 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-20 10:01 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Paul Cercueil, od, open list:BROADCOM NVRAM DRIVER, open list,
kbuild test robot
On Wed, May 20, 2020 at 11:28 AM Thomas Bogendoerfer
<tsbogend@alpha.franken.de> 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
> > <tsbogend@alpha.franken.de> 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 <paul@crapouillou.net>
> > > > Reported-by: kbuild test robot <lkp@intel.com>
> > > > ---
> > > > 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 ]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-20 10:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-19 21:22 [PATCH] MIPS: ingenic: Add missing include Paul Cercueil
2020-05-20 6:45 ` Thomas Bogendoerfer
2020-05-20 9:19 ` Philippe Mathieu-Daudé
2020-05-20 9:27 ` Thomas Bogendoerfer
2020-05-20 10:01 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.