| Message ID | 20200519212230.313365-1-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c9c2e9c596e90fcf9ee0bf16672f7b938f39b913 |
| Headers | show |
| Series | MIPS: ingenic: Add missing include | expand |
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.
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 ]
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.
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 ]
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
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(+)