linux-next: build failure after merge of the input tree

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Fabien Parent]

[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]

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/20220426135313.245466-3-fparent@baylibre.com/
[1] https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=for-mfd-next

Fabien

> 
> -- 
> Cheers,
> Stephen Rothwell



[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the input tree

[Lee Jones]

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/20220426135313.245466-3-fparent@baylibre.com/
> [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

Re: linux-next: build failure after merge of the input tree

[Fabien Parent]

[-- Attachment #1: Type: text/plain, Size: 2287 bytes --]

On Wed, Apr 27, 2022 at 08:35:25AM +0100, Lee Jones wrote:
> 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/20220426135313.245466-3-fparent@baylibre.com/
> > [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.

Understood. Thanks for the info, I will make sure next time to include
everyone in such situation.

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]

Hi all,

On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

On Sun, May 1, 2022 at 7:17 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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

Re: linux-next: build failure after merge of the input tree

[Fabien Parent]

[-- Attachment #1: Type: text/plain, Size: 1838 bytes --]

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 <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > On Wed, 27 Apr 2022 10:48:25 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

On Tue, Oct 25, 2022 at 10:00:48AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/keyboard/stmpe-keypad.c: In function 'stmpe_keypad_probe':
> drivers/input/keyboard/stmpe-keypad.c:353:9: error: implicit declaration of function 'of_property_read_u32' [-Werror=implicit-function-declaration]
>   353 |         of_property_read_u32(np, "debounce-interval", &keypad->debounce_ms);
>       |         ^~~~~~~~~~~~~~~~~~~~
> drivers/input/keyboard/stmpe-keypad.c:355:33: error: implicit declaration of function 'of_property_read_bool' [-Werror=implicit-function-declaration]
>   355 |         keypad->no_autorepeat = of_property_read_bool(np, "st,no-autorepeat");
>       |                                 ^~~~~~~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> 
> Caused by commit
> 
>   8b96465c93a8 ("Input: matrix_keypad - replace header inclusions by forward declarations")
> 
> I have used the input tree from next-20221024 for today.

Thanks, I'll fix this up.

-- 
Dmitry

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

Hi all,

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

drivers/input/keyboard/stmpe-keypad.c: In function 'stmpe_keypad_probe':
drivers/input/keyboard/stmpe-keypad.c:353:9: error: implicit declaration of function 'of_property_read_u32' [-Werror=implicit-function-declaration]
  353 |         of_property_read_u32(np, "debounce-interval", &keypad->debounce_ms);
      |         ^~~~~~~~~~~~~~~~~~~~
drivers/input/keyboard/stmpe-keypad.c:355:33: error: implicit declaration of function 'of_property_read_bool' [-Werror=implicit-function-declaration]
  355 |         keypad->no_autorepeat = of_property_read_bool(np, "st,no-autorepeat");
      |                                 ^~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Caused by commit

  8b96465c93a8 ("Input: matrix_keypad - replace header inclusions by forward declarations")

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

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 2280 bytes --]

Hello,

On Wed, Aug 17, 2022 at 10:00:07AM +1000, Stephen Rothwell wrote:
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/misc/ibm-panel.c:195:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
>   195 |         .remove = ibm_panel_remove,
>       |                   ^~~~~~~~~~~~~~~~
> drivers/input/misc/ibm-panel.c:195:19: note: (near initialization for 'ibm_panel_driver.remove')
> 
> Caused by commit
> 
>   95331e91e9da ("Input: Add IBM Operation Panel driver")
> 
> interacting with commit
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from v6.0-rc1.

I was a bit irritated by the "from v6.0-rc1" part and I feared that I
missed a driver in the conversion of the remove callback. But both
commits happen after v6.0-rc1, so everything is fine and as expected.

> I have applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 17 Aug 2022 09:54:11 +1000
> Subject: [PATCH] Input: fix up for "i2c: Make remove callback return void"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/input/misc/ibm-panel.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/input/misc/ibm-panel.c b/drivers/input/misc/ibm-panel.c
> index 54c657cd7809..094bcdb568f1 100644
> --- a/drivers/input/misc/ibm-panel.c
> +++ b/drivers/input/misc/ibm-panel.c
> @@ -174,11 +174,9 @@ static int ibm_panel_probe(struct i2c_client *client,
>  	return 0;
>  }
>  
> -static int ibm_panel_remove(struct i2c_client *client)
> +static void ibm_panel_remove(struct i2c_client *client)
>  {
>  	i2c_slave_unregister(client);
> -
> -	return 0;
>  }

That looks right. Wolfram created a tag for the conversion that can be
pulled into the input tree at

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Hi all,

On Wed, 17 Aug 2022 10:00:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/misc/ibm-panel.c:195:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
>   195 |         .remove = ibm_panel_remove,
>       |                   ^~~~~~~~~~~~~~~~
> drivers/input/misc/ibm-panel.c:195:19: note: (near initialization for 'ibm_panel_driver.remove')
> 
> Caused by commit
> 
>   95331e91e9da ("Input: Add IBM Operation Panel driver")
> 
> interacting with commit
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from v6.0-rc1.

Actually it is from the i2c tree and not in Linus' tree.  Sorry about
that.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]

Hi all,

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

drivers/input/misc/ibm-panel.c:195:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
  195 |         .remove = ibm_panel_remove,
      |                   ^~~~~~~~~~~~~~~~
drivers/input/misc/ibm-panel.c:195:19: note: (near initialization for 'ibm_panel_driver.remove')

Caused by commit

  95331e91e9da ("Input: Add IBM Operation Panel driver")

interacting with commit

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from v6.0-rc1.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 17 Aug 2022 09:54:11 +1000
Subject: [PATCH] Input: fix up for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/misc/ibm-panel.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/input/misc/ibm-panel.c b/drivers/input/misc/ibm-panel.c
index 54c657cd7809..094bcdb568f1 100644
--- a/drivers/input/misc/ibm-panel.c
+++ b/drivers/input/misc/ibm-panel.c
@@ -174,11 +174,9 @@ static int ibm_panel_probe(struct i2c_client *client,
 	return 0;
 }
 
-static int ibm_panel_remove(struct i2c_client *client)
+static void ibm_panel_remove(struct i2c_client *client)
 {
 	i2c_slave_unregister(client);
-
-	return 0;
 }
 
 static const struct of_device_id ibm_panel_match[] = {
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Jiri Kosina]

On Thu, 4 Aug 2022, Mark Brown wrote:

> > Hi all,
> > 
> > After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > /tmp/next/build/drivers/hid/hid-nintendo.c:406:29: error: redefinition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
> >   406 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> >       |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > /tmp/next/build/drivers/hid/hid-nintendo.c:295:29: note: previous definition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT' was here
> >   295 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
> >       |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~
> 
> This error persists, I've gone back to 20220722 which seems to be the
> last version.

for-next branch accumulated so many reverts and -next-specific fixups (not 
always correct) over the years (with the only goal of not rebasing it) 
that it's now time to finally rebase it. Which I just did, and things 
should be good now.

Sorry for the noise,

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: build failure after merge of the input tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

On Mon, Aug 01, 2022 at 10:44:34PM +0100, broonie@kernel.org wrote:
> Hi all,
> 
> After merging the hid tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> /tmp/next/build/drivers/hid/hid-nintendo.c:406:29: error: redefinition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
>   406 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
>       |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~
> /tmp/next/build/drivers/hid/hid-nintendo.c:295:29: note: previous definition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT' was here
>   295 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
>       |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~

This error persists, I've gone back to 20220722 which seems to be the
last version.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the input tree

[broonie]

Hi all,

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

/tmp/next/build/drivers/hid/hid-nintendo.c:406:29: error: redefinition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT'
  406 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/next/build/drivers/hid/hid-nintendo.c:295:29: note: previous definition of 'JC_RUMBLE_ZERO_AMP_PKT_CNT' was here
  295 | static const unsigned short JC_RUMBLE_ZERO_AMP_PKT_CNT = 5;
      |                             ^~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  7af32d156ad7 ("Revert "HID: nintendo: Fix unused-const-variable compiler warning"")

interacting with

  92cdfba40155 ("HID: nintendo: fix unused const warning")

I'll apply a fixup for now.

Re: linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2136 bytes --]

Hi all,

On Wed, 25 Mar 2020 18:16:00 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the input tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/input/touchscreen/goodix.c: In function 'goodix_irq_direction_output':
> drivers/input/touchscreen/goodix.c:624:12: error: implicit declaration of function 'acpi_execute_simple_method' [-Werror=implicit-function-declaration]
>   624 |   status = acpi_execute_simple_method(ACPI_HANDLE(dev),
>       |            ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/input/touchscreen/goodix.c:606:17: warning: unused variable 'dev' [-Wunused-variable]
>   606 |  struct device *dev = &ts->client->dev;
>       |                 ^~~
> drivers/input/touchscreen/goodix.c: In function 'goodix_irq_direction_input':
> drivers/input/touchscreen/goodix.c:634:17: warning: unused variable 'dev' [-Wunused-variable]
>   634 |  struct device *dev = &ts->client->dev;
>       |                 ^~~
> cc1: some warnings being treated as errors
> 
> Caused by commit
> 
>   c5fca485320e ("Input: goodix - add support for controlling the IRQ pin through ACPI methods")
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 25 Mar 2020 18:04:08 +1100
> Subject: [PATCH] Input: goodix - mark as BROKEN for noe
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/input/touchscreen/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
> index c071f7c407b6..98788fb83917 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -380,6 +380,7 @@ config TOUCHSCREEN_GOODIX
>  	tristate "Goodix I2C touchscreen"
>  	depends on I2C
>  	depends on GPIOLIB || COMPILE_TEST
> +	depends on BROKEN
>  	help
>  	  Say Y here if you have the Goodix touchscreen (such as one
>  	  installed in Onda v975w tablets) connected to your

I am still marking this as BROKEN ...

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]

Hi all,

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

drivers/input/touchscreen/goodix.c: In function 'goodix_irq_direction_output':
drivers/input/touchscreen/goodix.c:624:12: error: implicit declaration of function 'acpi_execute_simple_method' [-Werror=implicit-function-declaration]
  624 |   status = acpi_execute_simple_method(ACPI_HANDLE(dev),
      |            ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/input/touchscreen/goodix.c:606:17: warning: unused variable 'dev' [-Wunused-variable]
  606 |  struct device *dev = &ts->client->dev;
      |                 ^~~
drivers/input/touchscreen/goodix.c: In function 'goodix_irq_direction_input':
drivers/input/touchscreen/goodix.c:634:17: warning: unused variable 'dev' [-Wunused-variable]
  634 |  struct device *dev = &ts->client->dev;
      |                 ^~~
cc1: some warnings being treated as errors

Caused by commit

  c5fca485320e ("Input: goodix - add support for controlling the IRQ pin through ACPI methods")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 25 Mar 2020 18:04:08 +1100
Subject: [PATCH] Input: goodix - mark as BROKEN for noe

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/touchscreen/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index c071f7c407b6..98788fb83917 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -380,6 +380,7 @@ config TOUCHSCREEN_GOODIX
 	tristate "Goodix I2C touchscreen"
 	depends on I2C
 	depends on GPIOLIB || COMPILE_TEST
+	depends on BROKEN
 	help
 	  Say Y here if you have the Goodix touchscreen (such as one
 	  installed in Onda v975w tablets) connected to your
-- 
2.25.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

On Fri, Oct 16, 2015 at 09:37:34AM +0200, Hans de Goede wrote:
> Hio,
> 
> On 16-10-15 04:19, Stephen Rothwell wrote:
> >Hi Dmitry,
> >
> >After merging the input tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
> >
> >In file included from samples/hidraw/hid-example.c:14:0:
> >./usr/include/linux/input.h:17:31: fatal error: input-event-codes.h: No such file or directory
> >
> >Caused by commit
> >
> >   d794709c3916 ("Input: Add input-event-codes header file")
> >
> >I have used the input tree from next-20151015 for today.
> 
> Sorry, my bad, I assumed anything under include/uapi would
> automatically get installed as a usr header, but it turns out
> any files added need to also be added to the Kbuild file, the
> attached patch should fix this.
> 
> Dmitry, feel free to squash this into the original patch.

Thanks Hans, I folded it into the original patch.

> 
> Regards,
> 
> Hans

> From 0dd5544b6ca0cddfe25976b46ef9ba5c4adbc791 Mon Sep 17 00:00:00 2001
> From: Hans de Goede <hdegoede@redhat.com>
> Date: Fri, 16 Oct 2015 09:33:45 +0200
> Subject: [PATCH] input: Add input-event-codes.h to usr headers to install
> 
> Add input-event-codes.h to the list of uapi headers to install, this fixes
> build-failures of any userspace tools including linux/input.h .
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  include/uapi/linux/Kbuild | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
> index f7b2db4..0f26309 100644
> --- a/include/uapi/linux/Kbuild
> +++ b/include/uapi/linux/Kbuild
> @@ -191,6 +191,7 @@ header-y += inet_diag.h
>  header-y += in.h
>  header-y += inotify.h
>  header-y += input.h
> +header-y += input-event-codes.h
>  header-y += in_route.h
>  header-y += ioctl.h
>  header-y += ip6_tunnel.h
> -- 
> 2.5.0
> 


-- 
Dmitry

Re: linux-next: build failure after merge of the input tree

[Hans de Goede]

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

Hio,

On 16-10-15 04:19, Stephen Rothwell wrote:
> Hi Dmitry,
>
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from samples/hidraw/hid-example.c:14:0:
> ./usr/include/linux/input.h:17:31: fatal error: input-event-codes.h: No such file or directory
>
> Caused by commit
>
>    d794709c3916 ("Input: Add input-event-codes header file")
>
> I have used the input tree from next-20151015 for today.

Sorry, my bad, I assumed anything under include/uapi would
automatically get installed as a usr header, but it turns out
any files added need to also be added to the Kbuild file, the
attached patch should fix this.

Dmitry, feel free to squash this into the original patch.

Regards,

Hans

[-- Attachment #2: 0001-input-Add-input-event-codes.h-to-usr-headers-to-inst.patch --]
[-- Type: text/x-patch, Size: 870 bytes --]

>From 0dd5544b6ca0cddfe25976b46ef9ba5c4adbc791 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 16 Oct 2015 09:33:45 +0200
Subject: [PATCH] input: Add input-event-codes.h to usr headers to install

Add input-event-codes.h to the list of uapi headers to install, this fixes
build-failures of any userspace tools including linux/input.h .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 include/uapi/linux/Kbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index f7b2db4..0f26309 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -191,6 +191,7 @@ header-y += inet_diag.h
 header-y += in.h
 header-y += inotify.h
 header-y += input.h
+header-y += input-event-codes.h
 header-y += in_route.h
 header-y += ioctl.h
 header-y += ip6_tunnel.h
-- 
2.5.0

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

Hi Dmitry,

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

In file included from samples/hidraw/hid-example.c:14:0:
./usr/include/linux/input.h:17:31: fatal error: input-event-codes.h: No such file or directory

Caused by commit

  d794709c3916 ("Input: Add input-event-codes header file")

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

Hi Stephen,

On July 23, 2015 6:49:36 PM PDT, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi Dmitry,
>
>After merging the input tree, today's linux-next build (arm
>multi_v7_defconfig) failed like this:
>
>drivers/input/keyboard/samsung-keypad.c: In function
>'samsung_keypad_parse_dt':
>drivers/input/keyboard/samsung-keypad.c:302:40: error: 'pp' undeclared
>(first use in this function)
>  pdata->wakeup = of_property_read_bool(pp, "wakeup-source") ||
>                                        ^
>
>Caused by commit
>
>7e324dd6cc21 ("Input: samsung-keypad - change name of wakeup property")

Sorry about this, you managed to grab the tree in the couple of hours while the bad commit was there, it should all be corrected now.

Thanks.

-- 
Dmitry

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

Hi Dmitry,

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

drivers/input/keyboard/samsung-keypad.c: In function 'samsung_keypad_parse_dt':
drivers/input/keyboard/samsung-keypad.c:302:40: error: 'pp' undeclared (first use in this function)
  pdata->wakeup = of_property_read_bool(pp, "wakeup-source") ||
                                        ^

Caused by commit

  7e324dd6cc21 ("Input: samsung-keypad - change name of wakeup property")

Please at least build test these changes :-(

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

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

Hi Stephen,

On Fri, Oct 05, 2012 at 11:47:12AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/input/tablet/wacom_sys.c: In function 'wacom_get_sibling':
> drivers/input/tablet/wacom_sys.c:643:23: error: 'struct usb_device' has no member named 'children'
> 
> Caused by commit 316f18bba311 ("Input: wacom - handle split-sensor
> devices with internal hubs") interacting with commit ff823c79a5c3 ("usb:
> move children to struct usb_port") that is now in Linus' tree.
> 
> I have used the input tree from next-20121004 for today.

Sorry about this. I pulled the offending patch and another one depending
on it out of my next branch pending my next pull from mainline.

Thanks.

-- 
Dmitry

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

Hi Dmitry,

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

drivers/input/tablet/wacom_sys.c: In function 'wacom_get_sibling':
drivers/input/tablet/wacom_sys.c:643:23: error: 'struct usb_device' has no member named 'children'

Caused by commit 316f18bba311 ("Input: wacom - handle split-sensor
devices with internal hubs") interacting with commit ff823c79a5c3 ("usb:
move children to struct usb_port") that is now in Linus' tree.

I have used the input tree from next-20121004 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the input tree

[John Stultz]

On Tue, 2012-01-24 at 14:25 +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> After merging the input tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".ktime_get_monotonic_offset" [drivers/input/evdev.ko] undefined!
> 
> Caused by commit 04f2c50e5fd8 ("Input: add infrastructure for selecting
> clockid for event time stamps").
> 
> I have used the input tree from next-20120123 for today.

Huh.

ktime_get_monotonic_offset is a timekeeping core interface, defined
along with ktime_get 

Hrmmm.. Ah. I suspect this will fix it:


Export ktime_get_monotonic_offset for evdev

Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 9cf6bbb..9781add 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1230,6 +1230,8 @@ ktime_t ktime_get_monotonic_offset(void)
 	} while (read_seqretry(&xtime_lock, seq));
 	return timespec_to_ktime(wtom);
 }
+EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset);
+
 
 /**
  * xtime_update() - advances the timekeeping infrastructure

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

Hi Stephen,

On Tue, Jan 24, 2012 at 02:25:16PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> After merging the input tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> ERROR: ".ktime_get_monotonic_offset" [drivers/input/evdev.ko] undefined!
> 
> Caused by commit 04f2c50e5fd8 ("Input: add infrastructure for selecting
> clockid for event time stamps").
> 
> I have used the input tree from next-20120123 for today.

Sorry about that, I will drop the offending commit for time being.

Thanks.

-- 
Dmitry

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

Hi Dmitry,

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

ERROR: ".ktime_get_monotonic_offset" [drivers/input/evdev.ko] undefined!

Caused by commit 04f2c50e5fd8 ("Input: add infrastructure for selecting
clockid for event time stamps").

I have used the input tree from next-20120123 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the input tree

[Dmitry Torokhov]

Hi Stephen,

On Thu, Aug 19, 2010 at 11:35:45AM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> After merging the input tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/usb/serial/ssu100.c:599: warning: passing argument 1 of 'usb_serial_handle_sysrq_char' from incompatible pointer type
> include/linux/usb/serial.h:345: note: expected 'struct usb_serial_port *' but argument is of type 'struct tty_struct *'
> drivers/usb/serial/ssu100.c:599: warning: passing argument 2 of 'usb_serial_handle_sysrq_char' makes integer from pointer without a cast
> include/linux/usb/serial.h:345: note: expected 'unsigned int' but argument is of type 'struct usb_serial_port *'
> drivers/usb/serial/ssu100.c:599: error: too many arguments to function 'usb_serial_handle_sysrq_char'
> 
> Caused by commit 0c870dc9828fee03abd60b441f9025a1b4e3d3e6 ("USB: drop tty
> argument from usb_serial_handle_sysrq_char()") interacting with
> 52af954599396e5945a895035525c703f2761b20 ("USB: add USB serial ssu100
> driver") from Linus' tree.
> 
> I have used the input tree from next-20100818 for today.

I updated the patch in question to include this new driver as well,
thank you for letting me know.

-- 
Dmitry

linux-next: build failure after merge of the input tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

Hi Dmitry,

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

drivers/usb/serial/ssu100.c:599: warning: passing argument 1 of 'usb_serial_handle_sysrq_char' from incompatible pointer type
include/linux/usb/serial.h:345: note: expected 'struct usb_serial_port *' but argument is of type 'struct tty_struct *'
drivers/usb/serial/ssu100.c:599: warning: passing argument 2 of 'usb_serial_handle_sysrq_char' makes integer from pointer without a cast
include/linux/usb/serial.h:345: note: expected 'unsigned int' but argument is of type 'struct usb_serial_port *'
drivers/usb/serial/ssu100.c:599: error: too many arguments to function 'usb_serial_handle_sysrq_char'

Caused by commit 0c870dc9828fee03abd60b441f9025a1b4e3d3e6 ("USB: drop tty
argument from usb_serial_handle_sysrq_char()") interacting with
52af954599396e5945a895035525c703f2761b20 ("USB: add USB serial ssu100
driver") from Linus' tree.

I have used the input tree from next-20100818 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]