Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: build failure after merge of the usb tree
@ 2021-04-12 11:36 Stephen Rothwell
  2021-04-12 12:35 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2021-04-12 11:36 UTC (permalink / raw)
  To: Greg KH
  Cc: Heikki Krogerus, Linux Kernel Mailing List, Linux Next Mailing List


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

Hi all,

After merging the usb tree, today's linux-next build (x86_64 almodconfig
modules_install) failed like this:

depmod: ERROR: Cycle detected: usbcore -> typec -> usbcore
depmod: ERROR: Found 2 modules in dependency cycles!

Caused by commit

  63cd78617350 ("usb: Link the ports to the connectors they are attached to")

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2021-04-12 11:36 linux-next: build failure after merge of the usb tree Stephen Rothwell
@ 2021-04-12 12:35 ` Greg KH
  2021-04-12 12:41   ` Heikki Krogerus
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2021-04-12 12:35 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Heikki Krogerus, Linux Kernel Mailing List, Linux Next Mailing List

On Mon, Apr 12, 2021 at 09:36:55PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the usb tree, today's linux-next build (x86_64 almodconfig
> modules_install) failed like this:
> 
> depmod: ERROR: Cycle detected: usbcore -> typec -> usbcore
> depmod: ERROR: Found 2 modules in dependency cycles!
> 
> Caused by commit
> 
>   63cd78617350 ("usb: Link the ports to the connectors they are attached to")
> 
> I have reverted that commit for today.

Ugh, good catch, odd that 0-day didn't catch that :(

I'll go revert it in my tree as well.  Heikki, can you send a fixed up
version when you get a chance?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2021-04-12 12:35 ` Greg KH
@ 2021-04-12 12:41   ` Heikki Krogerus
  0 siblings, 0 replies; 64+ messages in thread
From: Heikki Krogerus @ 2021-04-12 12:41 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

On Mon, Apr 12, 2021 at 02:35:44PM +0200, Greg KH wrote:
> On Mon, Apr 12, 2021 at 09:36:55PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 almodconfig
> > modules_install) failed like this:
> > 
> > depmod: ERROR: Cycle detected: usbcore -> typec -> usbcore
> > depmod: ERROR: Found 2 modules in dependency cycles!
> > 
> > Caused by commit
> > 
> >   63cd78617350 ("usb: Link the ports to the connectors they are attached to")
> > 
> > I have reverted that commit for today.
> 
> Ugh, good catch, odd that 0-day didn't catch that :(
> 
> I'll go revert it in my tree as well.  Heikki, can you send a fixed up
> version when you get a chance?

Sure thing.

thanks,

-- 
heikki

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2020-03-16 13:28   ` Greg KH
@ 2020-03-16 13:44     ` Thierry Reding
  0 siblings, 0 replies; 64+ messages in thread
From: Thierry Reding @ 2020-03-16 13:44 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Colin Cross, Olof Johansson, Thierry Reding,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Nagarjuna Kristam, Heikki Krogerus


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

On Mon, Mar 16, 2020 at 02:28:50PM +0100, Greg KH wrote:
> On Mon, Mar 16, 2020 at 12:30:12PM +0100, Thierry Reding wrote:
> > On Mon, Mar 16, 2020 at 02:10:04PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > After merging the usb tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > > 
> > > drivers/phy/tegra/xusb.c: In function 'tegra_xusb_setup_usb_role_switch':
> > > drivers/phy/tegra/xusb.c:641:10: error: initialization of 'int (*)(struct usb_role_switch *, enum usb_role)' from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types]
> > >   641 |   .set = tegra_xusb_role_sw_set,
> > >       |          ^~~~~~~~~~~~~~~~~~~~~~
> > > drivers/phy/tegra/xusb.c:641:10: note: (near initialization for 'role_sx_desc.set')
> > > 
> > > Caused by commit
> > > 
> > >   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> > > 
> > > interacting with commit
> > > 
> > >   5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
> > > 
> > > from the tegra tree.
> > > 
> > > I have added this merge fix patch (which may need more work):
> > > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Mon, 16 Mar 2020 14:04:20 +1100
> > > Subject: [PATCH] phy: tegra: fix up for set_role API change
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/phy/tegra/xusb.c | 7 ++++---
> > >  1 file changed, 4 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
> > > index d907f03bf282..25223c350e66 100644
> > > --- a/drivers/phy/tegra/xusb.c
> > > +++ b/drivers/phy/tegra/xusb.c
> > > @@ -596,11 +596,12 @@ static void tegra_xusb_usb_phy_work(struct work_struct *work)
> > >  	atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
> > >  }
> > >  
> > > -static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
> > > +static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
> > > +				  enum usb_role role)
> > >  {
> > > -	struct tegra_xusb_port *port = dev_get_drvdata(dev);
> > > +	struct tegra_xusb_port *port = usb_role_switch_get_drvdata(sw);
> > >  
> > > -	dev_dbg(dev, "%s(): role %s\n", __func__, usb_roles[role]);
> > > +	dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
> > >  
> > >  	schedule_work(&port->usb_phy_work);
> > >  
> > > -- 
> > > 2.25.0
> > 
> > I can rebase the branch that contains this commit on top of Greg's USB
> > tree. These are a dependency for the UDC and host driver changes that I
> > have sent as a pull request to Greg, so this should all work out nicely.
> 
> Ok, should I take your pull request then, or not?

Let me rebase things first and I'll send an updated pull request. Please
ignore the one I sent on Friday.

> > Greg, I recall that you've said in the past that you don't rebase your
> > trees. Is that still the case for the USB tree? Do you have a preference
> > what to base my branch on? The earliest of your USB tree that contains
> > all patches needed to make this compile? Or the latest?
> 
> Yes, I do not rebase my tree.  Please work off of the usb-next branch,
> and you can send me a pull request based anywhere, it should work just
> fine :)

Great, will do.

Thanks,
Thierry

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2020-03-16 11:30 ` Thierry Reding
@ 2020-03-16 13:28   ` Greg KH
  2020-03-16 13:44     ` Thierry Reding
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2020-03-16 13:28 UTC (permalink / raw)
  To: Thierry Reding
  Cc: Stephen Rothwell, Colin Cross, Olof Johansson, Thierry Reding,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Nagarjuna Kristam, Heikki Krogerus

On Mon, Mar 16, 2020 at 12:30:12PM +0100, Thierry Reding wrote:
> On Mon, Mar 16, 2020 at 02:10:04PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the usb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/phy/tegra/xusb.c: In function 'tegra_xusb_setup_usb_role_switch':
> > drivers/phy/tegra/xusb.c:641:10: error: initialization of 'int (*)(struct usb_role_switch *, enum usb_role)' from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types]
> >   641 |   .set = tegra_xusb_role_sw_set,
> >       |          ^~~~~~~~~~~~~~~~~~~~~~
> > drivers/phy/tegra/xusb.c:641:10: note: (near initialization for 'role_sx_desc.set')
> > 
> > Caused by commit
> > 
> >   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> > 
> > interacting with commit
> > 
> >   5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
> > 
> > from the tegra tree.
> > 
> > I have added this merge fix patch (which may need more work):
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 16 Mar 2020 14:04:20 +1100
> > Subject: [PATCH] phy: tegra: fix up for set_role API change
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/phy/tegra/xusb.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
> > index d907f03bf282..25223c350e66 100644
> > --- a/drivers/phy/tegra/xusb.c
> > +++ b/drivers/phy/tegra/xusb.c
> > @@ -596,11 +596,12 @@ static void tegra_xusb_usb_phy_work(struct work_struct *work)
> >  	atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
> >  }
> >  
> > -static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
> > +static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
> > +				  enum usb_role role)
> >  {
> > -	struct tegra_xusb_port *port = dev_get_drvdata(dev);
> > +	struct tegra_xusb_port *port = usb_role_switch_get_drvdata(sw);
> >  
> > -	dev_dbg(dev, "%s(): role %s\n", __func__, usb_roles[role]);
> > +	dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
> >  
> >  	schedule_work(&port->usb_phy_work);
> >  
> > -- 
> > 2.25.0
> 
> I can rebase the branch that contains this commit on top of Greg's USB
> tree. These are a dependency for the UDC and host driver changes that I
> have sent as a pull request to Greg, so this should all work out nicely.

Ok, should I take your pull request then, or not?

> Greg, I recall that you've said in the past that you don't rebase your
> trees. Is that still the case for the USB tree? Do you have a preference
> what to base my branch on? The earliest of your USB tree that contains
> all patches needed to make this compile? Or the latest?

Yes, I do not rebase my tree.  Please work off of the usb-next branch,
and you can send me a pull request based anywhere, it should work just
fine :)

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2020-03-16  3:10 Stephen Rothwell
@ 2020-03-16 11:30 ` Thierry Reding
  2020-03-16 13:28   ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Thierry Reding @ 2020-03-16 11:30 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH
  Cc: Colin Cross, Olof Johansson, Thierry Reding,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Nagarjuna Kristam, Heikki Krogerus


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

