2022-04-27 10:34:57

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the input tree

Hi all,

After merging the input tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
| ^~~~~~~~~~~~~~~~
drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
48 | .deb_reg = _deb_reg, \
| ^~~~~~~~
drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
| ^~~~~~~~~~~~~~~~~~~
| MT6358_TOP_RST_MISC

Caused by commit

0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")

I have used the input tree from next-20220426 for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2022-04-27 10:55:08

by Fabien Parent

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

Hi,

On Wed, Apr 27, 2022 at 10:48:25AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> | ^~~~~~~~~~~~~~~~
> drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> 48 | .deb_reg = _deb_reg, \
> | ^~~~~~~~
> drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> | ^~~~~~~~~~~~~~~~~~~
> | MT6358_TOP_RST_MISC
>
> Caused by commit
>
> 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
>
> I have used the input tree from next-20220426 for today.

The commit is depending on another commit from the same patch serie: [0]. That
patch has been merged in the tree of the MFD maintainer: [1].

[0] https://lore.kernel.org/all/[email protected]/
[1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=for-mfd-next

Fabien

>
> --
> Cheers,
> Stephen Rothwell



Attachments:
(No filename) (1.50 kB)
signature.asc (849.00 B)
Download all attachments

2022-04-27 10:59:38

by Lee Jones

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

On Wed, 27 Apr 2022, Fabien Parent wrote:

> Hi,
>
> On Wed, Apr 27, 2022 at 10:48:25AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the input tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> > 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> > | ^~~~~~~~~~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> > 48 | .deb_reg = _deb_reg, \
> > | ^~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> > 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> > | ^~~~~~~~~~~~~~~~~~~
> > | MT6358_TOP_RST_MISC
> >
> > Caused by commit
> >
> > 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
> >
> > I have used the input tree from next-20220426 for today.
>
> The commit is depending on another commit from the same patch serie: [0]. That
> patch has been merged in the tree of the MFD maintainer: [1].
>
> [0] https://lore.kernel.org/all/[email protected]/
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=for-mfd-next

Looks like you only sent me 2 of the 8 patches in the set.

In future, if there are dependencies between patches, you must send
all of the patches to everyone. That way, we can organise a merge
strategy that does not break -next, or worse Mainline during the
merge-window.

--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog

2022-05-03 00:17:57

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

Hi all,

On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <[email protected]> wrote:
>
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> | ^~~~~~~~~~~~~~~~
> drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> 48 | .deb_reg = _deb_reg, \
> | ^~~~~~~~
> drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> | ^~~~~~~~~~~~~~~~~~~
> | MT6358_TOP_RST_MISC
>
> Caused by commit
>
> 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
>
> I have used the input tree from next-20220426 for today.

I am still getting this failure.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2022-05-06 06:47:20

by Dmitry Torokhov

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

On Sun, May 1, 2022 at 7:17 PM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <[email protected]> wrote:
> >
> > After merging the input tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> > 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> > | ^~~~~~~~~~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> > 48 | .deb_reg = _deb_reg, \
> > | ^~~~~~~~
> > drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> > 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> > | ^~~~~~~~~~~~~~~~~~~
> > | MT6358_TOP_RST_MISC
> >
> > Caused by commit
> >
> > 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
> >
> > I have used the input tree from next-20220426 for today.
>
> I am still getting this failure.

Sorry for sitting on this. I dropped the patches from my tree, we can
either push them through MFD, or retry after the merge window.

Thanks.

--
Dmitry

2022-06-01 14:12:09

by Fabien Parent

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the input tree

Hi Dmitry,

On Thu, May 05, 2022 at 05:25:39PM -0700, Dmitry Torokhov wrote:
> On Sun, May 1, 2022 at 7:17 PM Stephen Rothwell <[email protected]> wrote:
> >
> > Hi all,
> >
> > On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <[email protected]> wrote:
> > >
> > > After merging the input tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/input/keyboard/mtk-pmic-keys.c:93:36: error: 'MT6359_TOPSTATUS' undeclared here (not in a function); did you mean 'MT6358_TOPSTATUS'?
> > > 93 | MTK_PMIC_KEYS_REGS(MT6359_TOPSTATUS,
> > > | ^~~~~~~~~~~~~~~~
> > > drivers/input/keyboard/mtk-pmic-keys.c:48:35: note: in definition of macro 'MTK_PMIC_KEYS_REGS'
> > > 48 | .deb_reg = _deb_reg, \
> > > | ^~~~~~~~
> > > drivers/input/keyboard/mtk-pmic-keys.c:98:25: error: 'MT6359_TOP_RST_MISC' undeclared here (not in a function); did you mean 'MT6358_TOP_RST_MISC'?
> > > 98 | .pmic_rst_reg = MT6359_TOP_RST_MISC,
> > > | ^~~~~~~~~~~~~~~~~~~
> > > | MT6358_TOP_RST_MISC
> > >
> > > Caused by commit
> > >
> > > 0f97adf64314 ("Input: mtk-pmic-keys - add support for MT6359")
> > >
> > > I have used the input tree from next-20220426 for today.
> >
> > I am still getting this failure.
>
> Sorry for sitting on this. I dropped the patches from my tree, we can
> either push them through MFD, or retry after the merge window.

The MFD patches have been merged into linus tree. Now the Input patches can
be applied without breaking the build.

If you want me to resend them, please let me know.

Thanks,
Fabien

> Thanks.
>
> --
> Dmitry


Attachments:
(No filename) (1.79 kB)
signature.asc (849.00 B)
Download all attachments