On Mon, Mar 16, 2020 at 02:10:04PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/phy/tegra/xusb.c: In function 'tegra_xusb_setup_usb_role_switch':
> drivers/phy/tegra/xusb.c:641:10: error: initialization of 'int (*)(struct usb_role_switch *, enum usb_role)' from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types]
>   641 |   .set = tegra_xusb_role_sw_set,
>       |          ^~~~~~~~~~~~~~~~~~~~~~
> drivers/phy/tegra/xusb.c:641:10: note: (near initialization for 'role_sx_desc.set')
> 
> Caused by commit
> 
>   bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> 
> interacting with commit
> 
>   5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")
> 
> from the tegra tree.
> 
> I have added this merge fix patch (which may need more work):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Mar 2020 14:04:20 +1100
> Subject: [PATCH] phy: tegra: fix up for set_role API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/phy/tegra/xusb.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
> index d907f03bf282..25223c350e66 100644
> --- a/drivers/phy/tegra/xusb.c
> +++ b/drivers/phy/tegra/xusb.c
> @@ -596,11 +596,12 @@ static void tegra_xusb_usb_phy_work(struct work_struct *work)
>  	atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
>  }
>  
> -static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
> +static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
> +				  enum usb_role role)
>  {
> -	struct tegra_xusb_port *port = dev_get_drvdata(dev);
> +	struct tegra_xusb_port *port = usb_role_switch_get_drvdata(sw);
>  
> -	dev_dbg(dev, "%s(): role %s\n", __func__, usb_roles[role]);
> +	dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
>  
>  	schedule_work(&port->usb_phy_work);
>  
> -- 
> 2.25.0

I can rebase the branch that contains this commit on top of Greg's USB
tree. These are a dependency for the UDC and host driver changes that I
have sent as a pull request to Greg, so this should all work out nicely.

Greg, I recall that you've said in the past that you don't rebase your
trees. Is that still the case for the USB tree? Do you have a preference
what to base my branch on? The earliest of your USB tree that contains
all patches needed to make this compile? Or the latest?

Thierry

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2020-03-16  3:10 Stephen Rothwell
  2020-03-16 11:30 ` Thierry Reding
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2020-03-16  3:10 UTC (permalink / raw)
  To: Greg KH, Colin Cross, Olof Johansson, Thierry Reding
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Nagarjuna Kristam, Heikki Krogerus


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

Hi all,

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

drivers/phy/tegra/xusb.c: In function 'tegra_xusb_setup_usb_role_switch':
drivers/phy/tegra/xusb.c:641:10: error: initialization of 'int (*)(struct usb_role_switch *, enum usb_role)' from incompatible pointer type 'int (*)(struct device *, enum usb_role)' [-Werror=incompatible-pointer-types]
  641 |   .set = tegra_xusb_role_sw_set,
      |          ^~~~~~~~~~~~~~~~~~~~~~
drivers/phy/tegra/xusb.c:641:10: note: (near initialization for 'role_sx_desc.set')

Caused by commit

  bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")

interacting with commit

  5a00c7c7604f ("phy: tegra: xusb: Add usb-role-switch support")

from the tegra tree.

I have added this merge fix patch (which may need more work):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Mar 2020 14:04:20 +1100
Subject: [PATCH] phy: tegra: fix up for set_role API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/phy/tegra/xusb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/tegra/xusb.c b/drivers/phy/tegra/xusb.c
index d907f03bf282..25223c350e66 100644
--- a/drivers/phy/tegra/xusb.c
+++ b/drivers/phy/tegra/xusb.c
@@ -596,11 +596,12 @@ static void tegra_xusb_usb_phy_work(struct work_struct *work)
 	atomic_notifier_call_chain(&port->usb_phy.notifier, 0, &port->usb_phy);
 }
 
-static int tegra_xusb_role_sw_set(struct device *dev, enum usb_role role)
+static int tegra_xusb_role_sw_set(struct usb_role_switch *sw,
+				  enum usb_role role)
 {
-	struct tegra_xusb_port *port = dev_get_drvdata(dev);
+	struct tegra_xusb_port *port = usb_role_switch_get_drvdata(sw);
 
-	dev_dbg(dev, "%s(): role %s\n", __func__, usb_roles[role]);
+	dev_dbg(&port->dev, "%s(): role %s\n", __func__, usb_roles[role]);
 
 	schedule_work(&port->usb_phy_work);
 
-- 
2.25.0

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2019-06-19  6:43 Stephen Rothwell
@ 2019-06-19 14:56 ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2019-06-19 14:56 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Dmitry Torokhov, Masahiro Yamada, Alan Stern

On Wed, Jun 19, 2019 at 04:43:51PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from usr/include/linux/usbdevice_fs.hdrtest.c:1:
> ./usr/include/linux/usbdevice_fs.h:88:2: error: unknown type name 'u8'
>   u8 num_ports;  /* Number of ports the device is connected */
>   ^~
> ./usr/include/linux/usbdevice_fs.h:92:2: error: unknown type name 'u8'
>   u8 ports[7];  /* List of ports on the way from the root  */
>   ^~
> 
> Caused by commit
> 
>   6d101f24f1dd ("USB: add usbfs ioctl to retrieve the connection parameters")
> 
> Presumably exposed by commit
> 
>   b91976b7c0e3 ("kbuild: compile-test UAPI headers to ensure they are self-contained")
> 
> from the kbuild tree.
> 
> I have added this patch for now:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 19 Jun 2019 16:36:16 +1000
> Subject: [PATCH] USB: fix types in uapi include
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/uapi/linux/usbdevice_fs.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Ah, good catch, sorry about that.  Now applied.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2019-06-19  6:43 Stephen Rothwell
  2019-06-19 14:56 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2019-06-19  6:43 UTC (permalink / raw)
  To: Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Dmitry Torokhov, Masahiro Yamada, Alan Stern


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

Hi all,

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

In file included from usr/include/linux/usbdevice_fs.hdrtest.c:1:
./usr/include/linux/usbdevice_fs.h:88:2: error: unknown type name 'u8'
  u8 num_ports;  /* Number of ports the device is connected */
  ^~
./usr/include/linux/usbdevice_fs.h:92:2: error: unknown type name 'u8'
  u8 ports[7];  /* List of ports on the way from the root  */
  ^~

Caused by commit

  6d101f24f1dd ("USB: add usbfs ioctl to retrieve the connection parameters")

Presumably exposed by commit

  b91976b7c0e3 ("kbuild: compile-test UAPI headers to ensure they are self-contained")

from the kbuild tree.

I have added this patch for now:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2019 16:36:16 +1000
Subject: [PATCH] USB: fix types in uapi include

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/uapi/linux/usbdevice_fs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/usbdevice_fs.h b/include/uapi/linux/usbdevice_fs.h
index 4b267fe3776e..78efe870c2b7 100644
--- a/include/uapi/linux/usbdevice_fs.h
+++ b/include/uapi/linux/usbdevice_fs.h
@@ -85,11 +85,11 @@ struct usbdevfs_conninfo_ex {
 				/* kernel, the device is connected to.     */
 	__u32 devnum;           /* Device address on the bus.              */
 	__u32 speed;		/* USB_SPEED_* constants from ch9.h        */
-	u8 num_ports;		/* Number of ports the device is connected */
+	__u8 num_ports;		/* Number of ports the device is connected */
 				/* to on the way to the root hub. It may   */
 				/* be bigger than size of 'ports' array so */
 				/* userspace can detect overflows.         */
-	u8 ports[7];		/* List of ports on the way from the root  */
+	__u8 ports[7];		/* List of ports on the way from the root  */
 				/* hub to the device. Current limit in     */
 				/* USB specification is 7 tiers (root hub, */
 				/* 5 intermediate hubs, device), which     */
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-12-02 18:12 ` Greg KH
@ 2014-12-03  5:57   ` Kishon Vijay Abraham I
  0 siblings, 0 replies; 64+ messages in thread
From: Kishon Vijay Abraham I @ 2014-12-03  5:57 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell, Heikki Krogerus; +Cc: linux-next, linux-kernel

Greg,

On Tuesday 02 December 2014 11:42 PM, Greg KH wrote:
> On Mon, Dec 01, 2014 at 07:19:23PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
>>  struct phy_consumer consumers[] = {
>>                      ^
>>
>> Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").
>>
>> I have used the usb tree from next-20141128 for today.
> 
> Ick, Heikki and Kishon, do you want me to just revert this patch?  How
> did you test it?

I've resent the patch "arm: omap3: twl: remove usb phy init data" which is
needed to get rid of this error.

This patch was part of the original series sent by Heikki but I couldn't merge
it since I didn't get Ack from tony since it touched arch/arm/mach-omap2/ file.
And I clearly missed the build failure report from fengguang. Sorry.

Thanks
Kishon

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-12-01  8:19 Stephen Rothwell
@ 2014-12-02 18:12 ` Greg KH
  2014-12-03  5:57   ` Kishon Vijay Abraham I
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2014-12-02 18:12 UTC (permalink / raw)
  To: Stephen Rothwell, Heikki Krogerus, Kishon Vijay Abraham I
  Cc: linux-next, linux-kernel

On Mon, Dec 01, 2014 at 07:19:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
>  struct phy_consumer consumers[] = {
>                      ^
> 
> Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").
> 
> I have used the usb tree from next-20141128 for today.

Ick, Heikki and Kishon, do you want me to just revert this patch?  How
did you test it?

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2014-12-01  8:19 Stephen Rothwell
  2014-12-02 18:12 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2014-12-01  8:19 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Heikki Krogerus, Kishon Vijay Abraham I


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

Hi Greg,

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

arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
 struct phy_consumer consumers[] = {
                     ^

Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-08-06  1:39   ` Stephen Rothwell
@ 2014-08-06  4:04     ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2014-08-06  4:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
	linux-kernel, Pratyush Anand, Viresh Kumar, Thierry Reding

On Wed, Aug 06, 2014 at 11:39:35AM +1000, Stephen Rothwell wrote:
> Hi,
> 
> On Thu, 24 Jul 2014 00:44:52 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Thu, Jul 24, 2014 at 05:07:55PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > > 
> > > drivers/phy/phy-spear1310-miphy.c: In function 'spear1310_miphy_probe':
> > > drivers/phy/phy-spear1310-miphy.c:232:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> > >   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
> > >               ^
> > > In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> > > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/phy/phy-spear1310-miphy.c:232:14: error: too few arguments to function 'devm_phy_create'
> > >   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
> > >               ^
> > > In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> > > include/linux/phy/phy.h:164:13: note: declared here
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/phy/phy-spear1340-miphy.c: In function 'spear1340_miphy_probe':
> > > drivers/phy/phy-spear1340-miphy.c:264:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> > >   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
> > >               ^
> > > In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> > > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/phy/phy-spear1340-miphy.c:264:14: error: too few arguments to function 'devm_phy_create'
> > >   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
> > >               ^
> > > In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> > > include/linux/phy/phy.h:164:13: note: declared here
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > 
> > > Caused by commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to
> > > PHY and not of PHY provider") interacting with commit 64562e99477f
> > > ("phy: Add drivers for PCIe and SATA phy on SPEAr13xx") from the
> > > arm-soc tree.
> > > 
> > > I fixed that up and then got:
> > > 
> > > drivers/pinctrl/pinctrl-tegra-xusb.c: In function 'tegra_xusb_padctl_probe':
> > > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> > >   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
> > >         ^
> > > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: error: too few arguments to function 'devm_phy_create'
> > >   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
> > >         ^
> > > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > > include/linux/phy/phy.h:164:13: note: declared here
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> > >   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
> > >         ^
> > > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: error: too few arguments to function 'devm_phy_create'
> > >   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
> > >         ^
> > > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > > include/linux/phy/phy.h:164:13: note: declared here
> > >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> > >              ^
> > > 
> > > From an interaction with commit dc0a39386687 ("pinctrl: Add NVIDIA
> > > Tegra XUSB pad controller support") from the arm-soc tree.
> > > 
> > > Final merge fix patch:
> > 
> > Ugh, what a mess, sorry about that.  I'll keep this around for if I end
> > up merging with Linus after these other trees get merged.
> 
> Since the usb tree has gone upstream, this merge fix patch is now
> needed when the arm-soc tree is merged.

I'll let the arm developers worry about this :)

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-07-24  7:44 ` Greg KH
@ 2014-08-06  1:39   ` Stephen Rothwell
  2014-08-06  4:04     ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2014-08-06  1:39 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann
  Cc: Greg KH, linux-arm-kernel, linux-next, linux-kernel,
	Pratyush Anand, Viresh Kumar, Thierry Reding


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

Hi,

On Thu, 24 Jul 2014 00:44:52 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Jul 24, 2014 at 05:07:55PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/phy/phy-spear1310-miphy.c: In function 'spear1310_miphy_probe':
> > drivers/phy/phy-spear1310-miphy.c:232:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> >   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
> >               ^
> > In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/phy/phy-spear1310-miphy.c:232:14: error: too few arguments to function 'devm_phy_create'
> >   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
> >               ^
> > In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> > include/linux/phy/phy.h:164:13: note: declared here
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/phy/phy-spear1340-miphy.c: In function 'spear1340_miphy_probe':
> > drivers/phy/phy-spear1340-miphy.c:264:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> >   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
> >               ^
> > In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/phy/phy-spear1340-miphy.c:264:14: error: too few arguments to function 'devm_phy_create'
> >   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
> >               ^
> > In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> > include/linux/phy/phy.h:164:13: note: declared here
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > 
> > Caused by commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to
> > PHY and not of PHY provider") interacting with commit 64562e99477f
> > ("phy: Add drivers for PCIe and SATA phy on SPEAr13xx") from the
> > arm-soc tree.
> > 
> > I fixed that up and then got:
> > 
> > drivers/pinctrl/pinctrl-tegra-xusb.c: In function 'tegra_xusb_padctl_probe':
> > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> >   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
> >         ^
> > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: error: too few arguments to function 'devm_phy_create'
> >   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
> >         ^
> > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > include/linux/phy/phy.h:164:13: note: declared here
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
> >   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
> >         ^
> > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: error: too few arguments to function 'devm_phy_create'
> >   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
> >         ^
> > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> > include/linux/phy/phy.h:164:13: note: declared here
> >  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
> >              ^
> > 
> > From an interaction with commit dc0a39386687 ("pinctrl: Add NVIDIA
> > Tegra XUSB pad controller support") from the arm-soc tree.
> > 
> > Final merge fix patch:
> 
> Ugh, what a mess, sorry about that.  I'll keep this around for if I end
> up merging with Linus after these other trees get merged.

Since the usb tree has gone upstream, this merge fix patch is now
needed when the arm-soc tree is merged.

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-07-24  7:07 Stephen Rothwell
@ 2014-07-24  7:44 ` Greg KH
  2014-08-06  1:39   ` Stephen Rothwell
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2014-07-24  7:44 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-next,
	linux-kernel, Pratyush Anand, Viresh Kumar, Thierry Reding

On Thu, Jul 24, 2014 at 05:07:55PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/phy/phy-spear1310-miphy.c: In function 'spear1310_miphy_probe':
> drivers/phy/phy-spear1310-miphy.c:232:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
>   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
>               ^
> In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/phy/phy-spear1310-miphy.c:232:14: error: too few arguments to function 'devm_phy_create'
>   priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
>               ^
> In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
> include/linux/phy/phy.h:164:13: note: declared here
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/phy/phy-spear1340-miphy.c: In function 'spear1340_miphy_probe':
> drivers/phy/phy-spear1340-miphy.c:264:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
>   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
>               ^
> In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/phy/phy-spear1340-miphy.c:264:14: error: too few arguments to function 'devm_phy_create'
>   priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
>               ^
> In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
> include/linux/phy/phy.h:164:13: note: declared here
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> 
> Caused by commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to
> PHY and not of PHY provider") interacting with commit 64562e99477f
> ("phy: Add drivers for PCIe and SATA phy on SPEAr13xx") from the
> arm-soc tree.
> 
> I fixed that up and then got:
> 
> drivers/pinctrl/pinctrl-tegra-xusb.c: In function 'tegra_xusb_padctl_probe':
> drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
>   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
>         ^
> In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: error: too few arguments to function 'devm_phy_create'
>   phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
>         ^
> In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> include/linux/phy/phy.h:164:13: note: declared here
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
>   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
>         ^
> In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: error: too few arguments to function 'devm_phy_create'
>   phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
>         ^
> In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
> include/linux/phy/phy.h:164:13: note: declared here
>  struct phy *devm_phy_create(struct device *dev, struct device_node *node,
>              ^
> 
> From an interaction with commit dc0a39386687 ("pinctrl: Add NVIDIA
> Tegra XUSB pad controller support") from the arm-soc tree.
> 
> Final merge fix patch:

Ugh, what a mess, sorry about that.  I'll keep this around for if I end
up merging with Linus after these other trees get merged.

thanks for doing this,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2014-07-24  7:07 Stephen Rothwell
  2014-07-24  7:44 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2014-07-24  7:07 UTC (permalink / raw)
  To: Greg KH, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Pratyush Anand, Viresh Kumar, Thierry Reding


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

Hi Greg,

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

drivers/phy/phy-spear1310-miphy.c: In function 'spear1310_miphy_probe':
drivers/phy/phy-spear1310-miphy.c:232:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
  priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
              ^
In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/phy/phy-spear1310-miphy.c:232:14: error: too few arguments to function 'devm_phy_create'
  priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
              ^
In file included from drivers/phy/phy-spear1310-miphy.c:21:0:
include/linux/phy/phy.h:164:13: note: declared here
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/phy/phy-spear1340-miphy.c: In function 'spear1340_miphy_probe':
drivers/phy/phy-spear1340-miphy.c:264:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
  priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
              ^
In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *'
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/phy/phy-spear1340-miphy.c:264:14: error: too few arguments to function 'devm_phy_create'
  priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
              ^
In file included from drivers/phy/phy-spear1340-miphy.c:21:0:
include/linux/phy/phy.h:164:13: note: declared here
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^

Caused by commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to
PHY and not of PHY provider") interacting with commit 64562e99477f
("phy: Add drivers for PCIe and SATA phy on SPEAr13xx") from the
arm-soc tree.

I fixed that up and then got:

drivers/pinctrl/pinctrl-tegra-xusb.c: In function 'tegra_xusb_padctl_probe':
drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
  phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
        ^
In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: error: too few arguments to function 'devm_phy_create'
  phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
        ^
In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
include/linux/phy/phy.h:164:13: note: declared here
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type
  phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
        ^
In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *'
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^
drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: error: too few arguments to function 'devm_phy_create'
  phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
        ^
In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0:
include/linux/phy/phy.h:164:13: note: declared here
 struct phy *devm_phy_create(struct device *dev, struct device_node *node,
             ^

From an interaction with commit dc0a39386687 ("pinctrl: Add NVIDIA
Tegra XUSB pad controller support") from the arm-soc tree.

Final merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Jul 2014 16:55:16 +1000
Subject: [PATCH] phy: fix up for devm_phy_create api change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/phy/phy-spear1310-miphy.c    | 2 +-
 drivers/phy/phy-spear1340-miphy.c    | 2 +-
 drivers/pinctrl/pinctrl-tegra-xusb.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c
index c58c869d57e0..6dcbfcddb372 100644
--- a/drivers/phy/phy-spear1310-miphy.c
+++ b/drivers/phy/phy-spear1310-miphy.c
@@ -229,7 +229,7 @@ static int spear1310_miphy_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL);
+	priv->phy = devm_phy_create(dev, NULL, &spear1310_miphy_ops, NULL);
 	if (IS_ERR(priv->phy)) {
 		dev_err(dev, "failed to create SATA PCIe PHY\n");
 		return PTR_ERR(priv->phy);
diff --git a/drivers/phy/phy-spear1340-miphy.c b/drivers/phy/phy-spear1340-miphy.c
index 8de98adf21c3..7135ba2603b6 100644
--- a/drivers/phy/phy-spear1340-miphy.c
+++ b/drivers/phy/phy-spear1340-miphy.c
@@ -261,7 +261,7 @@ static int spear1340_miphy_probe(struct platform_device *pdev)
 		return PTR_ERR(priv->misc);
 	}
 
-	priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL);
+	priv->phy = devm_phy_create(dev, NULL, &spear1340_miphy_ops, NULL);
 	if (IS_ERR(priv->phy)) {
 		dev_err(dev, "failed to create SATA PCIe PHY\n");
 		return PTR_ERR(priv->phy);
diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c
index 4a7daf577b49..a06620474845 100644
--- a/drivers/pinctrl/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/pinctrl-tegra-xusb.c
@@ -910,7 +910,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
 		goto reset;
 	}
 
-	phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL);
+	phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops, NULL);
 	if (IS_ERR(phy)) {
 		err = PTR_ERR(phy);
 		goto unregister;
@@ -919,7 +919,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
 	padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy;
 	phy_set_drvdata(phy, padctl);
 
-	phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL);
+	phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops, NULL);
 	if (IS_ERR(phy)) {
 		err = PTR_ERR(phy);
 		goto unregister;
-- 
2.0.1

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-05-29 18:18 ` Greg KH
@ 2014-05-29 18:40   ` Dan Williams
  0 siblings, 0 replies; 64+ messages in thread
From: Dan Williams @ 2014-05-29 18:40 UTC (permalink / raw)
  To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel

On Thu, May 29, 2014 at 11:18 AM, Greg KH <greg@kroah.com> wrote:
> On Thu, May 29, 2014 at 07:01:29PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (sparc64 defconfig)
>> failed like this:
>>
>> drivers/usb/core/hub.c: In function 'port_event':
>> drivers/usb/core/hub.c:4853:2: error: implicit declaration of function 'hub_handle_remote_wakeup' [-Werror=implicit-function-declaration]
>>
>> Caused by commits af376a461cf0 ("usb: refactor port handling in
>> hub_events()") and 7e73be227b15 ("usb: hub_handle_remote_wakeup()
>> depends on CONFIG_PM_RUNTIME=y") This build has CONFIG_PM not set ...
>>
>> I have added this fix patch for today (there is probably a better way):
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 29 May 2014 18:55:06 +1000
>> Subject: [PATCH] usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>  drivers/usb/core/hub.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
>> index 5672752bfd2c..879b66e13370 100644
>> --- a/drivers/usb/core/hub.c
>> +++ b/drivers/usb/core/hub.c
>> @@ -3977,6 +3977,12 @@ EXPORT_SYMBOL_GPL(usb_disable_ltm);
>>  void usb_enable_ltm(struct usb_device *udev) { }
>>  EXPORT_SYMBOL_GPL(usb_enable_ltm);
>>
>> +static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
>> +             u16 portstatus, u16 portchange)
>> +{
>> +     return 0;
>> +}
>> +
>>  #endif       /* CONFIG_PM */
>>
>>
>
> Dan, any objection to me taking this patch?
>
> thanks,
>

None.  That's identical to the one I have in my queue.  I was only
holding off to send it along with the pending updates to patch 18 and
19 per Alan's concerns.

Acked-by: Dan Williams <dan.j.williams@intel.com>

Side note, as you mentioned before, git trees are horrible for review
purposes, but they are good for sanity checking.  In retrospect I
should have kept this series in a kbuild-robot visible branch.

--
Dan

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2014-05-29  9:01 Stephen Rothwell
@ 2014-05-29 18:18 ` Greg KH
  2014-05-29 18:40   ` Dan Williams
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2014-05-29 18:18 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Dan Williams

On Thu, May 29, 2014 at 07:01:29PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (sparc64 defconfig)
> failed like this:
> 
> drivers/usb/core/hub.c: In function 'port_event':
> drivers/usb/core/hub.c:4853:2: error: implicit declaration of function 'hub_handle_remote_wakeup' [-Werror=implicit-function-declaration]
> 
> Caused by commits af376a461cf0 ("usb: refactor port handling in
> hub_events()") and 7e73be227b15 ("usb: hub_handle_remote_wakeup()
> depends on CONFIG_PM_RUNTIME=y") This build has CONFIG_PM not set ...
> 
> I have added this fix patch for today (there is probably a better way):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 May 2014 18:55:06 +1000
> Subject: [PATCH] usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/usb/core/hub.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 5672752bfd2c..879b66e13370 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c
> @@ -3977,6 +3977,12 @@ EXPORT_SYMBOL_GPL(usb_disable_ltm);
>  void usb_enable_ltm(struct usb_device *udev) { }
>  EXPORT_SYMBOL_GPL(usb_enable_ltm);
>  
> +static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
> +		u16 portstatus, u16 portchange)
> +{
> +	return 0;
> +}
> +
>  #endif	/* CONFIG_PM */
>  
>  

Dan, any objection to me taking this patch?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2014-05-29  9:01 Stephen Rothwell
  2014-05-29 18:18 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2014-05-29  9:01 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Dan Williams


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

Hi Greg,

After merging the usb tree, today's linux-next build (sparc64 defconfig)
failed like this:

drivers/usb/core/hub.c: In function 'port_event':
drivers/usb/core/hub.c:4853:2: error: implicit declaration of function 'hub_handle_remote_wakeup' [-Werror=implicit-function-declaration]

Caused by commits af376a461cf0 ("usb: refactor port handling in
hub_events()") and 7e73be227b15 ("usb: hub_handle_remote_wakeup()
depends on CONFIG_PM_RUNTIME=y") This build has CONFIG_PM not set ...

I have added this fix patch for today (there is probably a better way):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 May 2014 18:55:06 +1000
Subject: [PATCH] usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/core/hub.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5672752bfd2c..879b66e13370 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3977,6 +3977,12 @@ EXPORT_SYMBOL_GPL(usb_disable_ltm);
 void usb_enable_ltm(struct usb_device *udev) { }
 EXPORT_SYMBOL_GPL(usb_enable_ltm);
 
+static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
+		u16 portstatus, u16 portchange)
+{
+	return 0;
+}
+
 #endif	/* CONFIG_PM */
 
 
-- 
2.0.0

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-04-18  6:05 Stephen Rothwell
@ 2013-04-18 16:06 ` Joe Perches
  0 siblings, 0 replies; 64+ messages in thread
From: Joe Perches @ 2013-04-18 16:06 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel

On Thu, 2013-04-18 at 16:05 +1000, Stephen Rothwell wrote:
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-usbat.ko] undefined!
[...]
> Caused by commit 75b9130e8af6 ("usb: storage: Add usb_stor_dbg, reduce
> object size").  Please build test such infrastructure patches with and
> without MODULES ...
> 
> I have used the usb tree from next-20130417 for today.

Sorry 'bout that.

I did compilation allyesconfig and allmodconfig with
and without CONFIG_USB_STORAGE_VERBOSE and made
.ko's for that directory only but not a full link.

Looks like it needs EXPORT_SYMBOL_GPL(usb_stor_dbg) in
debug.c.  It takes me quite a while to do a complete
allmodconfig build, but I'll check.

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2013-04-18  6:05 Stephen Rothwell
  2013-04-18 16:06 ` Joe Perches
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2013-04-18  6:05 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Joe Perches


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

Hi Greg,

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

ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-usbat.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-sddr55.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-sddr09.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-realtek.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-karma.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-jumpshot.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-isd200.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-freecom.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-eneub6250.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-datafab.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-cypress.ko] undefined!
ERROR: "usb_stor_dbg" [drivers/usb/storage/ums-alauda.ko] undefined!

Caused by commit 75b9130e8af6 ("usb: storage: Add usb_stor_dbg, reduce
object size").  Please build test such infrastructure patches with and
without MODULES ...

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-03-27  3:41 Stephen Rothwell
  2013-03-27  3:51 ` Ming Lei
@ 2013-03-28 18:04 ` Greg KH
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2013-03-28 18:04 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Johan Hovold, Ming Lei

On Wed, Mar 27, 2013 at 02:41:34PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/serial/usb-serial.c: In function 'usb_serial_probe':
> drivers/usb/serial/usb-serial.c:887:3: error: 'struct usb_serial_port' has no member named 'delta_msr_wait'
> 
> Caused by commit eba0e3c3a0ba ("USB: serial: fix hang when opening port")
> fro the usb.current tree interacting with commit 53ab34dc50ad ("USB:
> serial: remove unused MSR-wait queue") from the usb tree.
> 
> I have reverted the commit from usb.current on the assumption that the
> problem it solves has been, or will be, solved some other way.

I've now fixed this in my tree, so all should be good.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-03-27  3:51 ` Ming Lei
@ 2013-03-27  4:20   ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2013-03-27  4:20 UTC (permalink / raw)
  To: Ming Lei; +Cc: Stephen Rothwell, linux-next, linux-kernel, Johan Hovold

On Wed, Mar 27, 2013 at 11:51:41AM +0800, Ming Lei wrote:
> Hi,
> 
> On Wed, Mar 27, 2013 at 11:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> >
> > I have reverted the commit from usb.current on the assumption that the
> > problem it solves has been, or will be, solved some other way.
> 
> The commit is needed in 3.9 linus tree and stable tree,  but for next
> tree or 3.10,
> a revert commit is required.
> 
> We know it is a problem, sorry, :-(

Yeah, sorry about that, I'll fix this up tomorrow when I merge the trees
together and resolve the conflict.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-03-27  3:41 Stephen Rothwell
@ 2013-03-27  3:51 ` Ming Lei
  2013-03-27  4:20   ` Greg KH
  2013-03-28 18:04 ` Greg KH
  1 sibling, 1 reply; 64+ messages in thread
From: Ming Lei @ 2013-03-27  3:51 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Johan Hovold

Hi,

On Wed, Mar 27, 2013 at 11:41 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>
> I have reverted the commit from usb.current on the assumption that the
> problem it solves has been, or will be, solved some other way.

The commit is needed in 3.9 linus tree and stable tree,  but for next
tree or 3.10,
a revert commit is required.

We know it is a problem, sorry, :-(


Thanks,
--
Ming Lei

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2013-03-27  3:41 Stephen Rothwell
  2013-03-27  3:51 ` Ming Lei
  2013-03-28 18:04 ` Greg KH
  0 siblings, 2 replies; 64+ messages in thread
From: Stephen Rothwell @ 2013-03-27  3:41 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Johan Hovold, Ming Lei


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

Hi Greg,

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

drivers/usb/serial/usb-serial.c: In function 'usb_serial_probe':
drivers/usb/serial/usb-serial.c:887:3: error: 'struct usb_serial_port' has no member named 'delta_msr_wait'

Caused by commit eba0e3c3a0ba ("USB: serial: fix hang when opening port")
fro the usb.current tree interacting with commit 53ab34dc50ad ("USB:
serial: remove unused MSR-wait queue") from the usb tree.

I have reverted the commit from usb.current on the assumption that the
problem it solves has been, or will be, solved some other way.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-01-29 13:51       ` Lan, Tianyu
@ 2013-01-29 14:59         ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2013-01-29 14:59 UTC (permalink / raw)
  To: Lan, Tianyu; +Cc: Stephen Rothwell, linux-next, linux-kernel

On Tue, Jan 29, 2013 at 01:51:34PM +0000, Lan, Tianyu wrote:
> Hi greg:
> 	My pleasure. I have sent the patch to you and usb mailist yesterday.
> http://marc.info/?l=linux-usb&m=135939249906217&w=2
> 	So please have a check. 

Ah, got it, sorry, I missed it in my large "todo" mbox.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* RE: linux-next: build failure after merge of the usb tree
  2013-01-29 13:41     ` Greg KH
@ 2013-01-29 13:51       ` Lan, Tianyu
  2013-01-29 14:59         ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Lan, Tianyu @ 2013-01-29 13:51 UTC (permalink / raw)
  To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel

Hi greg:
	My pleasure. I have sent the patch to you and usb mailist yesterday.
http://marc.info/?l=linux-usb&m=135939249906217&w=2
	So please have a check. 

Best Regards 
Tianyu Lan 


-----Original Message-----
From: Greg KH [mailto:gregkh@linuxfoundation.org] 
Sent: Tuesday, January 29, 2013 9:42 PM
To: Lan, Tianyu
Cc: Stephen Rothwell; linux-next@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the usb tree

On Mon, Jan 28, 2013 at 04:03:07PM +0000, Lan, Tianyu wrote:
> I just check the commit 88bb965ed711 can not git revert smoothly. I 
> will do it and send a revert patch.

Please do so, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-01-28 16:03   ` Lan, Tianyu
@ 2013-01-29 13:41     ` Greg KH
  2013-01-29 13:51       ` Lan, Tianyu
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2013-01-29 13:41 UTC (permalink / raw)
  To: Lan, Tianyu; +Cc: Stephen Rothwell, linux-next, linux-kernel

On Mon, Jan 28, 2013 at 04:03:07PM +0000, Lan, Tianyu wrote:
> I just check the commit 88bb965ed711 can not git revert smoothly. I will do it
> and send a revert patch.

Please do so, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* RE: linux-next: build failure after merge of the usb tree
  2013-01-28 14:45 ` Greg KH
  2013-01-28 14:50   ` Lan Tianyu
  2013-01-28 15:28   ` Lan Tianyu
@ 2013-01-28 16:03   ` Lan, Tianyu
  2013-01-29 13:41     ` Greg KH
  2 siblings, 1 reply; 64+ messages in thread
From: Lan, Tianyu @ 2013-01-28 16:03 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell; +Cc: linux-next, linux-kernel

I just check the commit 88bb965ed711 can not git revert smoothly. I will do it
and send a revert patch.

Best Regards 
Tianyu Lan 


-----Original Message-----
From: Greg KH [mailto:gregkh@linuxfoundation.org] 
Sent: Monday, January 28, 2013 10:45 PM
To: Stephen Rothwell
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Lan, Tianyu
Subject: Re: linux-next: build failure after merge of the usb tree

On Mon, Jan 28, 2013 at 09:46:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 
> allmodconfig) failed like this:
> 
> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_register_power_resources':
> drivers/usb/core/usb-acpi.c:226:2: error: implicit declaration of 
> function 'acpi_power_resource_register_device' 
> [-Werror=implicit-function-declaration]
> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_unregister_power_resources':
> drivers/usb/core/usb-acpi.c:234:3: error: implicit declaration of 
> function 'acpi_power_resource_unregister_device' 
> [-Werror=implicit-function-declaration]
> 
> Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power 
> resources").
> 
> I have used the usb tree from next-20130125 for today.

Lan, please send me a patch to resolve this issue.

Stephen, sorry for the breakage.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-01-28 14:45 ` Greg KH
  2013-01-28 14:50   ` Lan Tianyu
@ 2013-01-28 15:28   ` Lan Tianyu
  2013-01-28 16:03   ` Lan, Tianyu
  2 siblings, 0 replies; 64+ messages in thread
From: Lan Tianyu @ 2013-01-28 15:28 UTC (permalink / raw)
  To: Greg KH; +Cc: Stephen Rothwell, linux-next, linux-kernel

On 2013/1/28 22:45, Greg KH wrote:
> On Mon, Jan 28, 2013 at 09:46:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_register_power_resources':
>> drivers/usb/core/usb-acpi.c:226:2: error: implicit declaration of function 'acpi_power_resource_register_device' [-Werror=implicit-function-declaration]
>> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_unregister_power_resources':
>> drivers/usb/core/usb-acpi.c:234:3: error: implicit declaration of function 'acpi_power_resource_unregister_device' [-Werror=implicit-function-declaration]
>>
>> Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power
>> resources").
>>
>> I have used the usb tree from next-20130125 for today.
>
> Lan, please send me a patch to resolve this issue.
Hi Greg:
	The cause is that these two routines are replaced with two new routines:
acpi_dev_pm_add_dependent() and acpi_dev_pm_remove_dependent() in the linux-next
branch of linux-pm tree. So this error doesn't take place in the usb-next tree.
	One solution I can think of is that bother you to revert the patch and
I will send new patch with new routines after 3.9 merge window. This will not
affect other functions. Does this make sense? Sorry again.

>
> Stephen, sorry for the breakage.
>
> thanks,
>
> greg k-h
>

-- 
Best Regards
Tianyu Lan
linux kernel enabling team

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-01-28 14:45 ` Greg KH
@ 2013-01-28 14:50   ` Lan Tianyu
  2013-01-28 15:28   ` Lan Tianyu
  2013-01-28 16:03   ` Lan, Tianyu
  2 siblings, 0 replies; 64+ messages in thread
From: Lan Tianyu @ 2013-01-28 14:50 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell; +Cc: linux-next, linux-kernel

On 2013/1/28 22:45, Greg KH wrote:
> On Mon, Jan 28, 2013 at 09:46:44PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_register_power_resources':
>> drivers/usb/core/usb-acpi.c:226:2: error: implicit declaration of function 'acpi_power_resource_register_device' [-Werror=implicit-function-declaration]
>> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_unregister_power_resources':
>> drivers/usb/core/usb-acpi.c:234:3: error: implicit declaration of function 'acpi_power_resource_unregister_device' [-Werror=implicit-function-declaration]
>>
>> Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power
>> resources").
>>
>> I have used the usb tree from next-20130125 for today.
>
> Lan, please send me a patch to resolve this issue.
>
> Stephen, sorry for the breakage.
>
	Sorry for this, I am working on this. Stephen, Thanks for reminder.


> thanks,
>
> greg k-h
>

-- 
Best Regards
Tianyu Lan
linux kernel enabling team

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2013-01-28 10:46 Stephen Rothwell
@ 2013-01-28 14:45 ` Greg KH
  2013-01-28 14:50   ` Lan Tianyu
                     ` (2 more replies)
  0 siblings, 3 replies; 64+ messages in thread
From: Greg KH @ 2013-01-28 14:45 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Lan Tianyu

On Mon, Jan 28, 2013 at 09:46:44PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_register_power_resources':
> drivers/usb/core/usb-acpi.c:226:2: error: implicit declaration of function 'acpi_power_resource_register_device' [-Werror=implicit-function-declaration]
> drivers/usb/core/usb-acpi.c: In function 'usb_acpi_unregister_power_resources':
> drivers/usb/core/usb-acpi.c:234:3: error: implicit declaration of function 'acpi_power_resource_unregister_device' [-Werror=implicit-function-declaration]
> 
> Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power
> resources").
> 
> I have used the usb tree from next-20130125 for today.

Lan, please send me a patch to resolve this issue.

Stephen, sorry for the breakage.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2013-01-28 10:46 Stephen Rothwell
  2013-01-28 14:45 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2013-01-28 10:46 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Lan Tianyu


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

Hi Greg,

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

drivers/usb/core/usb-acpi.c: In function 'usb_acpi_register_power_resources':
drivers/usb/core/usb-acpi.c:226:2: error: implicit declaration of function 'acpi_power_resource_register_device' [-Werror=implicit-function-declaration]
drivers/usb/core/usb-acpi.c: In function 'usb_acpi_unregister_power_resources':
drivers/usb/core/usb-acpi.c:234:3: error: implicit declaration of function 'acpi_power_resource_unregister_device' [-Werror=implicit-function-declaration]

Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power
resources").

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* RE: linux-next: build failure after merge of the usb tree
  2013-01-21  4:21 Stephen Rothwell
@ 2013-01-21  8:37 ` Lan, Tianyu
  0 siblings, 0 replies; 64+ messages in thread
From: Lan, Tianyu @ 2013-01-21  8:37 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH; +Cc: linux-next, linux-kernel

Hi Stephen:
	Sorry for this. I have produced a fix patch which has been merged by usb-next tree.
http://git.kernel.org/?p=linux/kernel/git/gregkh/usb.git;a=commit;h=9f7344fbaf191de63df315c7e0fa4c976e2ea419

Best Regards 
Tianyu Lan 

-----Original Message-----
From: Stephen Rothwell [mailto:sfr@canb.auug.org.au] 
Sent: Monday, January 21, 2013 12:22 PM
To: Greg KH
Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Lan, Tianyu
Subject: linux-next: build failure after merge of the usb tree

Hi Greg,

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

drivers/usb/core/port.c: In function 'usb_port_device_release':
drivers/usb/core/port.c:25:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
drivers/usb/core/port.c: In function 'usb_hub_create_port_device':
drivers/usb/core/port.c:38:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
drivers/usb/core/port.c:38:11: warning: assignment makes pointer from integer without a cast [enabled by default]

Caused by commit 6e30d7cba992 ("usb: Add driver/usb/core/(port.c,hub.h) files").  See Rule 1 in Documentation/SubmitChecklist.

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2013-01-21  4:21 Stephen Rothwell
  2013-01-21  8:37 ` Lan, Tianyu
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2013-01-21  4:21 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Lan Tianyu


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

Hi Greg,

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

drivers/usb/core/port.c: In function 'usb_port_device_release':
drivers/usb/core/port.c:25:2: error: implicit declaration of function 'kfree' [-Werror=implicit-function-declaration]
drivers/usb/core/port.c: In function 'usb_hub_create_port_device':
drivers/usb/core/port.c:38:2: error: implicit declaration of function 'kzalloc' [-Werror=implicit-function-declaration]
drivers/usb/core/port.c:38:11: warning: assignment makes pointer from integer without a cast [enabled by default]

Caused by commit 6e30d7cba992 ("usb: Add driver/usb/core/(port.c,hub.h)
files").  See Rule 1 in Documentation/SubmitChecklist.

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2012-09-19 13:59 ` Alan Cox
@ 2012-09-19 14:13   ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2012-09-19 14:13 UTC (permalink / raw)
  To: Alan Cox; +Cc: Stephen Rothwell, linux-next, linux-kernel, Alan Cox

On Wed, Sep 19, 2012 at 02:59:25PM +0100, Alan Cox wrote:
> On Wed, 19 Sep 2012 14:31:36 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/usb/serial/vizzini.c: In function 'vizzini_set_termios':
> > drivers/usb/serial/vizzini.c:454:22: error: invalid type argument of '->' (have 'struct ktermios')
> > 
> > Caused by commit c05fecb1d57e ("USB: serial: add vizzini driver")
> > interacting with commit adc8d746caa6 ("tty: move the termios object into
> > the tty") from the tty tree.
> > 
> > I added the following merge fix patch and can carry it as necessary:
> 
> Vizzini seems to have teleported into Greg's tree. Greg - it's got a pile
> of other bugs in it plus complete bogus comments and the like. You don't
> seem to have every posted it to the lists for comment or if you did it
> didn't turn up here ?

Yeah, I pulled it in from an out-of-tree vendor and tried to clean a
bunch of things up, but I know it has more things left to get right
(heck, I'm almost not sure it's even needed, I think this might be a
cdc-acm device...)

Any patches are appreciated, and I think that if the vendor doesn't
respond, I'll just drop the driver entirely, their emails are now
bouncing :(

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2012-09-19  4:31 Stephen Rothwell
  2012-09-19  7:17 ` Greg KH
@ 2012-09-19 13:59 ` Alan Cox
  2012-09-19 14:13   ` Greg KH
  1 sibling, 1 reply; 64+ messages in thread
From: Alan Cox @ 2012-09-19 13:59 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, Alan Cox

On Wed, 19 Sep 2012 14:31:36 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/serial/vizzini.c: In function 'vizzini_set_termios':
> drivers/usb/serial/vizzini.c:454:22: error: invalid type argument of '->' (have 'struct ktermios')
> 
> Caused by commit c05fecb1d57e ("USB: serial: add vizzini driver")
> interacting with commit adc8d746caa6 ("tty: move the termios object into
> the tty") from the tty tree.
> 
> I added the following merge fix patch and can carry it as necessary:

Vizzini seems to have teleported into Greg's tree. Greg - it's got a pile
of other bugs in it plus complete bogus comments and the like. You don't
seem to have every posted it to the lists for comment or if you did it
didn't turn up here ?

Alan

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2012-09-19  4:31 Stephen Rothwell
@ 2012-09-19  7:17 ` Greg KH
  2012-09-19 13:59 ` Alan Cox
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2012-09-19  7:17 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Alan Cox

On Wed, Sep 19, 2012 at 02:31:36PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/usb/serial/vizzini.c: In function 'vizzini_set_termios':
> drivers/usb/serial/vizzini.c:454:22: error: invalid type argument of '->' (have 'struct ktermios')
> 
> Caused by commit c05fecb1d57e ("USB: serial: add vizzini driver")
> interacting with commit adc8d746caa6 ("tty: move the termios object into
> the tty") from the tty tree.
> 
> I added the following merge fix patch and can carry it as necessary:

Looks correct to me, thanks for this, a side affect of api changes in
the tty tree at the moment.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2012-09-19  4:31 Stephen Rothwell
  2012-09-19  7:17 ` Greg KH
  2012-09-19 13:59 ` Alan Cox
  0 siblings, 2 replies; 64+ messages in thread
From: Stephen Rothwell @ 2012-09-19  4:31 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Alan Cox


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

Hi Greg,

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

drivers/usb/serial/vizzini.c: In function 'vizzini_set_termios':
drivers/usb/serial/vizzini.c:454:22: error: invalid type argument of '->' (have 'struct ktermios')

Caused by commit c05fecb1d57e ("USB: serial: add vizzini driver")
interacting with commit adc8d746caa6 ("tty: move the termios object into
the tty") from the tty tree.

I added the following merge fix patch and can carry it as necessary:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Sep 2012 14:27:39 +1000
Subject: [PATCH] USB: serial: fix vizzini driver for move of the termios
 object

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/usb/serial/vizzini.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/serial/vizzini.c b/drivers/usb/serial/vizzini.c
index 2ac48fe..253eaf8 100644
--- a/drivers/usb/serial/vizzini.c
+++ b/drivers/usb/serial/vizzini.c
@@ -451,7 +451,7 @@ static void vizzini_set_termios(struct tty_struct *tty_param,
 	unsigned int             format_size, format_parity, format_stop, flow, gpio_mode;
 	struct tty_struct       *tty = port->port.tty;
 
-	cflag = tty->termios->c_cflag;
+	cflag = tty->termios.c_cflag;
 
 	portdata->clocal = ((cflag & CLOCAL) != 0);
 
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2012-05-21  6:22 Stephen Rothwell
@ 2012-05-21 12:56 ` Sarah Sharp
  0 siblings, 0 replies; 64+ messages in thread
From: Sarah Sharp @ 2012-05-21 12:56 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel

On Mon, May 21, 2012 at 04:22:16PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/usb/core/hub.c: In function 'usb_disable_lpm':
> drivers/usb/core/hub.c:3394:2: error: implicit declaration of function 'usb_enable_lpm' [-Werror=implicit-function-declaration]
> drivers/usb/core/hub.c: At top level:
> drivers/usb/core/hub.c:3424:6: warning: conflicting types for 'usb_enable_lpm' [enabled by default]
> drivers/usb/core/hub.c:3394:2: note: previous implicit declaration of 'usb_enable_lpm' was here
> drivers/usb/core/driver.c: In function 'usb_probe_interface':
> drivers/usb/core/driver.c:339:2: error: implicit declaration of function 'usb_unlocked_disable_lpm' [-Werror=implicit-function-declaration]
> drivers/usb/core/driver.c:364:3: error: implicit declaration of function 'usb_unlocked_enable_lpm' [-Werror=implicit-function-declaration]
> drivers/usb/core/message.c: In function 'usb_set_interface':
> drivers/usb/core/message.c:1314:2: error: implicit declaration of function 'usb_disable_lpm' [-Werror=implicit-function-declaration]
> drivers/usb/core/message.c:1323:3: error: implicit declaration of function 'usb_enable_lpm' [-Werror=implicit-function-declaration]
> drivers/usb/core/message.c:1368:2: error: implicit declaration of function 'usb_unlocked_enable_lpm' [-Werror=implicit-function-declaration]
> 
> Caused by commit 8306095fd2c1 ("USB: Disable USB 3.0 LPM in critical
> sections").

Hi Stephan,

I'm creating a patch (and verifying the other drivers that were touched
by that commit) right now.  Sorry for the build failures.

Sarah Sharp

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2012-05-21  6:22 Stephen Rothwell
  2012-05-21 12:56 ` Sarah Sharp
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2012-05-21  6:22 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Sarah Sharp


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

Hi Greg,

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

drivers/usb/core/hub.c: In function 'usb_disable_lpm':
drivers/usb/core/hub.c:3394:2: error: implicit declaration of function 'usb_enable_lpm' [-Werror=implicit-function-declaration]
drivers/usb/core/hub.c: At top level:
drivers/usb/core/hub.c:3424:6: warning: conflicting types for 'usb_enable_lpm' [enabled by default]
drivers/usb/core/hub.c:3394:2: note: previous implicit declaration of 'usb_enable_lpm' was here
drivers/usb/core/driver.c: In function 'usb_probe_interface':
drivers/usb/core/driver.c:339:2: error: implicit declaration of function 'usb_unlocked_disable_lpm' [-Werror=implicit-function-declaration]
drivers/usb/core/driver.c:364:3: error: implicit declaration of function 'usb_unlocked_enable_lpm' [-Werror=implicit-function-declaration]
drivers/usb/core/message.c: In function 'usb_set_interface':
drivers/usb/core/message.c:1314:2: error: implicit declaration of function 'usb_disable_lpm' [-Werror=implicit-function-declaration]
drivers/usb/core/message.c:1323:3: error: implicit declaration of function 'usb_enable_lpm' [-Werror=implicit-function-declaration]
drivers/usb/core/message.c:1368:2: error: implicit declaration of function 'usb_unlocked_enable_lpm' [-Werror=implicit-function-declaration]

Caused by commit 8306095fd2c1 ("USB: Disable USB 3.0 LPM in critical
sections").

I have used the usb tree from next-20120518 for today.

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2012-04-27  4:12 Stephen Rothwell
@ 2012-04-27 18:25 ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2012-04-27 18:25 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel

On Fri, Apr 27, 2012 at 02:12:34PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/usb/host/ohci-hcd.c:1079:0:
> drivers/usb/host/ohci-ps3.c: In function 'ps3_ohci_hc_start':
> drivers/usb/host/ohci-ps3.c:48:3: error: implicit declaration of function 'err' [-Werror=implicit-function-declaration]
> 
> Caused by commit af4e1ee04026 ("USB: remove err() macro").

Ick, sorry about that, I missed some of the ohci controller drivers,
they should all now be fixed up.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2012-04-27  4:12 Stephen Rothwell
  2012-04-27 18:25 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2012-04-27  4:12 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel


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

Hi Greg,

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

In file included from drivers/usb/host/ohci-hcd.c:1079:0:
drivers/usb/host/ohci-ps3.c: In function 'ps3_ohci_hc_start':
drivers/usb/host/ohci-ps3.c:48:3: error: implicit declaration of function 'err' [-Werror=implicit-function-declaration]

Caused by commit af4e1ee04026 ("USB: remove err() macro").

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-11-17 15:56     ` Alan Stern
@ 2010-11-17 21:25       ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-11-17 21:25 UTC (permalink / raw)
  To: Alan Stern
  Cc: Stephen Rothwell, USB list, linux-next, Kernel development list

On Wed, Nov 17, 2010 at 10:56:01AM -0500, Alan Stern wrote:
> On Tue, 16 Nov 2010, Greg KH wrote:
> 
> > On Wed, Nov 17, 2010 at 01:14:53PM +1100, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > > 
> > > drivers/media/video/tlg2300/pd-main.c: In function 'poseidon_probe':
> > > drivers/media/video/tlg2300/pd-main.c:455: error: 'struct usb_device' has no member named 'autosuspend_delay'
> > > drivers/net/wimax/i2400m/usb.c: In function 'i2400mu_probe':
> > > drivers/net/wimax/i2400m/usb.c:517: error: 'struct usb_device' has no member named 'autosuspend_delay'
> > > 
> > > Caused by commit fcc4a01eb8661226e80632327673f67bf6a5840b ("USB: use the
> > > runtime-PM autosuspend implementation").  More grepping required ...
> > > 
> > > I have used the usb tree from next-20101116 for today.
> > 
> > Ick.  Alan, care to provide a patch?
> 
> Here it is.  I'm not sure that having this code at all is really the
> best approach.  It means the drivers will override any autosuspend
> values set by userspace when their devices are first detected.
> 
> Also there are bogus calls to device_init_wakeup(), and truly silly
> preprocessor tests of the kernel version in the staging-tree file.  
> Nevertheless, this is the minimal fix.

Don't worry about that staging driver that much, it has been massivly
cleaned up for .38, and then abandonded so the future of it is very
unlikely :)

I've applied this now, thanks.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
       [not found]   ` <20101117042053.GB2999-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
@ 2010-11-17 15:56     ` Alan Stern
  2010-11-17 21:25       ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Alan Stern @ 2010-11-17 15:56 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, USB list, linux-next-u79uwXL29TY76Z2rM5mHXA,
	Kernel development list

On Tue, 16 Nov 2010, Greg KH wrote:

> On Wed, Nov 17, 2010 at 01:14:53PM +1100, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > drivers/media/video/tlg2300/pd-main.c: In function 'poseidon_probe':
> > drivers/media/video/tlg2300/pd-main.c:455: error: 'struct usb_device' has no member named 'autosuspend_delay'
> > drivers/net/wimax/i2400m/usb.c: In function 'i2400mu_probe':
> > drivers/net/wimax/i2400m/usb.c:517: error: 'struct usb_device' has no member named 'autosuspend_delay'
> > 
> > Caused by commit fcc4a01eb8661226e80632327673f67bf6a5840b ("USB: use the
> > runtime-PM autosuspend implementation").  More grepping required ...
> > 
> > I have used the usb tree from next-20101116 for today.
> 
> Ick.  Alan, care to provide a patch?

Here it is.  I'm not sure that having this code at all is really the
best approach.  It means the drivers will override any autosuspend
values set by userspace when their devices are first detected.

Also there are bogus calls to device_init_wakeup(), and truly silly
preprocessor tests of the kernel version in the staging-tree file.  
Nevertheless, this is the minimal fix.

Alan Stern


---------------------------------------------------------------------------

USB: fix leftover references to udev->autosuspend_delay

This patch (as1436) takes care of leftover references to
udev->autosuspend_delay that didn't get removed during the earlier
conversion to the runtime-PM autosuspend API.

Signed-off-by: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>

---

Index: usb-2.6/drivers/media/video/tlg2300/pd-main.c
===================================================================
--- usb-2.6.orig/drivers/media/video/tlg2300/pd-main.c
+++ usb-2.6/drivers/media/video/tlg2300/pd-main.c
@@ -452,7 +452,8 @@ static int poseidon_probe(struct usb_int
 
 	device_init_wakeup(&udev->dev, 1);
 #ifdef CONFIG_PM
-	pd->udev->autosuspend_delay = HZ * PM_SUSPEND_DELAY;
+	pm_runtime_set_autosuspend_delay(&pd->udev->dev,
+			1000 * PM_SUSPEND_DELAY);
 	usb_enable_autosuspend(pd->udev);
 
 	if (in_hibernation(pd)) {
Index: usb-2.6/drivers/net/wimax/i2400m/usb.c
===================================================================
--- usb-2.6.orig/drivers/net/wimax/i2400m/usb.c
+++ usb-2.6/drivers/net/wimax/i2400m/usb.c
@@ -514,7 +514,7 @@ int i2400mu_probe(struct usb_interface *
 #ifdef CONFIG_PM
 	iface->needs_remote_wakeup = 1;		/* autosuspend (15s delay) */
 	device_init_wakeup(dev, 1);
-	usb_dev->autosuspend_delay = 15 * HZ;
+	pm_runtime_set_autosuspend_delay(&usb_dev->dev, 15000);
 	usb_enable_autosuspend(usb_dev);
 #endif
 
Index: usb-2.6/drivers/staging/bcm/InterfaceInit.c
===================================================================
--- usb-2.6.orig/drivers/staging/bcm/InterfaceInit.c
+++ usb-2.6/drivers/staging/bcm/InterfaceInit.c
@@ -277,7 +277,7 @@ usbbcm_device_probe(struct usb_interface
 		if(psAdapter->bDoSuspend)
 		{
 #ifdef CONFIG_PM
-			udev->autosuspend_delay = 0;
+			pm_runtime_set_autosuspend_delay(&udev->dev, 0);
 			intf->needs_remote_wakeup = 1;
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
  			udev->autosuspend_disabled = 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-11-17  2:14 Stephen Rothwell
@ 2010-11-17  4:20 ` Greg KH
       [not found]   ` <20101117042053.GB2999-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 64+ messages in thread
From: Greg KH @ 2010-11-17  4:20 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Alan Stern

On Wed, Nov 17, 2010 at 01:14:53PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> drivers/media/video/tlg2300/pd-main.c: In function 'poseidon_probe':
> drivers/media/video/tlg2300/pd-main.c:455: error: 'struct usb_device' has no member named 'autosuspend_delay'
> drivers/net/wimax/i2400m/usb.c: In function 'i2400mu_probe':
> drivers/net/wimax/i2400m/usb.c:517: error: 'struct usb_device' has no member named 'autosuspend_delay'
> 
> Caused by commit fcc4a01eb8661226e80632327673f67bf6a5840b ("USB: use the
> runtime-PM autosuspend implementation").  More grepping required ...
> 
> I have used the usb tree from next-20101116 for today.

Ick.  Alan, care to provide a patch?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2010-11-17  2:14 Stephen Rothwell
  2010-11-17  4:20 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2010-11-17  2:14 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Alan Stern


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

Hi Greg,

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

drivers/media/video/tlg2300/pd-main.c: In function 'poseidon_probe':
drivers/media/video/tlg2300/pd-main.c:455: error: 'struct usb_device' has no member named 'autosuspend_delay'
drivers/net/wimax/i2400m/usb.c: In function 'i2400mu_probe':
drivers/net/wimax/i2400m/usb.c:517: error: 'struct usb_device' has no member named 'autosuspend_delay'

Caused by commit fcc4a01eb8661226e80632327673f67bf6a5840b ("USB: use the
runtime-PM autosuspend implementation").  More grepping required ...

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

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-14  4:25   ` Stephen Rothwell
  2010-09-14 13:26     ` Greg KH
@ 2010-09-15 13:21     ` Mihai Donțu
  1 sibling, 0 replies; 64+ messages in thread
From: Mihai Donțu @ 2010-09-15 13:21 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Greg KH, linux-next, linux-kernel, David Brownell

On Tuesday 14 September 2010 07:25:28 Stephen Rothwell wrote:
> Hi Greg,
> 
> On Mon, 13 Sep 2010 21:08:03 -0700 Greg KH <greg@kroah.com> wrote:
> > On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the usb tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > In file included from drivers/usb/gadget/ether.c:123:
> > > drivers/usb/gadget/rndis.c: In function 'rndis_init':
> > > drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> > > 
> > > Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB:
> > > gadget: rndis: fix up coding style issues in the file").
> > > 
> > > I used the version of the usb tree from next-20100913 for today.
> > 
> > I can't duplicate this at all, are you sure it's coming from my tree?
> > What is your .config here?
> 
> See above: that was an x86_64 allmodconfig build.  You need
> CONFIG_USB_GADGET_DEBUG_FILES set.
> 
> The patch above was not in your usb quilt series when I fetched it
> yesterday and it was there this morning.  The relevant hunk of the patch
> looks like this:
> 
> @@ -1160,42 +1158,40 @@ int rndis_init(void)
>  #ifdef	CONFIG_USB_GADGET_DEBUG_FILES
>  		char name [20];
> 
> -		sprintf (name, NAME_TEMPLATE, i);
> -		if (!(rndis_connect_state [i]
> -				= proc_create_data(name, 0660, NULL,
> +		sprintf(name, NAME_TEMPLATE, i);
> +		rndis_connect_state[i] = proc_create_data(name, 0660, NULL,
>  					&rndis_proc_fops,
> -					(void *)(rndis_per_dev_params + i))))
> -		{
> -			pr_debug("%s :remove entries", __func__);
> +					(void *)(rndis_per_dev_params + i))
>                                                                           
> ^ *** note missing semicolon ...
> 
> +		if (!rndis_connect_state[i]) {
> +			pr_debug("%s: remove entries", __func__);
>  			while (i) {
> -				sprintf (name, NAME_TEMPLATE, --i);
> -				remove_proc_entry (name, NULL);
> +				sprintf(name, NAME_TEMPLATE, --i);
> +				remove_proc_entry(name, NULL);
>  			}
>  			pr_debug("\n");
>  			return -EIO;

I'm to blame for that. I'm sorry. I'll do an allmodconfig too, next time 
(besides being extra careful).

Thanks,

-- 
Mihai Donțu

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-14  4:25   ` Stephen Rothwell
@ 2010-09-14 13:26     ` Greg KH
  2010-09-15 13:21     ` Mihai Donțu
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-09-14 13:26 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mihai Don??u, David Brownell

On Tue, Sep 14, 2010 at 02:25:28PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Mon, 13 Sep 2010 21:08:03 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> > > Hi Greg,
> > > 
> > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > > failed like this:
> > > 
> > > In file included from drivers/usb/gadget/ether.c:123:
> > > drivers/usb/gadget/rndis.c: In function 'rndis_init':
> > > drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> > > 
> > > Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
> > > rndis: fix up coding style issues in the file").
> > > 
> > > I used the version of the usb tree from next-20100913 for today.
> > 
> > I can't duplicate this at all, are you sure it's coming from my tree?
> > What is your .config here?
> 
> See above: that was an x86_64 allmodconfig build.  You need
> CONFIG_USB_GADGET_DEBUG_FILES set.
> 
> The patch above was not in your usb quilt series when I fetched it
> yesterday and it was there this morning.  The relevant hunk of the patch
> looks like this:
> 
> @@ -1160,42 +1158,40 @@ int rndis_init(void)
>  #ifdef	CONFIG_USB_GADGET_DEBUG_FILES
>  		char name [20];
>  
> -		sprintf (name, NAME_TEMPLATE, i);
> -		if (!(rndis_connect_state [i]
> -				= proc_create_data(name, 0660, NULL,
> +		sprintf(name, NAME_TEMPLATE, i);
> +		rndis_connect_state[i] = proc_create_data(name, 0660, NULL,
>  					&rndis_proc_fops,
> -					(void *)(rndis_per_dev_params + i))))
> -		{
> -			pr_debug("%s :remove entries", __func__);
> +					(void *)(rndis_per_dev_params + i))
>                                                                            ^
> *** note missing semicolon ...

Doh, now I got it, sorry, I didn't have that config option enabled.
I've now fixed this.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-14  4:08 ` Greg KH
@ 2010-09-14  4:25   ` Stephen Rothwell
  2010-09-14 13:26     ` Greg KH
  2010-09-15 13:21     ` Mihai Donțu
  0 siblings, 2 replies; 64+ messages in thread
From: Stephen Rothwell @ 2010-09-14  4:25 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Mihai Don??u, David Brownell


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

Hi Greg,

On Mon, 13 Sep 2010 21:08:03 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> > 
> > In file included from drivers/usb/gadget/ether.c:123:
> > drivers/usb/gadget/rndis.c: In function 'rndis_init':
> > drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> > 
> > Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
> > rndis: fix up coding style issues in the file").
> > 
> > I used the version of the usb tree from next-20100913 for today.
> 
> I can't duplicate this at all, are you sure it's coming from my tree?
> What is your .config here?

See above: that was an x86_64 allmodconfig build.  You need
CONFIG_USB_GADGET_DEBUG_FILES set.

The patch above was not in your usb quilt series when I fetched it
yesterday and it was there this morning.  The relevant hunk of the patch
looks like this:

@@ -1160,42 +1158,40 @@ int rndis_init(void)
 #ifdef	CONFIG_USB_GADGET_DEBUG_FILES
 		char name [20];
 
-		sprintf (name, NAME_TEMPLATE, i);
-		if (!(rndis_connect_state [i]
-				= proc_create_data(name, 0660, NULL,
+		sprintf(name, NAME_TEMPLATE, i);
+		rndis_connect_state[i] = proc_create_data(name, 0660, NULL,
 					&rndis_proc_fops,
-					(void *)(rndis_per_dev_params + i))))
-		{
-			pr_debug("%s :remove entries", __func__);
+					(void *)(rndis_per_dev_params + i))
                                                                           ^
*** note missing semicolon ...

+		if (!rndis_connect_state[i]) {
+			pr_debug("%s: remove entries", __func__);
 			while (i) {
-				sprintf (name, NAME_TEMPLATE, --i);
-				remove_proc_entry (name, NULL);
+				sprintf(name, NAME_TEMPLATE, --i);
+				remove_proc_entry(name, NULL);
 			}
 			pr_debug("\n");
 			return -EIO;

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-14  2:54 Stephen Rothwell
  2010-09-14  4:03 ` Greg KH
@ 2010-09-14  4:08 ` Greg KH
  2010-09-14  4:25   ` Stephen Rothwell
  1 sibling, 1 reply; 64+ messages in thread
From: Greg KH @ 2010-09-14  4:08 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mihai Don??u, David Brownell

On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from drivers/usb/gadget/ether.c:123:
> drivers/usb/gadget/rndis.c: In function 'rndis_init':
> drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> 
> Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
> rndis: fix up coding style issues in the file").
> 
> I used the version of the usb tree from next-20100913 for today.

I can't duplicate this at all, are you sure it's coming from my tree?
What is your .config here?

confused,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-14  2:54 Stephen Rothwell
@ 2010-09-14  4:03 ` Greg KH
  2010-09-14  4:08 ` Greg KH
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-09-14  4:03 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mihai Don??u, David Brownell

On Tue, Sep 14, 2010 at 12:54:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> In file included from drivers/usb/gadget/ether.c:123:
> drivers/usb/gadget/rndis.c: In function 'rndis_init':
> drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'
> 
> Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
> rndis: fix up coding style issues in the file").
> 
> I used the version of the usb tree from next-20100913 for today.

Wierd, I haven't added any patches to my tree in a while, I guess this
didn't get pulled into the previous linux-next tree.  I'll go fix this
up now.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2010-09-14  2:54 Stephen Rothwell
  2010-09-14  4:03 ` Greg KH
  2010-09-14  4:08 ` Greg KH
  0 siblings, 2 replies; 64+ messages in thread
From: Stephen Rothwell @ 2010-09-14  2:54 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Mihai Donțu, David Brownell


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

Hi Greg,

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

In file included from drivers/usb/gadget/ether.c:123:
drivers/usb/gadget/rndis.c: In function 'rndis_init':
drivers/usb/gadget/rndis.c:1163: error: expected ';' before 'if'

Caused by commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget:
rndis: fix up coding style issues in the file").

I used the version of the usb tree from next-20100913 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 --]

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-02  4:32 ` Greg KH
  2010-09-02  4:36   ` Michał Nazarewicz
@ 2010-09-02  4:51   ` Stephen Rothwell
  1 sibling, 0 replies; 64+ messages in thread
From: Stephen Rothwell @ 2010-09-02  4:51 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Uwe Kleine-K??nig, Micha?? Nazarewicz


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

Hi Greg,

On Wed, 1 Sep 2010 21:32:54 -0700 Greg KH <greg@kroah.com> wrote:
>
> Sorry about that, my build didn't catch this.  I'll fix it up tomorrow.

Actually the author of the patch should have caught it ... (unless you
have been hanging onto this patch since before v2.6.34-rc1 :-))

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-02  4:32 ` Greg KH
@ 2010-09-02  4:36   ` Michał Nazarewicz
  2010-09-02  4:51   ` Stephen Rothwell
  1 sibling, 0 replies; 64+ messages in thread
From: Michał Nazarewicz @ 2010-09-02  4:36 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH; +Cc: linux-next, linux-kernel, Uwe Kleine-K??nig

On Thu, 02 Sep 2010 06:32:54 +0200, Greg KH <greg@kroah.com> wrote:

> On Thu, Sep 02, 2010 at 01:54:50PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/usb/gadget/nokia.c:244: error: unknown field 'bind' specified in initializer
>> drivers/usb/gadget/nokia.c:244: warning: initialization makes integer from pointer without a cast
>> drivers/usb/gadget/nokia.c:244: error: initializer element is not computable at load time
>> drivers/usb/gadget/nokia.c:244: error: (near initialization for 'nokia_driver.needs_serial')
>> drivers/usb/gadget/nokia.c: In function 'nokia_init':
>> drivers/usb/gadget/nokia.c:250: error: implicit declaration of function 'usb_composite_register'
>>
>> Caused by commit cc604fa9db859b7d6899de807d6bd8df80fc0a1a ("usb gadget:
>> don't save bind callback in struct usb_configuration").  The 'bind' and
>> 'usb_composite_register' references above were added before 2.6.34-rc1
>> but missed in this patch.
>>
>> Please make every attempt to (at least) build every file that gets
>> modified when testing a patch.  (and grep is your friend)
>>
>> I have used the usb tree from next-20100901 for today.
>
> Sorry about that, my build didn't catch this.  I'll fix it up tomorrow.

I'm already working on updated patch.  I'll send it in an hour or so.

-- 
Best regards,                                        _     _
| Humble Liege of Serenely Enlightened Majesty of  o' \,=./ `o
| Computer Science,  Michał "mina86" Nazarewicz       (o o)
+----[mina86*mina86.com]---[mina86*jabber.org]----ooO--(_)--Ooo--

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-09-02  3:54 Stephen Rothwell
@ 2010-09-02  4:32 ` Greg KH
  2010-09-02  4:36   ` Michał Nazarewicz
  2010-09-02  4:51   ` Stephen Rothwell
  0 siblings, 2 replies; 64+ messages in thread
From: Greg KH @ 2010-09-02  4:32 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Uwe Kleine-K??nig, Micha?? Nazarewicz

On Thu, Sep 02, 2010 at 01:54:50PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/usb/gadget/nokia.c:244: error: unknown field 'bind' specified in initializer
> drivers/usb/gadget/nokia.c:244: warning: initialization makes integer from pointer without a cast
> drivers/usb/gadget/nokia.c:244: error: initializer element is not computable at load time
> drivers/usb/gadget/nokia.c:244: error: (near initialization for 'nokia_driver.needs_serial')
> drivers/usb/gadget/nokia.c: In function 'nokia_init':
> drivers/usb/gadget/nokia.c:250: error: implicit declaration of function 'usb_composite_register'
> 
> Caused by commit cc604fa9db859b7d6899de807d6bd8df80fc0a1a ("usb gadget:
> don't save bind callback in struct usb_configuration").  The 'bind' and
> 'usb_composite_register' references above were added before 2.6.34-rc1
> but missed in this patch.
> 
> Please make every attempt to (at least) build every file that gets
> modified when testing a patch.  (and grep is your friend)
> 
> I have used the usb tree from next-20100901 for today.

Sorry about that, my build didn't catch this.  I'll fix it up tomorrow.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2010-09-02  3:54 Stephen Rothwell
  2010-09-02  4:32 ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2010-09-02  3:54 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, "Uwe Kleine-König",
	"Michał Nazarewicz"


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

Hi Greg,

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

drivers/usb/gadget/nokia.c:244: error: unknown field 'bind' specified in initializer
drivers/usb/gadget/nokia.c:244: warning: initialization makes integer from pointer without a cast
drivers/usb/gadget/nokia.c:244: error: initializer element is not computable at load time
drivers/usb/gadget/nokia.c:244: error: (near initialization for 'nokia_driver.needs_serial')
drivers/usb/gadget/nokia.c: In function 'nokia_init':
drivers/usb/gadget/nokia.c:250: error: implicit declaration of function 'usb_composite_register'

Caused by commit cc604fa9db859b7d6899de807d6bd8df80fc0a1a ("usb gadget:
don't save bind callback in struct usb_configuration").  The 'bind' and
'usb_composite_register' references above were added before 2.6.34-rc1
but missed in this patch.

Please make every attempt to (at least) build every file that gets
modified when testing a patch.  (and grep is your friend)

I have used the usb tree from next-20100901 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 --]

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-19 22:49     ` Stephen Rothwell
@ 2010-05-20  6:39       ` Greg KH
  0 siblings, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-05-20  6:39 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: Alan Stern, linux-next, Kernel development list

On Thu, May 20, 2010 at 08:49:38AM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Tue, 18 May 2010 14:11:11 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > Thanks, now merged and pushed out.
> 
> I haven't seen that fix in your published quilt series, yet.

Sorry, forgot to push properly.  It should be there now.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-18 21:11   ` Greg KH
@ 2010-05-19 22:49     ` Stephen Rothwell
  2010-05-20  6:39       ` Greg KH
  0 siblings, 1 reply; 64+ messages in thread
From: Stephen Rothwell @ 2010-05-19 22:49 UTC (permalink / raw)
  To: Greg KH; +Cc: Alan Stern, linux-next, Kernel development list


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

Hi Greg,

On Tue, 18 May 2010 14:11:11 -0700 Greg KH <greg@kroah.com> wrote:
>
> Thanks, now merged and pushed out.

I haven't seen that fix in your published quilt series, yet.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-18 13:54 ` Alan Stern
  2010-05-18 14:08   ` Greg KH
@ 2010-05-18 21:11   ` Greg KH
  2010-05-19 22:49     ` Stephen Rothwell
  1 sibling, 1 reply; 64+ messages in thread
From: Greg KH @ 2010-05-18 21:11 UTC (permalink / raw)
  To: Alan Stern; +Cc: Stephen Rothwell, linux-next, Kernel development list

On Tue, May 18, 2010 at 09:54:45AM -0400, Alan Stern wrote:
> On Tue, 18 May 2010, Stephen Rothwell wrote:
> 
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (powerpc
> > ppc6xx_defconfig) failed like this:
> > 
> > drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)
> > 
> > Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
> > fix controller wakeup flag settings during suspend").
> 
> Here's a fix for the problem.  It's awfully easy to mess things up when 
> changing code for architectures you don't have.
> 
> Greg, can you merge this in with the original patch?

Thanks, now merged and pushed out.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-18 13:54 ` Alan Stern
@ 2010-05-18 14:08   ` Greg KH
  2010-05-18 21:11   ` Greg KH
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-05-18 14:08 UTC (permalink / raw)
  To: Alan Stern; +Cc: Stephen Rothwell, linux-next, Kernel development list

On Tue, May 18, 2010 at 09:54:45AM -0400, Alan Stern wrote:
> On Tue, 18 May 2010, Stephen Rothwell wrote:
> 
> > Hi Greg,
> > 
> > After merging the usb tree, today's linux-next build (powerpc
> > ppc6xx_defconfig) failed like this:
> > 
> > drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)
> > 
> > Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
> > fix controller wakeup flag settings during suspend").
> 
> Here's a fix for the problem.  It's awfully easy to mess things up when 
> changing code for architectures you don't have.
> 
> Greg, can you merge this in with the original patch?

Will do, thanks for the patch.

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-18  7:42 Stephen Rothwell
  2010-05-18 13:54 ` Alan Stern
@ 2010-05-18 14:00 ` Greg KH
  1 sibling, 0 replies; 64+ messages in thread
From: Greg KH @ 2010-05-18 14:00 UTC (permalink / raw)
  To: Stephen Rothwell, Alan Stern; +Cc: linux-next, linux-kernel

On Tue, May 18, 2010 at 05:42:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (powerpc
> ppc6xx_defconfig) failed like this:
> 
> drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)
> 
> Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
> fix controller wakeup flag settings during suspend").

Ick.  Alan, care to send either a fix-up patch I can merge with the
original, or a separate patch to resolve this?

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: linux-next: build failure after merge of the usb tree
  2010-05-18  7:42 Stephen Rothwell
@ 2010-05-18 13:54 ` Alan Stern
  2010-05-18 14:08   ` Greg KH
  2010-05-18 21:11   ` Greg KH
  2010-05-18 14:00 ` Greg KH
  1 sibling, 2 replies; 64+ messages in thread
From: Alan Stern @ 2010-05-18 13:54 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell; +Cc: linux-next, Kernel development list

On Tue, 18 May 2010, Stephen Rothwell wrote:

> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (powerpc
> ppc6xx_defconfig) failed like this:
> 
> drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)
> 
> Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
> fix controller wakeup flag settings during suspend").

Here's a fix for the problem.  It's awfully easy to mess things up when 
changing code for architectures you don't have.

Greg, can you merge this in with the original patch?

Alan Stern



Index: usb-2.6/drivers/usb/host/ehci-fsl.c
===================================================================
--- usb-2.6.orig/drivers/usb/host/ehci-fsl.c
+++ usb-2.6/drivers/usb/host/ehci-fsl.c
@@ -313,7 +313,7 @@ static int ehci_fsl_drv_suspend(struct d
 	struct ehci_fsl *ehci_fsl = hcd_to_ehci_fsl(hcd);
 	void __iomem *non_ehci = hcd->regs;
 
-	ehci_prepare_ports_for_controller_suspend(ehci);
+	ehci_prepare_ports_for_controller_suspend(hcd_to_ehci(hcd));
 	if (!fsl_deep_sleep())
 		return 0;
 

^ permalink raw reply	[flat|nested] 64+ messages in thread

* linux-next: build failure after merge of the usb tree
@ 2010-05-18  7:42 Stephen Rothwell
  2010-05-18 13:54 ` Alan Stern
  2010-05-18 14:00 ` Greg KH
  0 siblings, 2 replies; 64+ messages in thread
From: Stephen Rothwell @ 2010-05-18  7:42 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Alan Stern


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

Hi Greg,

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

drivers/usb/host/ehci-fsl.c:316: error: 'ehci' undeclared (first use in this function)

Caused by commit d19f8cd047971b43844d61d995be736dacb4826a ("USB: EHCI:
fix controller wakeup flag settings during suspend").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 64+ messages in thread

end of thread, back to index

Thread overview: 64+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-12 11:36 linux-next: build failure after merge of the usb tree Stephen Rothwell
2021-04-12 12:35 ` Greg KH
2021-04-12 12:41   ` Heikki Krogerus
  -- strict thread matches above, loose matches on Subject: below --
2020-03-16  3:10 Stephen Rothwell
2020-03-16 11:30 ` Thierry Reding
2020-03-16 13:28   ` Greg KH
2020-03-16 13:44     ` Thierry Reding
2019-06-19  6:43 Stephen Rothwell
2019-06-19 14:56 ` Greg KH
2014-12-01  8:19 Stephen Rothwell
2014-12-02 18:12 ` Greg KH
2014-12-03  5:57   ` Kishon Vijay Abraham I
2014-07-24  7:07 Stephen Rothwell
2014-07-24  7:44 ` Greg KH
2014-08-06  1:39   ` Stephen Rothwell
2014-08-06  4:04     ` Greg KH
2014-05-29  9:01 Stephen Rothwell
2014-05-29 18:18 ` Greg KH
2014-05-29 18:40   ` Dan Williams
2013-04-18  6:05 Stephen Rothwell
2013-04-18 16:06 ` Joe Perches
2013-03-27  3:41 Stephen Rothwell
2013-03-27  3:51 ` Ming Lei
2013-03-27  4:20   ` Greg KH
2013-03-28 18:04 ` Greg KH
2013-01-28 10:46 Stephen Rothwell
2013-01-28 14:45 ` Greg KH
2013-01-28 14:50   ` Lan Tianyu
2013-01-28 15:28   ` Lan Tianyu
2013-01-28 16:03   ` Lan, Tianyu
2013-01-29 13:41     ` Greg KH
2013-01-29 13:51       ` Lan, Tianyu
2013-01-29 14:59         ` Greg KH
2013-01-21  4:21 Stephen Rothwell
2013-01-21  8:37 ` Lan, Tianyu
2012-09-19  4:31 Stephen Rothwell
2012-09-19  7:17 ` Greg KH
2012-09-19 13:59 ` Alan Cox
2012-09-19 14:13   ` Greg KH
2012-05-21  6:22 Stephen Rothwell
2012-05-21 12:56 ` Sarah Sharp
2012-04-27  4:12 Stephen Rothwell
2012-04-27 18:25 ` Greg KH
2010-11-17  2:14 Stephen Rothwell
2010-11-17  4:20 ` Greg KH
     [not found]   ` <20101117042053.GB2999-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2010-11-17 15:56     ` Alan Stern
2010-11-17 21:25       ` Greg KH
2010-09-14  2:54 Stephen Rothwell
2010-09-14  4:03 ` Greg KH
2010-09-14  4:08 ` Greg KH
2010-09-14  4:25   ` Stephen Rothwell
2010-09-14 13:26     ` Greg KH
2010-09-15 13:21     ` Mihai Donțu
2010-09-02  3:54 Stephen Rothwell
2010-09-02  4:32 ` Greg KH
2010-09-02  4:36   ` Michał Nazarewicz
2010-09-02  4:51   ` Stephen Rothwell
2010-05-18  7:42 Stephen Rothwell
2010-05-18 13:54 ` Alan Stern
2010-05-18 14:08   ` Greg KH
2010-05-18 21:11   ` Greg KH
2010-05-19 22:49     ` Stephen Rothwell
2010-05-20  6:39       ` Greg KH
2010-05-18 14:00 ` Greg KH

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git