Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: build failure after merge of the net-next tree
@ 2019-07-09  3:56 Stephen Rothwell
  2019-07-09  6:43 ` Leon Romanovsky
  2019-07-09  9:00 ` Bernard Metzler
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-09  3:56 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Bernard Metzler

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

Hi all,

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

drivers/infiniband/sw/siw/siw_cm.c: In function 'siw_create_listen':
drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit declaration of function 'for_ifa'; did you mean 'fork_idle'? [-Werror=implicit-function-declaration]
   for_ifa(in_dev)
   ^~~~~~~
   fork_idle
drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';' before '{' token
   for_ifa(in_dev)
                  ^
                  ;
   {
   ~

Caused by commit

  6c52fdc244b5 ("rdma/siw: connection management")

from the rdma tree.  I don't know why this didn't fail after I mereged
that tree.

I have marked that driver as depending on BROKEN for today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-09  3:56 linux-next: build failure after merge of the net-next tree Stephen Rothwell
@ 2019-07-09  6:43 ` Leon Romanovsky
  2019-07-10  4:31   ` Stephen Rothwell
                     ` (2 more replies)
  2019-07-09  9:00 ` Bernard Metzler
  1 sibling, 3 replies; 249+ messages in thread
From: Leon Romanovsky @ 2019-07-09  6:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, Jason Gunthorpe, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Bernard Metzler

On Tue, Jul 09, 2019 at 01:56:36PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/sw/siw/siw_cm.c: In function 'siw_create_listen':
> drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit declaration of function 'for_ifa'; did you mean 'fork_idle'? [-Werror=implicit-function-declaration]
>    for_ifa(in_dev)
>    ^~~~~~~
>    fork_idle
> drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';' before '{' token
>    for_ifa(in_dev)
>                   ^
>                   ;
>    {
>    ~
>
> Caused by commit
>
>   6c52fdc244b5 ("rdma/siw: connection management")
>
> from the rdma tree.  I don't know why this didn't fail after I mereged
> that tree.

I had the same question, because I have this fix for a couple of days already.

From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00 2001
From: Leon Romanovsky <leonro@mellanox.com>
Date: Sun, 7 Jul 2019 10:43:42 +0300
Subject: [PATCH] Fixup to build SIW issue

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 8e618cb7261f..c883bf514341 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1954,6 +1954,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
 int siw_create_listen(struct iw_cm_id *id, int backlog)
 {
 	struct net_device *dev = to_siw_dev(id->device)->netdev;
+	const struct in_ifaddr *ifa;
 	int rv = 0, listeners = 0;

 	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
@@ -1975,8 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));

-		for_ifa(in_dev)
-		{
+		in_dev_for_each_ifa_rcu(ifa, in_dev) {
 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
 			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
 				s_laddr.sin_addr.s_addr = ifa->ifa_address;
@@ -1988,7 +1988,6 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 					listeners++;
 			}
 		}
-		endfor_ifa(in_dev);
 		in_dev_put(in_dev);
 	} else if (id->local_addr.ss_family == AF_INET6) {
 		struct inet6_dev *in6_dev = in6_dev_get(dev);
--
2.21.0


>
> I have marked that driver as depending on BROKEN for today.
>
> --
> Cheers,
> Stephen Rothwell



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

* Re:  Re: linux-next: build failure after merge of the net-next tree
  2019-07-09  3:56 linux-next: build failure after merge of the net-next tree Stephen Rothwell
  2019-07-09  6:43 ` Leon Romanovsky
@ 2019-07-09  9:00 ` Bernard Metzler
  1 sibling, 0 replies; 249+ messages in thread
From: Bernard Metzler @ 2019-07-09  9:00 UTC (permalink / raw)
  To: Leon Romanovsky
  Cc: Stephen Rothwell, Doug Ledford, Jason Gunthorpe, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

-----"Leon Romanovsky" <leon@kernel.org> wrote: -----

>To: "Stephen Rothwell" <sfr@canb.auug.org.au>
>From: "Leon Romanovsky" <leon@kernel.org>
>Date: 07/09/2019 08:43AM
>Cc: "Doug Ledford" <dledford@redhat.com>, "Jason Gunthorpe"
><jgg@mellanox.com>, "David Miller" <davem@davemloft.net>,
>"Networking" <netdev@vger.kernel.org>, "Linux Next Mailing List"
><linux-next@vger.kernel.org>, "Linux Kernel Mailing List"
><linux-kernel@vger.kernel.org>, "Bernard Metzler"
><bmt@zurich.ibm.com>
>Subject: [EXTERNAL] Re: linux-next: build failure after merge of the
>net-next tree
>
>On Tue, Jul 09, 2019 at 01:56:36PM +1000, Stephen Rothwell wrote:
>> Hi all,
>>
>> After merging the net-next tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/infiniband/sw/siw/siw_cm.c: In function
>'siw_create_listen':
>> drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit
>declaration of function 'for_ifa'; did you mean 'fork_idle'?
>[-Werror=implicit-function-declaration]
>>    for_ifa(in_dev)
>>    ^~~~~~~
>>    fork_idle
>> drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';'
>before '{' token
>>    for_ifa(in_dev)
>>                   ^
>>                   ;
>>    {
>>    ~
>>
>> Caused by commit
>>
>>   6c52fdc244b5 ("rdma/siw: connection management")
>>
>> from the rdma tree.  I don't know why this didn't fail after I
>mereged
>> that tree.
>
>I had the same question, because I have this fix for a couple of days
>already.
>
>From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00
>2001
>From: Leon Romanovsky <leonro@mellanox.com>
>Date: Sun, 7 Jul 2019 10:43:42 +0300
>Subject: [PATCH] Fixup to build SIW issue
>
>Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>---
> drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/infiniband/sw/siw/siw_cm.c
>b/drivers/infiniband/sw/siw/siw_cm.c
>index 8e618cb7261f..c883bf514341 100644
>--- a/drivers/infiniband/sw/siw/siw_cm.c
>+++ b/drivers/infiniband/sw/siw/siw_cm.c
>@@ -1954,6 +1954,7 @@ static void siw_drop_listeners(struct iw_cm_id
>*id)
> int siw_create_listen(struct iw_cm_id *id, int backlog)
> {
> 	struct net_device *dev = to_siw_dev(id->device)->netdev;
>+	const struct in_ifaddr *ifa;
> 	int rv = 0, listeners = 0;
>
> 	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
>@@ -1975,8 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id, int
>backlog)
> 			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
> 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
>
>-		for_ifa(in_dev)
>-		{
>+		in_dev_for_each_ifa_rcu(ifa, in_dev) {
> 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
> 			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
> 				s_laddr.sin_addr.s_addr = ifa->ifa_address;
>@@ -1988,7 +1988,6 @@ int siw_create_listen(struct iw_cm_id *id, int
>backlog)
> 					listeners++;
> 			}
> 		}
>-		endfor_ifa(in_dev);
> 		in_dev_put(in_dev);
> 	} else if (id->local_addr.ss_family == AF_INET6) {
> 		struct inet6_dev *in6_dev = in6_dev_get(dev);
>--
>2.21.0
>
>
>>
>> I have marked that driver as depending on BROKEN for today.
>>
>> --
>> Cheers,
>> Stephen Rothwell
>
>
>
I am very sorry for that issues. Things are moving fast, and I
didn't realize 'for_ifa' recently went away. I agree with Leon,
his patch fixes the issue. So, please, let's apply that one.

Leon, many thanks for providing the fix.

Thanks very much,
Bernard.


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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-09  6:43 ` Leon Romanovsky
@ 2019-07-10  4:31   ` Stephen Rothwell
  2019-07-10  5:20     ` Leon Romanovsky
  2019-07-10 17:52   ` Jason Gunthorpe
  2019-07-11  8:00   ` Bernard Metzler
  2 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-10  4:31 UTC (permalink / raw)
  To: Leon Romanovsky
  Cc: Doug Ledford, Jason Gunthorpe, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Bernard Metzler

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

Hi Leon,

On Tue, 9 Jul 2019 09:43:46 +0300 Leon Romanovsky <leon@kernel.org> wrote:
>
> From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00 2001
> From: Leon Romanovsky <leonro@mellanox.com>
> Date: Sun, 7 Jul 2019 10:43:42 +0300
> Subject: [PATCH] Fixup to build SIW issue
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

I applied this to linux-next today and it fixes my build problems.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-10  4:31   ` Stephen Rothwell
@ 2019-07-10  5:20     ` Leon Romanovsky
  0 siblings, 0 replies; 249+ messages in thread
From: Leon Romanovsky @ 2019-07-10  5:20 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Doug Ledford, Jason Gunthorpe, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Bernard Metzler

On Wed, Jul 10, 2019 at 02:31:58PM +1000, Stephen Rothwell wrote:
> Hi Leon,
>
> On Tue, 9 Jul 2019 09:43:46 +0300 Leon Romanovsky <leon@kernel.org> wrote:
> >
> > From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00 2001
> > From: Leon Romanovsky <leonro@mellanox.com>
> > Date: Sun, 7 Jul 2019 10:43:42 +0300
> > Subject: [PATCH] Fixup to build SIW issue
> >
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>
> I applied this to linux-next today and it fixes my build problems.

Thanks

>
> --
> Cheers,
> Stephen Rothwell



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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-09  6:43 ` Leon Romanovsky
  2019-07-10  4:31   ` Stephen Rothwell
@ 2019-07-10 17:52   ` Jason Gunthorpe
  2019-07-11  1:50     ` Stephen Rothwell
  2019-07-11  8:00   ` Bernard Metzler
  2 siblings, 1 reply; 249+ messages in thread
From: Jason Gunthorpe @ 2019-07-10 17:52 UTC (permalink / raw)
  To: Leon Romanovsky, Bernard Metzler
  Cc: Stephen Rothwell, Doug Ledford, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List

On Tue, Jul 09, 2019 at 09:43:46AM +0300, Leon Romanovsky wrote:
> On Tue, Jul 09, 2019 at 01:56:36PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the net-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/infiniband/sw/siw/siw_cm.c: In function 'siw_create_listen':
> > drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit declaration of function 'for_ifa'; did you mean 'fork_idle'? [-Werror=implicit-function-declaration]
> >    for_ifa(in_dev)
> >    ^~~~~~~
> >    fork_idle
> > drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';' before '{' token
> >    for_ifa(in_dev)
> >                   ^
> >                   ;
> >    {
> >    ~
> >
> > Caused by commit
> >
> >   6c52fdc244b5 ("rdma/siw: connection management")
> >
> > from the rdma tree.  I don't know why this didn't fail after I mereged
> > that tree.
> 
> I had the same question, because I have this fix for a couple of days already.
> 
> From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00 2001
> From: Leon Romanovsky <leonro@mellanox.com>
> Date: Sun, 7 Jul 2019 10:43:42 +0300
> Subject: [PATCH] Fixup to build SIW issue
> 
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>  drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
> index 8e618cb7261f..c883bf514341 100644
> +++ b/drivers/infiniband/sw/siw/siw_cm.c
> @@ -1954,6 +1954,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
>  int siw_create_listen(struct iw_cm_id *id, int backlog)
>  {
>  	struct net_device *dev = to_siw_dev(id->device)->netdev;
> +	const struct in_ifaddr *ifa;
>  	int rv = 0, listeners = 0;
> 
>  	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
> @@ -1975,8 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
>  			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
>  			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
> 
> -		for_ifa(in_dev)
> -		{
> +		in_dev_for_each_ifa_rcu(ifa, in_dev) {
>  			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||

Hum. There is no rcu lock held here and we can't use RCU anyhow as
siw_listen_address will sleep.

I think this needs to use rtnl, as below. Bernard, please urgently
confirm. Thanks

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 8e618cb7261f62..ee98e96a5bfaba 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1965,6 +1965,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 	 */
 	if (id->local_addr.ss_family == AF_INET) {
 		struct in_device *in_dev = in_dev_get(dev);
+		const struct in_ifaddr *ifa;
 		struct sockaddr_in s_laddr, *s_raddr;
 
 		memcpy(&s_laddr, &id->local_addr, sizeof(s_laddr));
@@ -1975,8 +1976,8 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
 
-		for_ifa(in_dev)
-		{
+		rtnl_lock();
+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
 			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
 				s_laddr.sin_addr.s_addr = ifa->ifa_address;
@@ -1988,7 +1989,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 					listeners++;
 			}
 		}
-		endfor_ifa(in_dev);
+		rtnl_unlock();
 		in_dev_put(in_dev);
 	} else if (id->local_addr.ss_family == AF_INET6) {
 		struct inet6_dev *in6_dev = in6_dev_get(dev);

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-10 17:52   ` Jason Gunthorpe
@ 2019-07-11  1:50     ` Stephen Rothwell
  2019-07-11  2:26       ` Jason Gunthorpe
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-11  1:50 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

On Wed, 10 Jul 2019 17:52:17 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> On Tue, Jul 09, 2019 at 09:43:46AM +0300, Leon Romanovsky wrote:
> > On Tue, Jul 09, 2019 at 01:56:36PM +1000, Stephen Rothwell wrote:  
> > > Hi all,
> > >
> > > After merging the net-next tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/infiniband/sw/siw/siw_cm.c: In function 'siw_create_listen':
> > > drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit declaration of function 'for_ifa'; did you mean 'fork_idle'? [-Werror=implicit-function-declaration]
> > >    for_ifa(in_dev)
> > >    ^~~~~~~
> > >    fork_idle
> > > drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';' before '{' token
> > >    for_ifa(in_dev)
> > >                   ^
> > >                   ;
> > >    {
> > >    ~
> > >
> > > Caused by commit
> > >
> > >   6c52fdc244b5 ("rdma/siw: connection management")
> > >
> > > from the rdma tree.  I don't know why this didn't fail after I mereged
> > > that tree.  
> > 
> > I had the same question, because I have this fix for a couple of days already.
> > 
> > From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00 2001
> > From: Leon Romanovsky <leonro@mellanox.com>
> > Date: Sun, 7 Jul 2019 10:43:42 +0300
> > Subject: [PATCH] Fixup to build SIW issue
> > 
> > Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> >  drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
> > index 8e618cb7261f..c883bf514341 100644
> > +++ b/drivers/infiniband/sw/siw/siw_cm.c
> > @@ -1954,6 +1954,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
> >  int siw_create_listen(struct iw_cm_id *id, int backlog)
> >  {
> >  	struct net_device *dev = to_siw_dev(id->device)->netdev;
> > +	const struct in_ifaddr *ifa;
> >  	int rv = 0, listeners = 0;
> > 
> >  	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
> > @@ -1975,8 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
> >  			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
> >  			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
> > 
> > -		for_ifa(in_dev)
> > -		{
> > +		in_dev_for_each_ifa_rcu(ifa, in_dev) {
> >  			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||  
> 
> Hum. There is no rcu lock held here and we can't use RCU anyhow as
> siw_listen_address will sleep.
> 
> I think this needs to use rtnl, as below. Bernard, please urgently
> confirm. Thanks
> 
> diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
> index 8e618cb7261f62..ee98e96a5bfaba 100644
> --- a/drivers/infiniband/sw/siw/siw_cm.c
> +++ b/drivers/infiniband/sw/siw/siw_cm.c
> @@ -1965,6 +1965,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
>  	 */
>  	if (id->local_addr.ss_family == AF_INET) {
>  		struct in_device *in_dev = in_dev_get(dev);
> +		const struct in_ifaddr *ifa;
>  		struct sockaddr_in s_laddr, *s_raddr;
>  
>  		memcpy(&s_laddr, &id->local_addr, sizeof(s_laddr));
> @@ -1975,8 +1976,8 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
>  			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
>  			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
>  
> -		for_ifa(in_dev)
> -		{
> +		rtnl_lock();
> +		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
>  			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
>  			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
>  				s_laddr.sin_addr.s_addr = ifa->ifa_address;
> @@ -1988,7 +1989,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
>  					listeners++;
>  			}
>  		}
> -		endfor_ifa(in_dev);
> +		rtnl_unlock();
>  		in_dev_put(in_dev);
>  	} else if (id->local_addr.ss_family == AF_INET6) {
>  		struct inet6_dev *in6_dev = in6_dev_get(dev);

So today this failed to build after I merged the rdma tree (previously
it didn;t until after the net-next tree was merged (I assume a
dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
tree :-(

I have disabled the driver again.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  1:50     ` Stephen Rothwell
@ 2019-07-11  2:26       ` Jason Gunthorpe
  2019-07-11  3:13         ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Jason Gunthorpe @ 2019-07-11  2:26 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Leon Romanovsky, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Jul 11, 2019 at 11:50:54AM +1000, Stephen Rothwell wrote:

> So today this failed to build after I merged the rdma tree (previously
> it didn;t until after the net-next tree was merged (I assume a
> dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
> in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
> tree :-(

? I'm confused.. 

rdma.git builds fine stand alone (I hope!)

If you merge it with netdev then the above patch is needed afer the
merge as netdev changed to ifa_rcu

I just did this a few hours ago to make and test the patch I sent
above..

Jason

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  2:26       ` Jason Gunthorpe
@ 2019-07-11  3:13         ` Stephen Rothwell
  2019-07-11  3:16           ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-11  3:13 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi Jason,

On Thu, 11 Jul 2019 02:26:27 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> On Thu, Jul 11, 2019 at 11:50:54AM +1000, Stephen Rothwell wrote:
> 
> > So today this failed to build after I merged the rdma tree (previously
> > it didn;t until after the net-next tree was merged (I assume a
> > dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
> > in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
> > tree :-(  
> 
> ? I'm confused.. 
> 
> rdma.git builds fine stand alone (I hope!)

I have "Fixup to build SIW issue" from Leon (which switches to using
in_dev_for_each_ifa_rcu) included in the rmda tree merge commit because
without that the rdma tree would not build for me.  Are you saying that
I don't need that at all, now?

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  3:13         ` Stephen Rothwell
@ 2019-07-11  3:16           ` Stephen Rothwell
  2019-07-11  3:27             ` Stephen Rothwell
  2019-07-11  5:40             ` Leon Romanovsky
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-11  3:16 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

On Thu, 11 Jul 2019 13:13:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Thu, 11 Jul 2019 02:26:27 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > On Thu, Jul 11, 2019 at 11:50:54AM +1000, Stephen Rothwell wrote:
> >   
> > > So today this failed to build after I merged the rdma tree (previously
> > > it didn;t until after the net-next tree was merged (I assume a
> > > dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
> > > in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
> > > tree :-(    
> > 
> > ? I'm confused.. 
> > 
> > rdma.git builds fine stand alone (I hope!)  
> 
> I have "Fixup to build SIW issue" from Leon (which switches to using
> in_dev_for_each_ifa_rcu) included in the rmda tree merge commit because
> without that the rdma tree would not build for me.  Are you saying that
> I don't need that at all, now?

Actually , I get it now, "Fixup to build SIW issue" is really just a
fixup for the net-next and rdma trees merge ... OK, I will fix that up
tomorrow.  Sorry for my confusion.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  3:16           ` Stephen Rothwell
@ 2019-07-11  3:27             ` Stephen Rothwell
  2019-07-11  5:40             ` Leon Romanovsky
  1 sibling, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-11  3:27 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

On Thu, 11 Jul 2019 13:16:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> On Thu, 11 Jul 2019 13:13:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 11 Jul 2019 02:26:27 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:  
> > >
> > > On Thu, Jul 11, 2019 at 11:50:54AM +1000, Stephen Rothwell wrote:
> > >     
> > > > So today this failed to build after I merged the rdma tree (previously
> > > > it didn;t until after the net-next tree was merged (I assume a
> > > > dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
> > > > in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
> > > > tree :-(      
> > > 
> > > ? I'm confused.. 
> > > 
> > > rdma.git builds fine stand alone (I hope!)    
> > 
> > I have "Fixup to build SIW issue" from Leon (which switches to using
> > in_dev_for_each_ifa_rcu) included in the rmda tree merge commit because
> > without that the rdma tree would not build for me.  Are you saying that
> > I don't need that at all, now?  
> 
> Actually , I get it now, "Fixup to build SIW issue" is really just a
> fixup for the net-next and rdma trees merge ... OK, I will fix that up
> tomorrow.  Sorry for my confusion.

Actually, I have rewound my tree and am starting from the merge of the
rdma tree again, so hopefully it should all be good today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  3:16           ` Stephen Rothwell
  2019-07-11  3:27             ` Stephen Rothwell
@ 2019-07-11  5:40             ` Leon Romanovsky
  1 sibling, 0 replies; 249+ messages in thread
From: Leon Romanovsky @ 2019-07-11  5:40 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Jason Gunthorpe, Bernard Metzler, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Jul 11, 2019 at 01:16:03PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 11 Jul 2019 13:13:44 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Thu, 11 Jul 2019 02:26:27 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
> > >
> > > On Thu, Jul 11, 2019 at 11:50:54AM +1000, Stephen Rothwell wrote:
> > >
> > > > So today this failed to build after I merged the rdma tree (previously
> > > > it didn;t until after the net-next tree was merged (I assume a
> > > > dependency changed).  It failed because in_dev_for_each_ifa_rcu (and
> > > > in_dev_for_each_ifa_rtnl) is only defined in a commit in the net-next
> > > > tree :-(
> > >
> > > ? I'm confused..
> > >
> > > rdma.git builds fine stand alone (I hope!)
> >
> > I have "Fixup to build SIW issue" from Leon (which switches to using
> > in_dev_for_each_ifa_rcu) included in the rmda tree merge commit because
> > without that the rdma tree would not build for me.  Are you saying that
> > I don't need that at all, now?
>
> Actually , I get it now, "Fixup to build SIW issue" is really just a
> fixup for the net-next and rdma trees merge ... OK, I will fix that up
> tomorrow.  Sorry for my confusion.

Yes, it was for build only.

>
> --
> Cheers,
> Stephen Rothwell



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

* Re:  Re: linux-next: build failure after merge of the net-next tree
  2019-07-09  6:43 ` Leon Romanovsky
  2019-07-10  4:31   ` Stephen Rothwell
  2019-07-10 17:52   ` Jason Gunthorpe
@ 2019-07-11  8:00   ` Bernard Metzler
  2019-07-11 11:52     ` Jason Gunthorpe
  2019-07-11 12:29     ` Bernard Metzler
  2 siblings, 2 replies; 249+ messages in thread
From: Bernard Metzler @ 2019-07-11  8:00 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Stephen Rothwell, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

-----"Jason Gunthorpe" <jgg@mellanox.com> wrote: -----

>To: "Leon Romanovsky" <leon@kernel.org>, "Bernard Metzler"
><bmt@zurich.ibm.com>
>From: "Jason Gunthorpe" <jgg@mellanox.com>
>Date: 07/10/2019 07:52PM
>Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>, "Doug Ledford"
><dledford@redhat.com>, "David Miller" <davem@davemloft.net>,
>"Networking" <netdev@vger.kernel.org>, "Linux Next Mailing List"
><linux-next@vger.kernel.org>, "Linux Kernel Mailing List"
><linux-kernel@vger.kernel.org>
>Subject: [EXTERNAL] Re: linux-next: build failure after merge of the
>net-next tree
>
>On Tue, Jul 09, 2019 at 09:43:46AM +0300, Leon Romanovsky wrote:
>> On Tue, Jul 09, 2019 at 01:56:36PM +1000, Stephen Rothwell wrote:
>> > Hi all,
>> >
>> > After merging the net-next tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>> >
>> > drivers/infiniband/sw/siw/siw_cm.c: In function
>'siw_create_listen':
>> > drivers/infiniband/sw/siw/siw_cm.c:1978:3: error: implicit
>declaration of function 'for_ifa'; did you mean 'fork_idle'?
>[-Werror=implicit-function-declaration]
>> >    for_ifa(in_dev)
>> >    ^~~~~~~
>> >    fork_idle
>> > drivers/infiniband/sw/siw/siw_cm.c:1978:18: error: expected ';'
>before '{' token
>> >    for_ifa(in_dev)
>> >                   ^
>> >                   ;
>> >    {
>> >    ~
>> >
>> > Caused by commit
>> >
>> >   6c52fdc244b5 ("rdma/siw: connection management")
>> >
>> > from the rdma tree.  I don't know why this didn't fail after I
>mereged
>> > that tree.
>> 
>> I had the same question, because I have this fix for a couple of
>days already.
>> 
>> From 56c9e15ec670af580daa8c3ffde9503af3042d67 Mon Sep 17 00:00:00
>2001
>> From: Leon Romanovsky <leonro@mellanox.com>
>> Date: Sun, 7 Jul 2019 10:43:42 +0300
>> Subject: [PATCH] Fixup to build SIW issue
>> 
>> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>>  drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
>> 
>> diff --git a/drivers/infiniband/sw/siw/siw_cm.c
>b/drivers/infiniband/sw/siw/siw_cm.c
>> index 8e618cb7261f..c883bf514341 100644
>> +++ b/drivers/infiniband/sw/siw/siw_cm.c
>> @@ -1954,6 +1954,7 @@ static void siw_drop_listeners(struct
>iw_cm_id *id)
>>  int siw_create_listen(struct iw_cm_id *id, int backlog)
>>  {
>>  	struct net_device *dev = to_siw_dev(id->device)->netdev;
>> +	const struct in_ifaddr *ifa;
>>  	int rv = 0, listeners = 0;
>> 
>>  	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
>> @@ -1975,8 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id,
>int backlog)
>>  			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
>>  			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
>> 
>> -		for_ifa(in_dev)
>> -		{
>> +		in_dev_for_each_ifa_rcu(ifa, in_dev) {
>>  			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
>
>Hum. There is no rcu lock held here and we can't use RCU anyhow as
>siw_listen_address will sleep.
>
>I think this needs to use rtnl, as below. Bernard, please urgently
>confirm. Thanks
>

Hi Jason,

That listen will not sleep. The socket is just marked
listening. Accepting a new connection is handled asynchronously
by a work handler, kicked by a socket callback
(siw_cm_llp_state_change).

But, I think you are correct, we are missing the
rcu_read_lock/unlock around that iteration. Could we please add
that (see below)?

Thanks very much!
Bernard.

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index c883bf514341..c5c060103993 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1976,6 +1976,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
                        id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
                        &s_raddr->sin_addr, ntohs(s_raddr->sin_port));
 
+               rcu_read_lock();
                in_dev_for_each_ifa_rcu(ifa, in_dev) {
                        if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
                            s_laddr.sin_addr.s_addr == ifa->ifa_address) {
@@ -1988,6 +1989,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
                                        listeners++;
                        }
                }
+               rcu_read_unlock();
                in_dev_put(in_dev);
        } else if (id->local_addr.ss_family == AF_INET6) {
                struct inet6_dev *in6_dev = in6_dev_get(dev);



>diff --git a/drivers/infiniband/sw/siw/siw_cm.c
>b/drivers/infiniband/sw/siw/siw_cm.c
>index 8e618cb7261f62..ee98e96a5bfaba 100644
>--- a/drivers/infiniband/sw/siw/siw_cm.c
>+++ b/drivers/infiniband/sw/siw/siw_cm.c
>@@ -1965,6 +1965,7 @@ int siw_create_listen(struct iw_cm_id *id, int
>backlog)
> 	 */
> 	if (id->local_addr.ss_family == AF_INET) {
> 		struct in_device *in_dev = in_dev_get(dev);
>+		const struct in_ifaddr *ifa;
> 		struct sockaddr_in s_laddr, *s_raddr;
> 
> 		memcpy(&s_laddr, &id->local_addr, sizeof(s_laddr));
>@@ -1975,8 +1976,8 @@ int siw_create_listen(struct iw_cm_id *id, int
>backlog)
> 			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
> 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
> 
>-		for_ifa(in_dev)
>-		{
>+		rtnl_lock();
>+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
> 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
> 			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
> 				s_laddr.sin_addr.s_addr = ifa->ifa_address;
>@@ -1988,7 +1989,7 @@ int siw_create_listen(struct iw_cm_id *id, int
>backlog)
> 					listeners++;
> 			}
> 		}
>-		endfor_ifa(in_dev);
>+		rtnl_unlock();
> 		in_dev_put(in_dev);
> 	} else if (id->local_addr.ss_family == AF_INET6) {
> 		struct inet6_dev *in6_dev = in6_dev_get(dev);
>
>


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

* Re: Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  8:00   ` Bernard Metzler
@ 2019-07-11 11:52     ` Jason Gunthorpe
  2019-07-11 12:29     ` Bernard Metzler
  1 sibling, 0 replies; 249+ messages in thread
From: Jason Gunthorpe @ 2019-07-11 11:52 UTC (permalink / raw)
  To: Bernard Metzler
  Cc: Leon Romanovsky, Stephen Rothwell, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Jul 11, 2019 at 08:00:49AM +0000, Bernard Metzler wrote:

> That listen will not sleep. The socket is just marked
> listening. 

Eh? siw_listen_address() calls siw_cep_alloc() which does:

	struct siw_cep *cep = kzalloc(sizeof(*cep), GFP_KERNEL);

Which is sleeping. Many other cases too.

Jason

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

* Re:  Re: Re: linux-next: build failure after merge of the net-next tree
  2019-07-11  8:00   ` Bernard Metzler
  2019-07-11 11:52     ` Jason Gunthorpe
@ 2019-07-11 12:29     ` Bernard Metzler
  2019-07-11 14:33       ` Jason Gunthorpe
  1 sibling, 1 reply; 249+ messages in thread
From: Bernard Metzler @ 2019-07-11 12:29 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Leon Romanovsky, Stephen Rothwell, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

-----"Jason Gunthorpe" <jgg@mellanox.com> wrote: -----

>To: "Bernard Metzler" <BMT@zurich.ibm.com>
>From: "Jason Gunthorpe" <jgg@mellanox.com>
>Date: 07/11/2019 01:53PM
>Cc: "Leon Romanovsky" <leon@kernel.org>, "Stephen Rothwell"
><sfr@canb.auug.org.au>, "Doug Ledford" <dledford@redhat.com>, "David
>Miller" <davem@davemloft.net>, "Networking" <netdev@vger.kernel.org>,
>"Linux Next Mailing List" <linux-next@vger.kernel.org>, "Linux Kernel
>Mailing List" <linux-kernel@vger.kernel.org>
>Subject: [EXTERNAL] Re: Re: linux-next: build failure after merge of
>the net-next tree
>
>On Thu, Jul 11, 2019 at 08:00:49AM +0000, Bernard Metzler wrote:
>
>> That listen will not sleep. The socket is just marked
>> listening. 
>
>Eh? siw_listen_address() calls siw_cep_alloc() which does:
>
>	struct siw_cep *cep = kzalloc(sizeof(*cep), GFP_KERNEL);
>
>Which is sleeping. Many other cases too.
>
>Jason
>
>
Ah, true! I was after really deep sleeps like user level
socket accept() calls ;) So you are correct of course.

Thanks!
Bernard


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

* Re: Re: Re: linux-next: build failure after merge of the net-next tree
  2019-07-11 12:29     ` Bernard Metzler
@ 2019-07-11 14:33       ` Jason Gunthorpe
  2019-07-12  1:45         ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Jason Gunthorpe @ 2019-07-11 14:33 UTC (permalink / raw)
  To: Bernard Metzler
  Cc: Leon Romanovsky, Stephen Rothwell, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

On Thu, Jul 11, 2019 at 12:29:21PM +0000, Bernard Metzler wrote:
> 
> >To: "Bernard Metzler" <BMT@zurich.ibm.com>
> >From: "Jason Gunthorpe" <jgg@mellanox.com>
> >Date: 07/11/2019 01:53PM
> >Cc: "Leon Romanovsky" <leon@kernel.org>, "Stephen Rothwell"
> ><sfr@canb.auug.org.au>, "Doug Ledford" <dledford@redhat.com>, "David
> >Miller" <davem@davemloft.net>, "Networking" <netdev@vger.kernel.org>,
> >"Linux Next Mailing List" <linux-next@vger.kernel.org>, "Linux Kernel
> >Mailing List" <linux-kernel@vger.kernel.org>
> >Subject: [EXTERNAL] Re: Re: linux-next: build failure after merge of
> >the net-next tree
> >
> >On Thu, Jul 11, 2019 at 08:00:49AM +0000, Bernard Metzler wrote:
> >
> >> That listen will not sleep. The socket is just marked
> >> listening. 
> >
> >Eh? siw_listen_address() calls siw_cep_alloc() which does:
> >
> >	struct siw_cep *cep = kzalloc(sizeof(*cep), GFP_KERNEL);
> >
> >Which is sleeping. Many other cases too.
> >
> >Jason
> >
> >
> Ah, true! I was after really deep sleeps like user level
> socket accept() calls ;) So you are correct of course.

I've added this patch to the rdma tree to fix the missing locking.

The merge resolution will be simply swapping
for_ifa to in_dev_for_each_ifa_rtnl.

Jason

From c421651fa2295d1219c36674c7eb8c574542ceea Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgg@mellanox.com>
Date: Thu, 11 Jul 2019 11:29:42 -0300
Subject: [PATCH] RDMA/siw: Add missing rtnl_lock around access to ifa

ifa is protected by rcu or rtnl, add the missing locking. In this case we
have to use rtnl since siw_listen_address() is sleeping.

Fixes: 6c52fdc244b5 ("rdma/siw: connection management")
Reviewed-by: Bernard Metzler <bmt@zurich.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---
 drivers/infiniband/sw/siw/siw_cm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 8e618cb7261f62..c25be723c15b64 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1975,6 +1975,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 			id, &s_laddr.sin_addr, ntohs(s_laddr.sin_port),
 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
 
+		rtnl_lock();
 		for_ifa(in_dev)
 		{
 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
@@ -1989,6 +1990,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 			}
 		}
 		endfor_ifa(in_dev);
+		rtnl_unlock();
 		in_dev_put(in_dev);
 	} else if (id->local_addr.ss_family == AF_INET6) {
 		struct inet6_dev *in6_dev = in6_dev_get(dev);
-- 
2.21.0


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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-11 14:33       ` Jason Gunthorpe
@ 2019-07-12  1:45         ` Stephen Rothwell
  2019-07-12 15:21           ` Jason Gunthorpe
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-12  1:45 UTC (permalink / raw)
  To: Jason Gunthorpe
  Cc: Bernard Metzler, Leon Romanovsky, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

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

Hi Jason,

On Thu, 11 Jul 2019 14:33:07 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
>
> I've added this patch to the rdma tree to fix the missing locking.
> 
> The merge resolution will be simply swapping
> for_ifa to in_dev_for_each_ifa_rtnl.

OK, I added the below merge resolution patch to the merge of the rdma
tree today (since Linus' has merged the net-next tree now).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Jul 2019 11:28:30 +1000
Subject: [PATCH] RDMA: fix for removal of for_ifa()

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/infiniband/sw/siw/siw_cm.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c
index 43f7f12e5f7f..cbea46ff6dd1 100644
--- a/drivers/infiniband/sw/siw/siw_cm.c
+++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -1951,6 +1951,7 @@ static void siw_drop_listeners(struct iw_cm_id *id)
 int siw_create_listen(struct iw_cm_id *id, int backlog)
 {
 	struct net_device *dev = to_siw_dev(id->device)->netdev;
+	const struct in_ifaddr *ifa;
 	int rv = 0, listeners = 0;
 
 	siw_dbg(id->device, "id 0x%p: backlog %d\n", id, backlog);
@@ -1973,8 +1974,7 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 			&s_raddr->sin_addr, ntohs(s_raddr->sin_port));
 
 		rtnl_lock();
-		for_ifa(in_dev)
-		{
+		in_dev_for_each_ifa_rtnl(ifa, in_dev) {
 			if (ipv4_is_zeronet(s_laddr.sin_addr.s_addr) ||
 			    s_laddr.sin_addr.s_addr == ifa->ifa_address) {
 				s_laddr.sin_addr.s_addr = ifa->ifa_address;
@@ -1986,7 +1986,6 @@ int siw_create_listen(struct iw_cm_id *id, int backlog)
 					listeners++;
 			}
 		}
-		endfor_ifa(in_dev);
 		rtnl_unlock();
 		in_dev_put(in_dev);
 	} else if (id->local_addr.ss_family == AF_INET6) {
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-07-12  1:45         ` Stephen Rothwell
@ 2019-07-12 15:21           ` Jason Gunthorpe
  0 siblings, 0 replies; 249+ messages in thread
From: Jason Gunthorpe @ 2019-07-12 15:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bernard Metzler, Leon Romanovsky, Doug Ledford, David Miller,
	Networking, Linux Next Mailing List, Linux Kernel Mailing List

On Fri, Jul 12, 2019 at 11:45:57AM +1000, Stephen Rothwell wrote:
> Hi Jason,
> 
> On Thu, 11 Jul 2019 14:33:07 +0000 Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > I've added this patch to the rdma tree to fix the missing locking.
> > 
> > The merge resolution will be simply swapping
> > for_ifa to in_dev_for_each_ifa_rtnl.
> 
> OK, I added the below merge resolution patch to the merge of the rdma
> tree today (since Linus' has merged the net-next tree now).

Yes, this is what I'm planning on using

Thanks,
Jason

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-11-05 13:50 ` Andrew Lunn
@ 2019-11-05 14:22   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-11-05 14:22 UTC (permalink / raw)
  To: Andrew Lunn
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List

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

Hi Andrew,

On Tue, 5 Nov 2019 14:50:54 +0100 Andrew Lunn <andrew@lunn.ch> wrote:
>
> On Tue, Nov 05, 2019 at 07:53:41PM +1100, Stephen Rothwell wrote:
> > 
> > After merging the net-next tree, today's linux-next build (powepc
> > ppc44x_defconfig) failed like this:
> > 
> > 

Sorry about leaving the error out :-(

> > Caused by commit
> > 
> >   0c65b2b90d13 ("net: of_get_phy_mode: Change API to solve int/unit warnings")
> > 
> > I applied the following patch, but there is probably a nicer and more
> > complete way to fix this.  
> 
> I just received the 0-day about this. I did not know David had merged
> it!
> 
> What you have works. So:
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> 
> The nicer way is a bit bigger. Is this too big to go in via you?
> Should i submit it via netdev, and you can drop your fix once this
> arrives?

via Dave, thanks.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-11-05  8:53 Stephen Rothwell
@ 2019-11-05 13:50 ` Andrew Lunn
  2019-11-05 14:22   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Andrew Lunn @ 2019-11-05 13:50 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List

On Tue, Nov 05, 2019 at 07:53:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powepc
> ppc44x_defconfig) failed like this:
> 
> 
> Caused by commit
> 
>   0c65b2b90d13 ("net: of_get_phy_mode: Change API to solve int/unit warnings")
> 
> I applied the following patch, but there is probably a nicer and more
> complete way to fix this.

Hi Stephen

I just received the 0-day about this. I did not know David had merged
it!

What you have works. So:

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

The nicer way is a bit bigger. Is this too big to go in via you?
Should i submit it via netdev, and you can drop your fix once this
arrives?

	Andrew

rom e4a023829b53e2a918df8d8486c65c3650af0690 Mon Sep 17 00:00:00 2001
From: Andrew Lunn <andrew@lunn.ch>
Date: Tue, 5 Nov 2019 07:43:53 -0600
Subject: [PATCH] net: ethernet: emac: Fix phy mode type

Pass a phy_interface_t to of_get_phy_mode(), by changing the type of
phy_mode in the device structure. This then requires that
zmii_attach() is also changes, since it takes a pointer to phy_mode.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/ethernet/ibm/emac/core.h | 2 +-
 drivers/net/ethernet/ibm/emac/zmii.c | 3 ++-
 drivers/net/ethernet/ibm/emac/zmii.h | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ibm/emac/core.h b/drivers/net/ethernet/ibm/emac/core.h
index e9cda024cbf6..89a1b0fea158 100644
--- a/drivers/net/ethernet/ibm/emac/core.h
+++ b/drivers/net/ethernet/ibm/emac/core.h
@@ -171,7 +171,7 @@ struct emac_instance {
        struct mal_commac               commac;
 
        /* PHY infos */
-       int                             phy_mode;
+       phy_interface_t                 phy_mode;
        u32                             phy_map;
        u32                             phy_address;
        u32                             phy_feat_exc;
diff --git a/drivers/net/ethernet/ibm/emac/zmii.c b/drivers/net/ethernet/ibm/emac/zmii.c
index b9e821de2ac6..57a25c7a9e70 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.c
+++ b/drivers/net/ethernet/ibm/emac/zmii.c
@@ -78,7 +78,8 @@ static inline u32 zmii_mode_mask(int mode, int input)
        }
 }
 
-int zmii_attach(struct platform_device *ofdev, int input, int *mode)
+int zmii_attach(struct platform_device *ofdev, int input,
+               phy_interface_t *mode)
 {
        struct zmii_instance *dev = platform_get_drvdata(ofdev);
        struct zmii_regs __iomem *p = dev->base;
diff --git a/drivers/net/ethernet/ibm/emac/zmii.h b/drivers/net/ethernet/ibm/emac/zmii.h
index 41d46e9b87ba..65daedc78594 100644
--- a/drivers/net/ethernet/ibm/emac/zmii.h
+++ b/drivers/net/ethernet/ibm/emac/zmii.h
@@ -50,7 +50,8 @@ struct zmii_instance {
 
 int zmii_init(void);
 void zmii_exit(void);
-int zmii_attach(struct platform_device *ofdev, int input, int *mode);
+int zmii_attach(struct platform_device *ofdev, int input,
+               phy_interface_t *mode);
 void zmii_detach(struct platform_device *ofdev, int input);
 void zmii_get_mdio(struct platform_device *ofdev, int input);
 void zmii_put_mdio(struct platform_device *ofdev, int input);
-- 
2.24.0.rc0

    Andrew

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

* linux-next: build failure after merge of the net-next tree
@ 2019-11-05  8:53 Stephen Rothwell
  2019-11-05 13:50 ` Andrew Lunn
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-11-05  8:53 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Andrew Lunn

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

Hi all,

After merging the net-next tree, today's linux-next build (powepc
ppc44x_defconfig) failed like this:


Caused by commit

  0c65b2b90d13 ("net: of_get_phy_mode: Change API to solve int/unit warnings")

I applied the following patch, but there is probably a nicer and more
complete way to fix this.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Nov 2019 19:49:55 +1100
Subject: [PATCH] fix up for "net: of_get_phy_mode: Change API to solve int/unit warnings"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/ibm/emac/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 2e40425d8a34..8cb682754bd4 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2850,6 +2850,7 @@ static int emac_init_config(struct emac_instance *dev)
 	struct device_node *np = dev->ofdev->dev.of_node;
 	const void *p;
 	int err;
+	phy_interface_t phy_mode;
 
 	/* Read config from device-tree */
 	if (emac_read_uint_prop(np, "mal-device", &dev->mal_ph, 1))
@@ -2898,9 +2899,11 @@ static int emac_init_config(struct emac_instance *dev)
 		dev->mal_burst_size = 256;
 
 	/* PHY mode needs some decoding */
-	err = of_get_phy_mode(np, &dev->phy_mode);
+	err = of_get_phy_mode(np, &phy_mode);
 	if (err)
 		dev->phy_mode = PHY_INTERFACE_MODE_NA;
+	else
+		dev->phy_mode = phy_mode;
 
 	/* Check EMAC version */
 	if (of_device_is_compatible(np, "ibm,emac4sync")) {
-- 
2.23.0

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-09-06  2:52     ` Masahiro Yamada
@ 2019-09-06  9:02       ` Andrii Nakryiko
  0 siblings, 0 replies; 249+ messages in thread
From: Andrii Nakryiko @ 2019-09-06  9:02 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: Stephen Rothwell, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Andrii Nakryiko, Daniel Borkmann, Alexei Starovoitov

On Thu, Sep 5, 2019 at 7:53 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> On Fri, Sep 6, 2019 at 4:26 AM Andrii Nakryiko
> <andrii.nakryiko@gmail.com> wrote:
> >
> > On Tue, Sep 3, 2019 at 11:20 PM Masahiro Yamada
> > <yamada.masahiro@socionext.com> wrote:
> > >
> > > On Wed, Sep 4, 2019 at 3:00 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > After merging the net-next tree, today's linux-next build (arm
> > > > multi_v7_defconfig) failed like this:
> > > >
> > > > scripts/link-vmlinux.sh: 74: Bad substitution
> > > >
> > > > Caused by commit
> > > >
> > > >   341dfcf8d78e ("btf: expose BTF info through sysfs")
> > > >
> > > > interacting with commit
> > > >
> > > >   1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")
> > > >
> > > > from the kbuild tree.
> > >
> > >
> > > I knew that they were using bash-extension
> > > in the #!/bin/sh script.  :-D
> > >
> > > In fact, I wrote my patch in order to break their code
> > > and  make btf people realize that they were doing wrong.
> >
> > Was there a specific reason to wait until this would break during
> > Stephen's merge, instead of giving me a heads up (or just replying on
> > original patch) and letting me fix it and save everyone's time and
> > efforts?
> >
> > Either way, I've fixed the issue in
> > https://patchwork.ozlabs.org/patch/1158620/ and will pay way more
> > attention to BASH-specific features going forward (I found it pretty
> > hard to verify stuff like this, unfortunately). But again, code review
> > process is the best place to catch this and I really hope in the
> > future we can keep this process productive. Thanks!
>
> I could have pointed it out if I had noticed
> it in the review process.
>
> I actually noticed your patch by Stephen's
> former email.  (i.e. when it appeared in linux-next)
>
> (I try my best to check kbuild ML, and also search for
> my name in LKML in case I am explicitly addressed,
> but a large number of emails fall off my filter)
>
> It was somewhat too late when I noticed it.
> Of course, I still could email you afterward, or even send a patch to btf ML,
> but I did not fix a particular instance of breakage
> because there are already the same type of breakages in code base.
>
> Then, I applied the all-or-nothing checker because I thought it was
> the only way to address the root cause of the problems.
>
> I admit I could have done the process better.
> Sorry if I made people uncomfortable and waste time.

No worries. Thanks for candid answer. I just wanted to make sure there
are no hard feelings and I can engage your expertise effectively in
the future for kbuild stuff to ensure issues like this don't slip
through, if we ever have to do anything like this for BPF-related
things again. I'll keep CC'ing you and will add kbuild ML as well.
Thanks!

>
> Thanks.
>
>
>
>
> > >
> > >
> > >
> > > > The change in the net-next tree turned link-vmlinux.sh into a bash script
> > > > (I think).
> > > >
> > > > I have applied the following patch for today:
> > >
> > >
> > > But, this is a temporary fix only for linux-next.
> > >
> > > scripts/link-vmlinux.sh does not need to use the
> > > bash-extension ${@:2} in the first place.
> > >
> > > I hope btf people will write the correct code.
> >
> > I replaced ${@:2} with shift and ${@}, I hope that's a correct fix,
> > but if you think it's not, please reply on the patch and let me know.
> >
> >
> > >
> > > Thanks.
> > >
> > >
> > >
> > >
> > > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > Date: Wed, 4 Sep 2019 15:43:41 +1000
> > > > Subject: [PATCH] link-vmlinux.sh is now a bash script
> > > >
> > > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > > ---
> > > >  Makefile                | 4 ++--
> > > >  scripts/link-vmlinux.sh | 2 +-
> > > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > > >
> > > > diff --git a/Makefile b/Makefile
> > > > index ac97fb282d99..523d12c5cebe 100644
> > > > --- a/Makefile
> > > > +++ b/Makefile
> > > > @@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
> > > >
> > > >  # Final link of vmlinux with optional arch pass after final link
> > > >  cmd_link-vmlinux =                                                 \
> > > > -       $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> > > > +       $(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> > > >         $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
> > > >
> > > >  vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
> > > > @@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
> > > >  PHONY += archclean vmlinuxclean
> > > >
> > > >  vmlinuxclean:
> > > > -       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
> > > > +       $(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
> > > >         $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
> > > >
> > > >  clean: archclean vmlinuxclean
> > > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> > > > index f7edb75f9806..ea1f8673869d 100755
> > > > --- a/scripts/link-vmlinux.sh
> > > > +++ b/scripts/link-vmlinux.sh
> > > > @@ -1,4 +1,4 @@
> > > > -#!/bin/sh
> > > > +#!/bin/bash
> > > >  # SPDX-License-Identifier: GPL-2.0
> > > >  #
> > > >  # link vmlinux
> > > > --
> > > > 2.23.0.rc1
> > > >
> > > > --
> > > > Cheers,
> > > > Stephen Rothwell
> > >
> > >
> > >
> > > --
> > > Best Regards
> > > Masahiro Yamada
>
>
>
> --
> Best Regards
> Masahiro Yamada

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-09-05 19:26   ` Andrii Nakryiko
@ 2019-09-06  2:52     ` Masahiro Yamada
  2019-09-06  9:02       ` Andrii Nakryiko
  0 siblings, 1 reply; 249+ messages in thread
From: Masahiro Yamada @ 2019-09-06  2:52 UTC (permalink / raw)
  To: Andrii Nakryiko
  Cc: Stephen Rothwell, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Andrii Nakryiko, Daniel Borkmann, Alexei Starovoitov

On Fri, Sep 6, 2019 at 4:26 AM Andrii Nakryiko
<andrii.nakryiko@gmail.com> wrote:
>
> On Tue, Sep 3, 2019 at 11:20 PM Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
> >
> > On Wed, Sep 4, 2019 at 3:00 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > Hi all,
> > >
> > > After merging the net-next tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > >
> > > scripts/link-vmlinux.sh: 74: Bad substitution
> > >
> > > Caused by commit
> > >
> > >   341dfcf8d78e ("btf: expose BTF info through sysfs")
> > >
> > > interacting with commit
> > >
> > >   1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")
> > >
> > > from the kbuild tree.
> >
> >
> > I knew that they were using bash-extension
> > in the #!/bin/sh script.  :-D
> >
> > In fact, I wrote my patch in order to break their code
> > and  make btf people realize that they were doing wrong.
>
> Was there a specific reason to wait until this would break during
> Stephen's merge, instead of giving me a heads up (or just replying on
> original patch) and letting me fix it and save everyone's time and
> efforts?
>
> Either way, I've fixed the issue in
> https://patchwork.ozlabs.org/patch/1158620/ and will pay way more
> attention to BASH-specific features going forward (I found it pretty
> hard to verify stuff like this, unfortunately). But again, code review
> process is the best place to catch this and I really hope in the
> future we can keep this process productive. Thanks!

I could have pointed it out if I had noticed
it in the review process.

I actually noticed your patch by Stephen's
former email.  (i.e. when it appeared in linux-next)

(I try my best to check kbuild ML, and also search for
my name in LKML in case I am explicitly addressed,
but a large number of emails fall off my filter)

It was somewhat too late when I noticed it.
Of course, I still could email you afterward, or even send a patch to btf ML,
but I did not fix a particular instance of breakage
because there are already the same type of breakages in code base.

Then, I applied the all-or-nothing checker because I thought it was
the only way to address the root cause of the problems.

I admit I could have done the process better.
Sorry if I made people uncomfortable and waste time.

Thanks.




> >
> >
> >
> > > The change in the net-next tree turned link-vmlinux.sh into a bash script
> > > (I think).
> > >
> > > I have applied the following patch for today:
> >
> >
> > But, this is a temporary fix only for linux-next.
> >
> > scripts/link-vmlinux.sh does not need to use the
> > bash-extension ${@:2} in the first place.
> >
> > I hope btf people will write the correct code.
>
> I replaced ${@:2} with shift and ${@}, I hope that's a correct fix,
> but if you think it's not, please reply on the patch and let me know.
>
>
> >
> > Thanks.
> >
> >
> >
> >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 4 Sep 2019 15:43:41 +1000
> > > Subject: [PATCH] link-vmlinux.sh is now a bash script
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  Makefile                | 4 ++--
> > >  scripts/link-vmlinux.sh | 2 +-
> > >  2 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/Makefile b/Makefile
> > > index ac97fb282d99..523d12c5cebe 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
> > >
> > >  # Final link of vmlinux with optional arch pass after final link
> > >  cmd_link-vmlinux =                                                 \
> > > -       $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> > > +       $(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> > >         $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
> > >
> > >  vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
> > > @@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
> > >  PHONY += archclean vmlinuxclean
> > >
> > >  vmlinuxclean:
> > > -       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
> > > +       $(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
> > >         $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
> > >
> > >  clean: archclean vmlinuxclean
> > > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> > > index f7edb75f9806..ea1f8673869d 100755
> > > --- a/scripts/link-vmlinux.sh
> > > +++ b/scripts/link-vmlinux.sh
> > > @@ -1,4 +1,4 @@
> > > -#!/bin/sh
> > > +#!/bin/bash
> > >  # SPDX-License-Identifier: GPL-2.0
> > >  #
> > >  # link vmlinux
> > > --
> > > 2.23.0.rc1
> > >
> > > --
> > > Cheers,
> > > Stephen Rothwell
> >
> >
> >
> > --
> > Best Regards
> > Masahiro Yamada



--
Best Regards
Masahiro Yamada

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-09-04  6:18 ` Masahiro Yamada
@ 2019-09-05 19:26   ` Andrii Nakryiko
  2019-09-06  2:52     ` Masahiro Yamada
  0 siblings, 1 reply; 249+ messages in thread
From: Andrii Nakryiko @ 2019-09-05 19:26 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: Stephen Rothwell, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List,
	Andrii Nakryiko, Daniel Borkmann, Alexei Starovoitov

On Tue, Sep 3, 2019 at 11:20 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> On Wed, Sep 4, 2019 at 3:00 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the net-next tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > scripts/link-vmlinux.sh: 74: Bad substitution
> >
> > Caused by commit
> >
> >   341dfcf8d78e ("btf: expose BTF info through sysfs")
> >
> > interacting with commit
> >
> >   1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")
> >
> > from the kbuild tree.
>
>
> I knew that they were using bash-extension
> in the #!/bin/sh script.  :-D
>
> In fact, I wrote my patch in order to break their code
> and  make btf people realize that they were doing wrong.

Was there a specific reason to wait until this would break during
Stephen's merge, instead of giving me a heads up (or just replying on
original patch) and letting me fix it and save everyone's time and
efforts?

Either way, I've fixed the issue in
https://patchwork.ozlabs.org/patch/1158620/ and will pay way more
attention to BASH-specific features going forward (I found it pretty
hard to verify stuff like this, unfortunately). But again, code review
process is the best place to catch this and I really hope in the
future we can keep this process productive. Thanks!

>
>
>
> > The change in the net-next tree turned link-vmlinux.sh into a bash script
> > (I think).
> >
> > I have applied the following patch for today:
>
>
> But, this is a temporary fix only for linux-next.
>
> scripts/link-vmlinux.sh does not need to use the
> bash-extension ${@:2} in the first place.
>
> I hope btf people will write the correct code.

I replaced ${@:2} with shift and ${@}, I hope that's a correct fix,
but if you think it's not, please reply on the patch and let me know.


>
> Thanks.
>
>
>
>
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 4 Sep 2019 15:43:41 +1000
> > Subject: [PATCH] link-vmlinux.sh is now a bash script
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  Makefile                | 4 ++--
> >  scripts/link-vmlinux.sh | 2 +-
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index ac97fb282d99..523d12c5cebe 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
> >
> >  # Final link of vmlinux with optional arch pass after final link
> >  cmd_link-vmlinux =                                                 \
> > -       $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> > +       $(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> >         $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
> >
> >  vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
> > @@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
> >  PHONY += archclean vmlinuxclean
> >
> >  vmlinuxclean:
> > -       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
> > +       $(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
> >         $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
> >
> >  clean: archclean vmlinuxclean
> > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> > index f7edb75f9806..ea1f8673869d 100755
> > --- a/scripts/link-vmlinux.sh
> > +++ b/scripts/link-vmlinux.sh
> > @@ -1,4 +1,4 @@
> > -#!/bin/sh
> > +#!/bin/bash
> >  # SPDX-License-Identifier: GPL-2.0
> >  #
> >  # link vmlinux
> > --
> > 2.23.0.rc1
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
>
>
> --
> Best Regards
> Masahiro Yamada

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-09-04  6:00 Stephen Rothwell
  2019-09-04  6:18 ` Masahiro Yamada
@ 2019-09-04  8:18 ` Andrii Nakryiko
  1 sibling, 0 replies; 249+ messages in thread
From: Andrii Nakryiko @ 2019-09-04  8:18 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Daniel Borkmann

On 9/3/19 11:00 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> scripts/link-vmlinux.sh: 74: Bad substitution
> 
> Caused by commit
> 
>    341dfcf8d78e ("btf: expose BTF info through sysfs")
> 
> interacting with commit
> 
>    1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")
> 
> from the kbuild tree.
> 
> The change in the net-next tree turned link-vmlinux.sh into a bash script
> (I think).

Hi Stephen,

Sorry about this breakage. Indeed, ${@:2} is BASH-specific extension, 
unfortunately. I'm verifying a simple fix with shift and $@, I'll post 
and CC you as soon as I've verified everything.

With that your temporary fix shouldn't be necessary.

> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Sep 2019 15:43:41 +1000
> Subject: [PATCH] link-vmlinux.sh is now a bash script
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   Makefile                | 4 ++--
>   scripts/link-vmlinux.sh | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index ac97fb282d99..523d12c5cebe 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
>   
>   # Final link of vmlinux with optional arch pass after final link
>   cmd_link-vmlinux =                                                 \
> -	$(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> +	$(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
>   	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
>   
>   vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
> @@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
>   PHONY += archclean vmlinuxclean
>   
>   vmlinuxclean:
> -	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
> +	$(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
>   	$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
>   
>   clean: archclean vmlinuxclean
> diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> index f7edb75f9806..ea1f8673869d 100755
> --- a/scripts/link-vmlinux.sh
> +++ b/scripts/link-vmlinux.sh
> @@ -1,4 +1,4 @@
> -#!/bin/sh
> +#!/bin/bash
>   # SPDX-License-Identifier: GPL-2.0
>   #
>   # link vmlinux
> 


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

* Re: linux-next: build failure after merge of the net-next tree
  2019-09-04  6:00 Stephen Rothwell
@ 2019-09-04  6:18 ` Masahiro Yamada
  2019-09-05 19:26   ` Andrii Nakryiko
  2019-09-04  8:18 ` Andrii Nakryiko
  1 sibling, 1 reply; 249+ messages in thread
From: Masahiro Yamada @ 2019-09-04  6:18 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Andrii Nakryiko, Daniel Borkmann

On Wed, Sep 4, 2019 at 3:00 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> scripts/link-vmlinux.sh: 74: Bad substitution
>
> Caused by commit
>
>   341dfcf8d78e ("btf: expose BTF info through sysfs")
>
> interacting with commit
>
>   1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")
>
> from the kbuild tree.


I knew that they were using bash-extension
in the #!/bin/sh script.  :-D


In fact, I wrote my patch in order to break their code
and  make btf people realize that they were doing wrong.



> The change in the net-next tree turned link-vmlinux.sh into a bash script
> (I think).
>
> I have applied the following patch for today:


But, this is a temporary fix only for linux-next.

scripts/link-vmlinux.sh does not need to use the
bash-extension ${@:2} in the first place.

I hope btf people will write the correct code.

Thanks.




> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Sep 2019 15:43:41 +1000
> Subject: [PATCH] link-vmlinux.sh is now a bash script
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Makefile                | 4 ++--
>  scripts/link-vmlinux.sh | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index ac97fb282d99..523d12c5cebe 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
>
>  # Final link of vmlinux with optional arch pass after final link
>  cmd_link-vmlinux =                                                 \
> -       $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
> +       $(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
>         $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
>
>  vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
> @@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
>  PHONY += archclean vmlinuxclean
>
>  vmlinuxclean:
> -       $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
> +       $(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
>         $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
>
>  clean: archclean vmlinuxclean
> diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
> index f7edb75f9806..ea1f8673869d 100755
> --- a/scripts/link-vmlinux.sh
> +++ b/scripts/link-vmlinux.sh
> @@ -1,4 +1,4 @@
> -#!/bin/sh
> +#!/bin/bash
>  # SPDX-License-Identifier: GPL-2.0
>  #
>  # link vmlinux
> --
> 2.23.0.rc1
>
> --
> Cheers,
> Stephen Rothwell



--
Best Regards
Masahiro Yamada

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

* linux-next: build failure after merge of the net-next tree
@ 2019-09-04  6:00 Stephen Rothwell
  2019-09-04  6:18 ` Masahiro Yamada
  2019-09-04  8:18 ` Andrii Nakryiko
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-09-04  6:00 UTC (permalink / raw)
  To: David Miller, Networking, Masahiro Yamada
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Andrii Nakryiko, Daniel Borkmann

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

Hi all,

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

scripts/link-vmlinux.sh: 74: Bad substitution

Caused by commit

  341dfcf8d78e ("btf: expose BTF info through sysfs")

interacting with commit

  1267f9d3047d ("kbuild: add $(BASH) to run scripts with bash-extension")

from the kbuild tree.

The change in the net-next tree turned link-vmlinux.sh into a bash script
(I think).

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Sep 2019 15:43:41 +1000
Subject: [PATCH] link-vmlinux.sh is now a bash script

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Makefile                | 4 ++--
 scripts/link-vmlinux.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ac97fb282d99..523d12c5cebe 100644
--- a/Makefile
+++ b/Makefile
@@ -1087,7 +1087,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
 
 # Final link of vmlinux with optional arch pass after final link
 cmd_link-vmlinux =                                                 \
-	$(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
+	$(BASH) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \
 	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
 
 vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE
@@ -1403,7 +1403,7 @@ clean: rm-files := $(CLEAN_FILES)
 PHONY += archclean vmlinuxclean
 
 vmlinuxclean:
-	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean
+	$(Q)$(BASH) $(srctree)/scripts/link-vmlinux.sh clean
 	$(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean)
 
 clean: archclean vmlinuxclean
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index f7edb75f9806..ea1f8673869d 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # SPDX-License-Identifier: GPL-2.0
 #
 # link vmlinux
-- 
2.23.0.rc1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-08-29 10:05 Stephen Rothwell
@ 2019-08-30 21:35 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2019-08-30 21:35 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, weifeng.voon, boon.leong.ong

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2019 20:05:46 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 Aug 2019 19:49:27 +1000
> Subject: [PATCH] net: stmmac: depend on COMMON_CLK
> 
> Fixes: 190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied.

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

* linux-next: build failure after merge of the net-next tree
@ 2019-08-29 10:05 Stephen Rothwell
  2019-08-30 21:35 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-08-29 10:05 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Voon Weifeng,
	Ong Boon Leong

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

Hi all,

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

ld: drivers/net/ethernet/stmicro/stmmac/stmmac_pci.o: in function `.stmmac_pci_remove':
stmmac_pci.c:(.text.stmmac_pci_remove+0x68): undefined reference to `.clk_unregister_fixed_rate'
ld: drivers/net/ethernet/stmicro/stmmac/stmmac_pci.o: in function `.intel_mgbe_common_data':
stmmac_pci.c:(.text.intel_mgbe_common_data+0x2a8): undefined reference to `.clk_register_fixed_rate'

Caused by commit

  190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")

CONFIG_COMMON_CLK is not set for this build.

I have added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2019 19:49:27 +1000
Subject: [PATCH] net: stmmac: depend on COMMON_CLK

Fixes: 190f73ab4c43 ("net: stmmac: setup higher frequency clk support for EHL & TGL")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 2325b40dff6e..338e25a6374e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -200,6 +200,7 @@ endif
 config STMMAC_PCI
 	tristate "STMMAC PCI bus support"
 	depends on STMMAC_ETH && PCI
+	depends on COMMON_CLK
 	---help---
 	  This selects the platform specific bus support for the stmmac driver.
 	  This driver was tested on XLINX XC2V3000 FF1152AMT0221
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2019-07-25  9:37 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-07-25  9:37 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Matthew Wilcox (Oracle)

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

Hi all,

After merging the net-next tree, today's linux-next build (mips
cavium_octeon_defconfig) failed like this:

drivers/staging/octeon/ethernet-tx.c:287:23: error: implicit declaration of function 'skb_drag_size'; did you mean 'skb_frag_size'? [-Werror=implicit-function-declaration]

Caused by commit

  92493a2f8a8d ("Build fixes for skb_frag_size conversion")

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-24  3:12 ` Stephen Rothwell
@ 2019-06-24  3:59   ` Palmer Dabbelt
  0 siblings, 0 replies; 249+ messages in thread
From: Palmer Dabbelt @ 2019-06-24  3:59 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: davem, netdev, linux-next, linux-kernel, yash.shah

On Sun, 23 Jun 2019 20:12:45 PDT (-0700), Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 20 Jun 2019 19:13:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the net-next tree, today's linux-next build (powerpc
>> allyesconfig) failed like this:
>> 
>> drivers/net/ethernet/cadence/macb_main.c:48:16: error: field 'hw' has incomplete type
>>   struct clk_hw hw;
>>                 ^~
>> drivers/net/ethernet/cadence/macb_main.c:4003:21: error: variable 'fu540_c000_ops' has initializer but incomplete type
>>  static const struct clk_ops fu540_c000_ops = {
>>                      ^~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4004:3: error: 'const struct clk_ops' has no member named 'recalc_rate'
>>   .recalc_rate = fu540_macb_tx_recalc_rate,
>>    ^~~~~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4004:17: warning: excess elements in struct initializer
>>   .recalc_rate = fu540_macb_tx_recalc_rate,
>>                  ^~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4004:17: note: (near initialization for 'fu540_c000_ops')
>> drivers/net/ethernet/cadence/macb_main.c:4005:3: error: 'const struct clk_ops' has no member named 'round_rate'
>>   .round_rate = fu540_macb_tx_round_rate,
>>    ^~~~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4005:16: warning: excess elements in struct initializer
>>   .round_rate = fu540_macb_tx_round_rate,
>>                 ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4005:16: note: (near initialization for 'fu540_c000_ops')
>> drivers/net/ethernet/cadence/macb_main.c:4006:3: error: 'const struct clk_ops' has no member named 'set_rate'
>>   .set_rate = fu540_macb_tx_set_rate,
>>    ^~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4006:14: warning: excess elements in struct initializer
>>   .set_rate = fu540_macb_tx_set_rate,
>>               ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/net/ethernet/cadence/macb_main.c:4006:14: note: (near initialization for 'fu540_c000_ops')
>> drivers/net/ethernet/cadence/macb_main.c: In function 'fu540_c000_clk_init':
>> drivers/net/ethernet/cadence/macb_main.c:4013:23: error: storage size of 'init' isn't known
>>   struct clk_init_data init;
>>                        ^~~~
>> drivers/net/ethernet/cadence/macb_main.c:4032:12: error: implicit declaration of function 'clk_register'; did you mean 'sock_register'? [-Werror=implicit-function-declaration]
>>   *tx_clk = clk_register(NULL, &mgmt->hw);
>>             ^~~~~~~~~~~~
>>             sock_register
>> drivers/net/ethernet/cadence/macb_main.c:4013:23: warning: unused variable 'init' [-Wunused-variable]
>>   struct clk_init_data init;
>>                        ^~~~
>> drivers/net/ethernet/cadence/macb_main.c: In function 'macb_probe':
>> drivers/net/ethernet/cadence/macb_main.c:4366:2: error: implicit declaration of function 'clk_unregister'; did you mean 'sock_unregister'? [-Werror=implicit-function-declaration]
>>   clk_unregister(tx_clk);
>>   ^~~~~~~~~~~~~~
>>   sock_unregister
>> drivers/net/ethernet/cadence/macb_main.c: At top level:
>> drivers/net/ethernet/cadence/macb_main.c:4003:29: error: storage size of 'fu540_c000_ops' isn't known
>>  static const struct clk_ops fu540_c000_ops = {
>>                              ^~~~~~~~~~~~~~
>> 
>> Caused by commit
>> 
>>   c218ad559020 ("macb: Add support for SiFive FU540-C000")
>> 
>> CONFIG_COMMON_CLK is not set for this build.
>> 
>> I have reverted that commit for today.
>
> I am still reverting that commit.  Has this problem been fixed in some
> subtle way?

I don't think so.  I'm assuming something like this is necessary

diff --git a/drivers/net/ethernet/cadence/Kconfig b/drivers/net/ethernet/cadence/Kconfig
index 1766697c9c5a..d13db9e9c818 100644
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@ -23,6 +23,7 @@ config MACB
        tristate "Cadence MACB/GEM support"
        depends on HAS_DMA
        select PHYLIB
+       depends on COMMON_CLK
        ---help---
          The Cadence MACB ethernet interface is found on many Atmel AT32 and
          AT91 parts.  This driver also supports the Cadence GEM (Gigabit
@@ -42,7 +43,7 @@ config MACB_USE_HWSTAMP

 config MACB_PCI
        tristate "Cadence PCI MACB/GEM support"
-       depends on MACB && PCI && COMMON_CLK
+       depends on MACB && PCI
        ---help---
          This is PCI wrapper for MACB driver.

at a minimum, though it may be saner to #ifdef support for the SiFive clock
driver as that's only useful on some systems.  Assuming I can reproduce the
build failure (which shouldn't be too hard), I'll send out a patch that adds a
Kconfig for the FU540 clock driver to avoid adding a COMMON_CLK dependency for
all MACB systems.

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-20  9:13 Stephen Rothwell
@ 2019-06-24  3:12 ` Stephen Rothwell
  2019-06-24  3:59   ` Palmer Dabbelt
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-06-24  3:12 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yash Shah

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

Hi all,

On Thu, 20 Jun 2019 19:13:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/cadence/macb_main.c:48:16: error: field 'hw' has incomplete type
>   struct clk_hw hw;
>                 ^~
> drivers/net/ethernet/cadence/macb_main.c:4003:21: error: variable 'fu540_c000_ops' has initializer but incomplete type
>  static const struct clk_ops fu540_c000_ops = {
>                      ^~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4004:3: error: 'const struct clk_ops' has no member named 'recalc_rate'
>   .recalc_rate = fu540_macb_tx_recalc_rate,
>    ^~~~~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4004:17: warning: excess elements in struct initializer
>   .recalc_rate = fu540_macb_tx_recalc_rate,
>                  ^~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4004:17: note: (near initialization for 'fu540_c000_ops')
> drivers/net/ethernet/cadence/macb_main.c:4005:3: error: 'const struct clk_ops' has no member named 'round_rate'
>   .round_rate = fu540_macb_tx_round_rate,
>    ^~~~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4005:16: warning: excess elements in struct initializer
>   .round_rate = fu540_macb_tx_round_rate,
>                 ^~~~~~~~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4005:16: note: (near initialization for 'fu540_c000_ops')
> drivers/net/ethernet/cadence/macb_main.c:4006:3: error: 'const struct clk_ops' has no member named 'set_rate'
>   .set_rate = fu540_macb_tx_set_rate,
>    ^~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4006:14: warning: excess elements in struct initializer
>   .set_rate = fu540_macb_tx_set_rate,
>               ^~~~~~~~~~~~~~~~~~~~~~
> drivers/net/ethernet/cadence/macb_main.c:4006:14: note: (near initialization for 'fu540_c000_ops')
> drivers/net/ethernet/cadence/macb_main.c: In function 'fu540_c000_clk_init':
> drivers/net/ethernet/cadence/macb_main.c:4013:23: error: storage size of 'init' isn't known
>   struct clk_init_data init;
>                        ^~~~
> drivers/net/ethernet/cadence/macb_main.c:4032:12: error: implicit declaration of function 'clk_register'; did you mean 'sock_register'? [-Werror=implicit-function-declaration]
>   *tx_clk = clk_register(NULL, &mgmt->hw);
>             ^~~~~~~~~~~~
>             sock_register
> drivers/net/ethernet/cadence/macb_main.c:4013:23: warning: unused variable 'init' [-Wunused-variable]
>   struct clk_init_data init;
>                        ^~~~
> drivers/net/ethernet/cadence/macb_main.c: In function 'macb_probe':
> drivers/net/ethernet/cadence/macb_main.c:4366:2: error: implicit declaration of function 'clk_unregister'; did you mean 'sock_unregister'? [-Werror=implicit-function-declaration]
>   clk_unregister(tx_clk);
>   ^~~~~~~~~~~~~~
>   sock_unregister
> drivers/net/ethernet/cadence/macb_main.c: At top level:
> drivers/net/ethernet/cadence/macb_main.c:4003:29: error: storage size of 'fu540_c000_ops' isn't known
>  static const struct clk_ops fu540_c000_ops = {
>                              ^~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   c218ad559020 ("macb: Add support for SiFive FU540-C000")
> 
> CONFIG_COMMON_CLK is not set for this build.
> 
> I have reverted that commit for today.

I am still reverting that commit.  Has this problem been fixed in some
subtle way?
-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2019-06-20  9:13 Stephen Rothwell
  2019-06-24  3:12 ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-06-20  9:13 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Yash Shah

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

Hi all,

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

drivers/net/ethernet/cadence/macb_main.c:48:16: error: field 'hw' has incomplete type
  struct clk_hw hw;
                ^~
drivers/net/ethernet/cadence/macb_main.c:4003:21: error: variable 'fu540_c000_ops' has initializer but incomplete type
 static const struct clk_ops fu540_c000_ops = {
                     ^~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4004:3: error: 'const struct clk_ops' has no member named 'recalc_rate'
  .recalc_rate = fu540_macb_tx_recalc_rate,
   ^~~~~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4004:17: warning: excess elements in struct initializer
  .recalc_rate = fu540_macb_tx_recalc_rate,
                 ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4004:17: note: (near initialization for 'fu540_c000_ops')
drivers/net/ethernet/cadence/macb_main.c:4005:3: error: 'const struct clk_ops' has no member named 'round_rate'
  .round_rate = fu540_macb_tx_round_rate,
   ^~~~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4005:16: warning: excess elements in struct initializer
  .round_rate = fu540_macb_tx_round_rate,
                ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4005:16: note: (near initialization for 'fu540_c000_ops')
drivers/net/ethernet/cadence/macb_main.c:4006:3: error: 'const struct clk_ops' has no member named 'set_rate'
  .set_rate = fu540_macb_tx_set_rate,
   ^~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4006:14: warning: excess elements in struct initializer
  .set_rate = fu540_macb_tx_set_rate,
              ^~~~~~~~~~~~~~~~~~~~~~
drivers/net/ethernet/cadence/macb_main.c:4006:14: note: (near initialization for 'fu540_c000_ops')
drivers/net/ethernet/cadence/macb_main.c: In function 'fu540_c000_clk_init':
drivers/net/ethernet/cadence/macb_main.c:4013:23: error: storage size of 'init' isn't known
  struct clk_init_data init;
                       ^~~~
drivers/net/ethernet/cadence/macb_main.c:4032:12: error: implicit declaration of function 'clk_register'; did you mean 'sock_register'? [-Werror=implicit-function-declaration]
  *tx_clk = clk_register(NULL, &mgmt->hw);
            ^~~~~~~~~~~~
            sock_register
drivers/net/ethernet/cadence/macb_main.c:4013:23: warning: unused variable 'init' [-Wunused-variable]
  struct clk_init_data init;
                       ^~~~
drivers/net/ethernet/cadence/macb_main.c: In function 'macb_probe':
drivers/net/ethernet/cadence/macb_main.c:4366:2: error: implicit declaration of function 'clk_unregister'; did you mean 'sock_unregister'? [-Werror=implicit-function-declaration]
  clk_unregister(tx_clk);
  ^~~~~~~~~~~~~~
  sock_unregister
drivers/net/ethernet/cadence/macb_main.c: At top level:
drivers/net/ethernet/cadence/macb_main.c:4003:29: error: storage size of 'fu540_c000_ops' isn't known
 static const struct clk_ops fu540_c000_ops = {
                             ^~~~~~~~~~~~~~

Caused by commit

  c218ad559020 ("macb: Add support for SiFive FU540-C000")

CONFIG_COMMON_CLK is not set for this build.

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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19 15:09   ` Kevin 'ldir' Darbyshire-Bryant
@ 2019-06-19 16:11     ` Kevin 'ldir' Darbyshire-Bryant
  0 siblings, 0 replies; 249+ messages in thread
From: Kevin 'ldir' Darbyshire-Bryant @ 2019-06-19 16:11 UTC (permalink / raw)
  To: David Miller
  Cc: Stephen Rothwell, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, yamada.masahiro

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



> On 19 Jun 2019, at 16:09, Kevin 'ldir' Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> wrote:
> 
> 
> 
>> On 19 Jun 2019, at 15:13, David Miller <davem@davemloft.net> wrote:
>> 
>> 
>> I've fixed this as follows, thanks:
>> 
>> ====================
>> From 23cdf8752b26d4edbd60a6293bca492d83192d4d Mon Sep 17 00:00:00 2001
>> From: "David S. Miller" <davem@davemloft.net>
>> Date: Wed, 19 Jun 2019 10:12:58 -0400
>> Subject: [PATCH] act_ctinfo: Don't use BIT() in UAPI headers.
>> 
>> Use _BITUL() instead.
>> 
>> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>> ---
>> include/uapi/linux/tc_act/tc_ctinfo.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
>> index da803e05a89b..32337304fbe5 100644
>> --- a/include/uapi/linux/tc_act/tc_ctinfo.h
>> +++ b/include/uapi/linux/tc_act/tc_ctinfo.h
>> @@ -27,8 +27,8 @@ enum {
>> #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
>> 
>> enum {
>> -	CTINFO_MODE_DSCP	= BIT(0),
>> -	CTINFO_MODE_CPMARK	= BIT(1)
>> +	CTINFO_MODE_DSCP	= _BITUL(0),
>> +	CTINFO_MODE_CPMARK	= _BITUL(1)
>> };
>> 
>> #endif
>> --
>> 2.20.1
>> 
> 
> Hi David,
> 
> Thanks for that.  Owe you a beer!
> 
> Thinking out loud, doesn’t this also require:
> 
> #include <linux/const.h>
> 
> 
> Or at least iproute2 would need to know about _BITUL as it doesn’t at present.
> Which also means iproute2’s Linux uapi shadow would also have to import
> linux/const.h.  Or have I got wrong end of stick?
> 
> Cheers,
> 
> Kevin
> 

Whilst out walking the dog I realised I’m a moron.

The CTINFO_MODE_FOO is only used within module, it shouldn’t even be exposed
to user space.

I’ll send a patch shortly.  Sorry, I’m pretty embarrassed at how something so
apparently simple on the surface has had so many issues.

Cheers,

Kevin D-B

gpg: 012C ACB2 28C6 C53E 9775  9123 B3A2 389B 9DE2 334A


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19 14:13 ` David Miller
@ 2019-06-19 15:09   ` Kevin 'ldir' Darbyshire-Bryant
  2019-06-19 16:11     ` Kevin 'ldir' Darbyshire-Bryant
  0 siblings, 1 reply; 249+ messages in thread
From: Kevin 'ldir' Darbyshire-Bryant @ 2019-06-19 15:09 UTC (permalink / raw)
  To: David Miller
  Cc: Stephen Rothwell, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, yamada.masahiro

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



> On 19 Jun 2019, at 15:13, David Miller <davem@davemloft.net> wrote:
> 
> 
> I've fixed this as follows, thanks:
> 
> ====================
> From 23cdf8752b26d4edbd60a6293bca492d83192d4d Mon Sep 17 00:00:00 2001
> From: "David S. Miller" <davem@davemloft.net>
> Date: Wed, 19 Jun 2019 10:12:58 -0400
> Subject: [PATCH] act_ctinfo: Don't use BIT() in UAPI headers.
> 
> Use _BITUL() instead.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
> include/uapi/linux/tc_act/tc_ctinfo.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
> index da803e05a89b..32337304fbe5 100644
> --- a/include/uapi/linux/tc_act/tc_ctinfo.h
> +++ b/include/uapi/linux/tc_act/tc_ctinfo.h
> @@ -27,8 +27,8 @@ enum {
> #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
> 
> enum {
> -	CTINFO_MODE_DSCP	= BIT(0),
> -	CTINFO_MODE_CPMARK	= BIT(1)
> +	CTINFO_MODE_DSCP	= _BITUL(0),
> +	CTINFO_MODE_CPMARK	= _BITUL(1)
> };
> 
> #endif
> --
> 2.20.1
> 

Hi David,

Thanks for that.  Owe you a beer!

Thinking out loud, doesn’t this also require:

#include <linux/const.h>


Or at least iproute2 would need to know about _BITUL as it doesn’t at present.
Which also means iproute2’s Linux uapi shadow would also have to import
linux/const.h.  Or have I got wrong end of stick?

Cheers,

Kevin



[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19  3:23 Stephen Rothwell
  2019-06-19  4:02 ` Masahiro Yamada
@ 2019-06-19 14:13 ` David Miller
  2019-06-19 15:09   ` Kevin 'ldir' Darbyshire-Bryant
  1 sibling, 1 reply; 249+ messages in thread
From: David Miller @ 2019-06-19 14:13 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ldir, yamada.masahiro


I've fixed this as follows, thanks:

====================
From 23cdf8752b26d4edbd60a6293bca492d83192d4d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 19 Jun 2019 10:12:58 -0400
Subject: [PATCH] act_ctinfo: Don't use BIT() in UAPI headers.

Use _BITUL() instead.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/uapi/linux/tc_act/tc_ctinfo.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
index da803e05a89b..32337304fbe5 100644
--- a/include/uapi/linux/tc_act/tc_ctinfo.h
+++ b/include/uapi/linux/tc_act/tc_ctinfo.h
@@ -27,8 +27,8 @@ enum {
 #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
 
 enum {
-	CTINFO_MODE_DSCP	= BIT(0),
-	CTINFO_MODE_CPMARK	= BIT(1)
+	CTINFO_MODE_DSCP	= _BITUL(0),
+	CTINFO_MODE_CPMARK	= _BITUL(1)
 };
 
 #endif
-- 
2.20.1


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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19  4:14   ` Masahiro Yamada
  2019-06-19  8:50     ` Kevin 'ldir' Darbyshire-Bryant
@ 2019-06-19 13:46     ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2019-06-19 13:46 UTC (permalink / raw)
  To: yamada.masahiro; +Cc: sfr, netdev, linux-next, linux-kernel, ldir

From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 19 Jun 2019 13:14:06 +0900

> What a hell.

I know, some serious bush league coding going on in the networking
right?

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19  4:14   ` Masahiro Yamada
@ 2019-06-19  8:50     ` Kevin 'ldir' Darbyshire-Bryant
  2019-06-19 13:46     ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Kevin 'ldir' Darbyshire-Bryant @ 2019-06-19  8:50 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: Stephen Rothwell, David Miller, Networking,
	Linux Next Mailing List, Linux Kernel Mailing List

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

Greetings!

As the guilty party in authoring this, and also pretty new around here
I’m wondering what I need to do to help clean it up?

> On 19 Jun 2019, at 05:14, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> 
> On Wed, Jun 19, 2019 at 1:02 PM Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> 
>> Hi.
>> 
>> 
>> On Wed, Jun 19, 2019 at 12:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> 
>>> Hi all,
>>> 
>>> After merging the net-next tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>> 
>>> In file included from usr/include/linux/tc_act/tc_ctinfo.hdrtest.c:1:
>>> ./usr/include/linux/tc_act/tc_ctinfo.h:30:21: error: implicit declaration of function 'BIT' [-Werror=implicit-function-declaration]
>>>  CTINFO_MODE_DSCP = BIT(0),
>>>                     ^~~
>>> ./usr/include/linux/tc_act/tc_ctinfo.h:30:2: error: enumerator value for 'CTINFO_MODE_DSCP' is not an integer constant
>>>  CTINFO_MODE_DSCP = BIT(0),
>>>  ^~~~~~~~~~~~~~~~
>>> ./usr/include/linux/tc_act/tc_ctinfo.h:32:1: error: enumerator value for 'CTINFO_MODE_CPMARK' is not an integer constant
>>> };
>>> ^
>>> 
>>> Caused by commit
>>> 
>>>  24ec483cec98 ("net: sched: Introduce act_ctinfo action")
>>> 
>>> Presumably exposed by commit
>>> 
>>>  b91976b7c0e3 ("kbuild: compile-test UAPI headers to ensure they are self-contained")
>>> 
>>> from the kbuild tree.

Stephen, thanks for the fixup - is that now in the tree or do I need to submit
a fix via the normal net-next channel so it gets picked up by the iproute2 people
who maintain a local copy of the uapi includes?


>> 
>> 
>> My commit correctly blocked the broken UAPI header, Hooray!
>> 
>> People export more and more headers that
>> are never able to compile in user-space.
>> 
>> We must block new breakages from coming in.
>> 
>> 
>> BIT() is not exported to user-space
>> since it is not prefixed with underscore.
>> 
>> 
>> You can use _BITUL() in user-space,
>> which is available in include/uapi/linux/const.h

Thanks for the pointers.

I am confused as to why I didn’t hit this issue when I built & run tested locally off
the net-next tree.


>> 
>> 
> 
> 
> I just took a look at
> include/uapi/linux/tc_act/tc_ctinfo.h
> 
> 
> I just wondered why the following can be compiled:
> 
> struct tc_ctinfo {
>        tc_gen;
> };
> 
> 
> Then, I found 'tc_gen' is a macro.
> 
> #define tc_gen \
>        __u32                 index; \
>        __u32                 capab; \
>        int                   action; \
>        int                   refcnt; \
>        int                   bindcnt
> 
> 
> 
> What a hell.

This is what other actions do e.g. tc_skbedit.  Can you advise what I should do instead?

> --
> Best Regards
> Masahiro Yamada

Many thanks to all for your valuable time & advice.


Cheers,

Kevin D-B

gpg: 012C ACB2 28C6 C53E 9775  9123 B3A2 389B 9DE2 334A


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19  4:02 ` Masahiro Yamada
@ 2019-06-19  4:14   ` Masahiro Yamada
  2019-06-19  8:50     ` Kevin 'ldir' Darbyshire-Bryant
  2019-06-19 13:46     ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Masahiro Yamada @ 2019-06-19  4:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Kevin Darbyshire-Bryant

On Wed, Jun 19, 2019 at 1:02 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> Hi.
>
>
> On Wed, Jun 19, 2019 at 12:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the net-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from usr/include/linux/tc_act/tc_ctinfo.hdrtest.c:1:
> > ./usr/include/linux/tc_act/tc_ctinfo.h:30:21: error: implicit declaration of function 'BIT' [-Werror=implicit-function-declaration]
> >   CTINFO_MODE_DSCP = BIT(0),
> >                      ^~~
> > ./usr/include/linux/tc_act/tc_ctinfo.h:30:2: error: enumerator value for 'CTINFO_MODE_DSCP' is not an integer constant
> >   CTINFO_MODE_DSCP = BIT(0),
> >   ^~~~~~~~~~~~~~~~
> > ./usr/include/linux/tc_act/tc_ctinfo.h:32:1: error: enumerator value for 'CTINFO_MODE_CPMARK' is not an integer constant
> >  };
> >  ^
> >
> > Caused by commit
> >
> >   24ec483cec98 ("net: sched: Introduce act_ctinfo action")
> >
> > Presumably exposed by commit
> >
> >   b91976b7c0e3 ("kbuild: compile-test UAPI headers to ensure they are self-contained")
> >
> > from the kbuild tree.
>
>
> My commit correctly blocked the broken UAPI header, Hooray!
>
> People export more and more headers that
> are never able to compile in user-space.
>
> We must block new breakages from coming in.
>
>
> BIT() is not exported to user-space
> since it is not prefixed with underscore.
>
>
> You can use _BITUL() in user-space,
> which is available in include/uapi/linux/const.h
>
>


I just took a look at
include/uapi/linux/tc_act/tc_ctinfo.h


I just wondered why the following can be compiled:

struct tc_ctinfo {
        tc_gen;
};


Then, I found 'tc_gen' is a macro.

#define tc_gen \
        __u32                 index; \
        __u32                 capab; \
        int                   action; \
        int                   refcnt; \
        int                   bindcnt



What a hell.



-- 
Best Regards
Masahiro Yamada

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-06-19  3:23 Stephen Rothwell
@ 2019-06-19  4:02 ` Masahiro Yamada
  2019-06-19  4:14   ` Masahiro Yamada
  2019-06-19 14:13 ` David Miller
  1 sibling, 1 reply; 249+ messages in thread
From: Masahiro Yamada @ 2019-06-19  4:02 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux Next Mailing List,
	Linux Kernel Mailing List, Kevin Darbyshire-Bryant

Hi.


On Wed, Jun 19, 2019 at 12:23 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from usr/include/linux/tc_act/tc_ctinfo.hdrtest.c:1:
> ./usr/include/linux/tc_act/tc_ctinfo.h:30:21: error: implicit declaration of function 'BIT' [-Werror=implicit-function-declaration]
>   CTINFO_MODE_DSCP = BIT(0),
>                      ^~~
> ./usr/include/linux/tc_act/tc_ctinfo.h:30:2: error: enumerator value for 'CTINFO_MODE_DSCP' is not an integer constant
>   CTINFO_MODE_DSCP = BIT(0),
>   ^~~~~~~~~~~~~~~~
> ./usr/include/linux/tc_act/tc_ctinfo.h:32:1: error: enumerator value for 'CTINFO_MODE_CPMARK' is not an integer constant
>  };
>  ^
>
> Caused by commit
>
>   24ec483cec98 ("net: sched: Introduce act_ctinfo action")
>
> Presumably exposed by commit
>
>   b91976b7c0e3 ("kbuild: compile-test UAPI headers to ensure they are self-contained")
>
> from the kbuild tree.


My commit correctly blocked the broken UAPI header, Hooray!

People export more and more headers that
are never able to compile in user-space.

We must block new breakages from coming in.


BIT() is not exported to user-space
since it is not prefixed with underscore.


You can use _BITUL() in user-space,
which is available in include/uapi/linux/const.h


Thanks.




> I have applied the following (obvious) patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 19 Jun 2019 13:15:22 +1000
> Subject: [PATCH] net: sched: don't use BIT() in uapi headers
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/uapi/linux/tc_act/tc_ctinfo.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
> index da803e05a89b..6166c62dd7dd 100644
> --- a/include/uapi/linux/tc_act/tc_ctinfo.h
> +++ b/include/uapi/linux/tc_act/tc_ctinfo.h
> @@ -27,8 +27,8 @@ enum {
>  #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
>
>  enum {
> -       CTINFO_MODE_DSCP        = BIT(0),
> -       CTINFO_MODE_CPMARK      = BIT(1)
> +       CTINFO_MODE_DSCP        = (1UL << 0),
> +       CTINFO_MODE_CPMARK      = (1UL << 1)
>  };
>
>  #endif
> --
> 2.20.1
>
> --
> Cheers,
> Stephen Rothwell



-- 
Best Regards
Masahiro Yamada

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

* linux-next: build failure after merge of the net-next tree
@ 2019-06-19  3:23 Stephen Rothwell
  2019-06-19  4:02 ` Masahiro Yamada
  2019-06-19 14:13 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-06-19  3:23 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Kevin Darbyshire-Bryant, Masahiro Yamada

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

Hi all,

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

In file included from usr/include/linux/tc_act/tc_ctinfo.hdrtest.c:1:
./usr/include/linux/tc_act/tc_ctinfo.h:30:21: error: implicit declaration of function 'BIT' [-Werror=implicit-function-declaration]
  CTINFO_MODE_DSCP = BIT(0),
                     ^~~
./usr/include/linux/tc_act/tc_ctinfo.h:30:2: error: enumerator value for 'CTINFO_MODE_DSCP' is not an integer constant
  CTINFO_MODE_DSCP = BIT(0),
  ^~~~~~~~~~~~~~~~
./usr/include/linux/tc_act/tc_ctinfo.h:32:1: error: enumerator value for 'CTINFO_MODE_CPMARK' is not an integer constant
 };
 ^

Caused by commit

  24ec483cec98 ("net: sched: Introduce act_ctinfo action")

Presumably exposed by commit

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

from the kbuild tree.

I have applied the following (obvious) patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2019 13:15:22 +1000
Subject: [PATCH] net: sched: don't use BIT() in uapi headers

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

diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
index da803e05a89b..6166c62dd7dd 100644
--- a/include/uapi/linux/tc_act/tc_ctinfo.h
+++ b/include/uapi/linux/tc_act/tc_ctinfo.h
@@ -27,8 +27,8 @@ enum {
 #define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
 
 enum {
-	CTINFO_MODE_DSCP	= BIT(0),
-	CTINFO_MODE_CPMARK	= BIT(1)
+	CTINFO_MODE_DSCP	= (1UL << 0),
+	CTINFO_MODE_CPMARK	= (1UL << 1)
 };
 
 #endif
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2019-06-11  8:26 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-06-11  8:26 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Grygorii Strashko

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

Hi all,

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

drivers/net/ethernet/ti/cpts.c: In function 'cpts_of_mux_clk_setup':
drivers/net/ethernet/ti/cpts.c:567:2: error: implicit declaration of function 'of_clk_parent_fill'; did you mean 'of_clk_get_parent_name'? [-Werror=implicit-function-declaration]
  of_clk_parent_fill(refclk_np, parent_names, num_parents);
  ^~~~~~~~~~~~~~~~~~
  of_clk_get_parent_name
drivers/net/ethernet/ti/cpts.c:575:11: error: implicit declaration of function 'clk_hw_register_mux_table'; did you mean 'clk_hw_register_clkdev'? [-Werror=implicit-function-declaration]
  clk_hw = clk_hw_register_mux_table(cpts->dev, refclk_np->name,
           ^~~~~~~~~~~~~~~~~~~~~~~~~
           clk_hw_register_clkdev
drivers/net/ethernet/ti/cpts.c:575:9: warning: assignment to 'struct clk_hw *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
  clk_hw = clk_hw_register_mux_table(cpts->dev, refclk_np->name,
         ^
drivers/net/ethernet/ti/cpts.c:586:29: error: 'clk_hw_unregister_mux' undeclared (first use in this function); did you mean 'clk_hw_register_clkdev'?
            (void(*)(void *))clk_hw_unregister_mux,
                             ^~~~~~~~~~~~~~~~~~~~~
                             clk_hw_register_clkdev
drivers/net/ethernet/ti/cpts.c:586:29: note: each undeclared identifier is reported only once for each function it appears in
drivers/net/ethernet/ti/cpts.c:593:8: error: implicit declaration of function 'of_clk_add_hw_provider'; did you mean 'of_clk_get_from_provider'? [-Werror=implicit-function-declaration]
  ret = of_clk_add_hw_provider(refclk_np, of_clk_hw_simple_get, clk_hw);
        ^~~~~~~~~~~~~~~~~~~~~~
        of_clk_get_from_provider
drivers/net/ethernet/ti/cpts.c:593:42: error: 'of_clk_hw_simple_get' undeclared (first use in this function); did you mean 'ida_simple_get'?
  ret = of_clk_add_hw_provider(refclk_np, of_clk_hw_simple_get, clk_hw);
                                          ^~~~~~~~~~~~~~~~~~~~
                                          ida_simple_get
drivers/net/ethernet/ti/cpts.c:598:29: error: 'of_clk_del_provider' undeclared (first use in this function); did you mean 'of_clk_get_from_provider'?
            (void(*)(void *))of_clk_del_provider,
                             ^~~~~~~~~~~~~~~~~~~
                             of_clk_get_from_provider
cc1: some warnings being treated as errors

Caused by commit

  a3047a81ba13 ("net: ethernet: ti: cpts: add support for ext rftclk selection")

of_clk_parent_fill() and others above are only available if
CONFIG_COMMON_CLK is set (which it is not for this build).

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] 249+ messages in thread

* linux-next: build failure after merge of the net-next tree
@ 2019-05-31  0:35 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2019-05-31  0:35 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Pablo Neira Ayuso

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

Hi all,

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

In file included from net/netfilter/utils.c:5:
include/linux/netfilter_ipv6.h: In function 'nf_ipv6_br_defrag':
include/linux/netfilter_ipv6.h:110:9: error: implicit declaration of function 'nf_ct_frag6_gather'; did you mean 'nf_ct_attach'? [-Werror=implicit-function-declaration]
  return nf_ct_frag6_gather(net, skb, user);
         ^~~~~~~~~~~~~~~~~~
         nf_ct_attach

Caused by commit

  764dd163ac92 ("netfilter: nf_conntrack_bridge: add support for IPv6")

CONFIG_IPV6 is not set for this build.

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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2019-04-23  7:25 Stephen Rothwell
@ 2019-04-24  1:36 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2019-04-24  1:36 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Apr 2019 17:25:24 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 23 Apr 2019 17:12:19 +1000
> Subject: [PATCH] net: fix sparc64 compilation of sock_gettstamp
> 
> Fixes: c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2019-04-23  7:25 Stephen Rothwell
  2019-04-24  1:36 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-04-23  7:25 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

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

Hi all,

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

net/core/sock.c: In function 'sock_gettstamp':
net/core/sock.c:3007:23: error: expected '}' before ';' token
    .tv_sec = ts.tv_sec;
                       ^
net/core/sock.c:3011:4: error: expected ')' before 'return'
    return -EFAULT;
    ^~~~~~
net/core/sock.c:3013:2: error: expected expression before '}' token
  }
  ^

Caused by commit

  c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling")

I have applied the followinf patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Apr 2019 17:12:19 +1000
Subject: [PATCH] net: fix sparc64 compilation of sock_gettstamp

Fixes: c7cbdbf29f48 ("net: rework SIOCGSTAMP ioctl handling")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/core/sock.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/core/sock.c b/net/core/sock.c
index 443b98d05f1e..925b84a872dd 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3004,10 +3004,10 @@ int sock_gettstamp(struct socket *sock, void __user *userstamp,
 	/* beware of padding in sparc64 timeval */
 	if (timeval && !in_compat_syscall()) {
 		struct __kernel_old_timeval __user tv = {
-			.tv_sec = ts.tv_sec;
-			.tv_usec = ts.tv_nsec;
+			.tv_sec = ts.tv_sec,
+			.tv_usec = ts.tv_nsec,
 		};
-		if (copy_to_user(userstamp, &tv, sizeof(tv))
+		if (copy_to_user(userstamp, &tv, sizeof(tv)))
 			return -EFAULT;
 		return 0;
 	}
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-02-04  4:34 Stephen Rothwell
@ 2019-02-04  4:36 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2019-02-04  4:36 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, deepa.kernel

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 4 Feb 2019 15:34:46 +1100

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 4 Feb 2019 15:24:11 +1100
> Subject: [PATCH] socket: fix for Add SO_TIMESTAMP[NS]_NEW
> 
> Fixes: 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks for fixing this.

Applied.

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

* linux-next: build failure after merge of the net-next tree
@ 2019-02-04  4:34 Stephen Rothwell
  2019-02-04  4:36 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-02-04  4:34 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Deepa Dinamani

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

Hi all,

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

/home/sfr/next/next/net/core/sock.c: In function 'sock_setsockopt':
/home/sfr/next/next/net/core/sock.c:1146:2: error: duplicate case value
  case SO_BINDTOIFINDEX:
  ^~~~
/home/sfr/next/next/net/core/sock.c:891:2: note: previously used here
  case SO_TIMESTAMP_NEW:
  ^~~~
/home/sfr/next/next/net/core/sock.c: In function 'sock_getsockopt':
/home/sfr/next/next/net/core/sock.c:1493:2: error: duplicate case value
  case SO_BINDTOIFINDEX:
  ^~~~
/home/sfr/next/next/net/core/sock.c:1293:2: note: previously used here
  case SO_TIMESTAMP_NEW:
  ^~~~

Caused by commit

  887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW")

I applied the following fix patch (I just update the clashing id rather
than update them all, but the latter may be better).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 4 Feb 2019 15:24:11 +1100
Subject: [PATCH] socket: fix for Add SO_TIMESTAMP[NS]_NEW

Fixes: 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/include/uapi/asm/socket.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index 8c9f74a66b55..88fe4f978aca 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -108,7 +108,7 @@
 #define SO_TIMESTAMPNS_OLD       0x0021
 #define SO_TIMESTAMPING_OLD      0x0023
 
-#define SO_TIMESTAMP_NEW         0x0041
+#define SO_TIMESTAMP_NEW         0x0046
 #define SO_TIMESTAMPNS_NEW       0x0042
 #define SO_TIMESTAMPING_NEW      0x0043
 
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2019-01-29  5:17 Stephen Rothwell
@ 2019-01-29  6:43 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2019-01-29  6:43 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, claudiu.manoil

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Jan 2019 16:17:42 +1100

> I have added the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 29 Jan 2019 16:13:08 +1100
> Subject: [PATCH] enetc: include linux/vmalloc.h for vzalloc etc
> 
> Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied to net-next.

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

* linux-next: build failure after merge of the net-next tree
@ 2019-01-29  5:17 Stephen Rothwell
  2019-01-29  6:43 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2019-01-29  5:17 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Claudiu Manoil

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

Hi all,

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

drivers/net/ethernet/freescale/enetc/enetc.c: In function 'enetc_alloc_txbdr':
drivers/net/ethernet/freescale/enetc/enetc.c:685:17: error: implicit declaration of function 'vzalloc'; did you mean 'kzalloc'? [-Werror=implicit-function-declaration]
  txr->tx_swbd = vzalloc(txr->bd_count * sizeof(struct enetc_tx_swbd));
                 ^~~~~~~
                 kzalloc
drivers/net/ethernet/freescale/enetc/enetc.c:685:15: warning: assignment to 'struct enetc_tx_swbd *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
  txr->tx_swbd = vzalloc(txr->bd_count * sizeof(struct enetc_tx_swbd));
               ^
drivers/net/ethernet/freescale/enetc/enetc.c:691:3: error: implicit declaration of function 'vfree'; did you mean 'kfree'? [-Werror=implicit-function-declaration]
   vfree(txr->tx_swbd);
   ^~~~~
   kfree
drivers/net/ethernet/freescale/enetc/enetc.c: In function 'enetc_alloc_rxbdr':
drivers/net/ethernet/freescale/enetc/enetc.c:749:15: warning: assignment to 'struct enetc_rx_swbd *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
  rxr->rx_swbd = vzalloc(rxr->bd_count * sizeof(struct enetc_rx_swbd));
               ^

Caused by commit

  d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers")

I have added the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 Jan 2019 16:13:08 +1100
Subject: [PATCH] enetc: include linux/vmalloc.h for vzalloc etc

Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 37b587c541ee..5bb9eb35d76d 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -5,6 +5,7 @@
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/of_mdio.h>
+#include <linux/vmalloc.h>
 
 /* ENETC overhead: optional extension BD + 1 BD gap */
 #define ENETC_TXBDS_NEEDED(val)	((val) + 2)
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-12-20  2:28 Stephen Rothwell
@ 2018-12-20 10:43 ` Petr Machata
  0 siblings, 0 replies; 249+ messages in thread
From: Petr Machata @ 2018-12-20 10:43 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, Networking, Linux Next Mailing List

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/vxlan.c: In function 'vxlan_changelink':
> drivers/net/vxlan.c:3763:10: error: too few arguments to function 'vxlan_fdb_update'
>     err = vxlan_fdb_update(vxlan, all_zeros_mac,
>           ^~~~~~~~~~~~~~~~
> drivers/net/vxlan.c:830:12: note: declared here
>  static int vxlan_fdb_update(struct vxlan_dev *vxlan,
>             ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
>   ce5e098f7a10 ("vxlan: changelink: Fix handling of default remotes")
>
> from the net tree interacting with commit
>
>   0e6160f3f5a9 ("vxlan: vxlan_fdb_notify(): Make switchdev notification configurable")
>
> from the net-next tree.
>
> I added the following merge fix patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 20 Dec 2018 13:24:05 +1100
> Subject: [PATCH] vxlan: fix for vxlan_fdb_update() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/vxlan.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index efd709a5e3a8..5209ee9aac47 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -3768,7 +3768,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
>  					       dst->remote_vni,
>  					       dst->remote_vni,
>  					       dst->remote_ifindex,
> -					       NTF_SELF);
> +					       NTF_SELF, true);
>  			if (err) {
>  				spin_unlock_bh(&vxlan->hash_lock);
>  				return err;
> -- 
> 2.19.1

Yes, that's the correct fix.

Thanks!

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

* linux-next: build failure after merge of the net-next tree
@ 2018-12-20  2:28 Stephen Rothwell
  2018-12-20 10:43 ` Petr Machata
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-12-20  2:28 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Petr Machata

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

Hi all,

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

drivers/net/vxlan.c: In function 'vxlan_changelink':
drivers/net/vxlan.c:3763:10: error: too few arguments to function 'vxlan_fdb_update'
    err = vxlan_fdb_update(vxlan, all_zeros_mac,
          ^~~~~~~~~~~~~~~~
drivers/net/vxlan.c:830:12: note: declared here
 static int vxlan_fdb_update(struct vxlan_dev *vxlan,
            ^~~~~~~~~~~~~~~~

Caused by commit

  ce5e098f7a10 ("vxlan: changelink: Fix handling of default remotes")

from the net tree interacting with commit

  0e6160f3f5a9 ("vxlan: vxlan_fdb_notify(): Make switchdev notification configurable")

from the net-next tree.

I added the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Dec 2018 13:24:05 +1100
Subject: [PATCH] vxlan: fix for vxlan_fdb_update() API change

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

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index efd709a5e3a8..5209ee9aac47 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -3768,7 +3768,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
 					       dst->remote_vni,
 					       dst->remote_vni,
 					       dst->remote_ifindex,
-					       NTF_SELF);
+					       NTF_SELF, true);
 			if (err) {
 				spin_unlock_bh(&vxlan->hash_lock);
 				return err;
-- 
2.19.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-12-17  1:36 Stephen Rothwell
@ 2018-12-17 15:54 ` Paolo Abeni
  0 siblings, 0 replies; 249+ messages in thread
From: Paolo Abeni @ 2018-12-17 15:54 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

Hi,

On Mon, 2018-12-17 at 12:36 +1100, Stephen Rothwell wrote:
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from net/core/dev.c:148:
> net/core/dev.c: In function 'napi_gro_complete':
> net/core/dev.c:5364:26: error: 'inet_gro_complete' undeclared (first use in this function); did you mean 'eth_gro_complete'?
>        ipv6_gro_complete, inet_gro_complete,
>                           ^~~~~~~~~~~~~~~~~
> include/linux/indirect_call_wrapper.h:32:41: note: in definition of macro 'INDIRECT_CALL_2'
>  #define INDIRECT_CALL_2(f, name, ...) f(__VA_ARGS__)
>                                          ^~~~~~~~~~~
> 
> and on ....
> 
> Caused by commit
> 
>   aaa5d90b395a ("net: use indirect call wrappers at GRO network layer")
> 
> inet_gro_complete() is declared in include/net/inet_comon.h which is
> not directly included in net/core/dev.c.
> 
> I have used the net-next tree from next-20181214 for today.

My fault, I should have tested more kernel configs. This fails with
CONFIG_RETPOLINE=n

A fix has been posted here:

https://marc.info/?l=linux-netdev&m=154504685327698&w=2

Thanks,

Paolo

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

* linux-next: build failure after merge of the net-next tree
@ 2018-12-17  1:36 Stephen Rothwell
  2018-12-17 15:54 ` Paolo Abeni
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-12-17  1:36 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Paolo Abeni

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

Hi all,

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

In file included from net/core/dev.c:148:
net/core/dev.c: In function 'napi_gro_complete':
net/core/dev.c:5364:26: error: 'inet_gro_complete' undeclared (first use in this function); did you mean 'eth_gro_complete'?
       ipv6_gro_complete, inet_gro_complete,
                          ^~~~~~~~~~~~~~~~~
include/linux/indirect_call_wrapper.h:32:41: note: in definition of macro 'INDIRECT_CALL_2'
 #define INDIRECT_CALL_2(f, name, ...) f(__VA_ARGS__)
                                         ^~~~~~~~~~~

and on ....

Caused by commit

  aaa5d90b395a ("net: use indirect call wrappers at GRO network layer")

inet_gro_complete() is declared in include/net/inet_comon.h which is
not directly included in net/core/dev.c.

I have used the net-next tree from next-20181214 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-10-19  0:18 Stephen Rothwell
@ 2018-10-19  5:48 ` Or Gerlitz
  0 siblings, 0 replies; 249+ messages in thread
From: Or Gerlitz @ 2018-10-19  5:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Linux Netdev List, Doug Ledford, Jason Gunthorpe,
	linux-next, Linux Kernel, Mark Bloch, Leon Romanovsky,
	Paul Blakey, Saeed Mahameed

On Fri, Oct 19, 2018 at 3:19 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/hw/mlx5/flow.c: In function 'mlx5_ib_handler_MLX5_IB_METHOD_CREATE_FLOW':
> drivers/infiniband/hw/mlx5/flow.c:163:12: error: 'struct mlx5_flow_act' has no member named 'has_flow_tag'; did you mean 'flow_tag'?
>    flow_act.has_flow_tag = true;
>             ^~~~~~~~~~~~
>             flow_tag
>
> Caused by commit
>
>   d5634fee245f ("net/mlx5: Add a no-append flow insertion mode")
>
> interacting with commit
>
>   ba4a41198324 ("RDMA/mlx5: Add support for flow tag to raw create flow")
>
> from the rdma tree.
>
> I have applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 19 Oct 2018 11:10:39 +1100
> Subject: [PATCH] net/mlx5: fix up for has_flow_tag changing to a flag
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/infiniband/hw/mlx5/flow.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
> index e57435cb6d96..f86cdcafdafc 100644
> --- a/drivers/infiniband/hw/mlx5/flow.c
> +++ b/drivers/infiniband/hw/mlx5/flow.c
> @@ -160,7 +160,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
>                         ret = -EINVAL;
>                         goto err_out;
>                 }
> -               flow_act.has_flow_tag = true;
> +               flow_act.flags |= FLOW_ACT_HAS_TAG;
>         }
>
>         flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act,


yeah, this is the correct resolution, thanks for addressing!

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

* linux-next: build failure after merge of the net-next tree
@ 2018-10-19  0:18 Stephen Rothwell
  2018-10-19  5:48 ` Or Gerlitz
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-10-19  0:18 UTC (permalink / raw)
  To: David Miller, Networking, Doug Ledford, Jason Gunthorpe
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Mark Bloch,
	Leon Romanovsky, Paul Blakey, Saeed Mahameed

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

Hi all,

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

drivers/infiniband/hw/mlx5/flow.c: In function 'mlx5_ib_handler_MLX5_IB_METHOD_CREATE_FLOW':
drivers/infiniband/hw/mlx5/flow.c:163:12: error: 'struct mlx5_flow_act' has no member named 'has_flow_tag'; did you mean 'flow_tag'?
   flow_act.has_flow_tag = true;
            ^~~~~~~~~~~~
            flow_tag

Caused by commit

  d5634fee245f ("net/mlx5: Add a no-append flow insertion mode")

interacting with commit

  ba4a41198324 ("RDMA/mlx5: Add support for flow tag to raw create flow")

from the rdma tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Oct 2018 11:10:39 +1100
Subject: [PATCH] net/mlx5: fix up for has_flow_tag changing to a flag

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

diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c
index e57435cb6d96..f86cdcafdafc 100644
--- a/drivers/infiniband/hw/mlx5/flow.c
+++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -160,7 +160,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_CREATE_FLOW)(
 			ret = -EINVAL;
 			goto err_out;
 		}
-		flow_act.has_flow_tag = true;
+		flow_act.flags |= FLOW_ACT_HAS_TAG;
 	}
 
 	flow_handler = mlx5_ib_raw_fs_rule_add(dev, fs_matcher, &flow_act,
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

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

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

* RE: linux-next: build failure after merge of the net-next tree
  2018-09-07 17:31     ` David Miller
@ 2018-09-07 22:03       ` Keller, Jacob E
  0 siblings, 0 replies; 249+ messages in thread
From: Keller, Jacob E @ 2018-09-07 22:03 UTC (permalink / raw)
  To: David Miller
  Cc: sfr, netdev, linux-next, linux-kernel, Kirsher, Jeffrey T,
	Bowers, AndrewX

> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Friday, September 07, 2018 10:31 AM
> To: Keller, Jacob E <jacob.e.keller@intel.com>
> Cc: sfr@canb.auug.org.au; netdev@vger.kernel.org; linux-next@vger.kernel.org;
> linux-kernel@vger.kernel.org; Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>;
> Bowers, AndrewX <andrewx.bowers@intel.com>
> Subject: Re: linux-next: build failure after merge of the net-next tree
> 
> From: "Keller, Jacob E" <jacob.e.keller@intel.com>
> Date: Fri, 7 Sep 2018 15:30:42 +0000
> 
> > There's some discussion about this going on in the intel-wired-lan
> > mailing list.
> 
> I really want to see a pull request in my inbox fixing this by the end
> of today or I'll apply a fix directly at my discretion.

Jeff is out, so I just opted to email a fix to netdev. I hope this is acceptable.

I opted to essentially revert the patch that moved code to i40e_ethtool_stats.h, rather than anything fancier, since it was fast, and correct.

There was a suggestion to only move the one offending function, but I felt that it was better to move everything back into the .c files.

Thanks,
Jake

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-09-07 15:30   ` Keller, Jacob E
@ 2018-09-07 17:31     ` David Miller
  2018-09-07 22:03       ` Keller, Jacob E
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2018-09-07 17:31 UTC (permalink / raw)
  To: jacob.e.keller
  Cc: sfr, netdev, linux-next, linux-kernel, jeffrey.t.kirsher, andrewx.bowers

From: "Keller, Jacob E" <jacob.e.keller@intel.com>
Date: Fri, 7 Sep 2018 15:30:42 +0000

> There's some discussion about this going on in the intel-wired-lan
> mailing list.

I really want to see a pull request in my inbox fixing this by the end
of today or I'll apply a fix directly at my discretion.

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

* RE: linux-next: build failure after merge of the net-next tree
  2018-09-07  0:20 ` Stephen Rothwell
@ 2018-09-07 15:30   ` Keller, Jacob E
  2018-09-07 17:31     ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Keller, Jacob E @ 2018-09-07 15:30 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kirsher,
	Jeffrey T, Bowers, AndrewX

> -----Original Message-----
> From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> On Behalf Of Stephen Rothwell
> Sent: Thursday, September 06, 2018 5:21 PM
> To: David Miller <davem@davemloft.net>; Networking
> <netdev@vger.kernel.org>
> Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Mailing
> List <linux-kernel@vger.kernel.org>; Keller, Jacob E <jacob.e.keller@intel.com>;
> Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Bowers, AndrewX
> <andrewx.bowers@intel.com>
> Subject: Re: linux-next: build failure after merge of the net-next tree
> 
> Hi all,
> 
> On Mon, 3 Sep 2018 09:47:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> >
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from drivers/net/ethernet/intel/i40e/i40e_ethtool.c:9:
> > drivers/net/ethernet/intel/i40e/i40e_ethtool.c: In function
> '__i40e_add_stat_strings':
> > drivers/net/ethernet/intel/i40e/i40e_ethtool_stats.h:193:20: error: function
> '__i40e_add_stat_strings' can never be inlined because it uses variable argument
> lists
> >  static inline void __i40e_add_stat_strings(u8 **p, const struct i40e_stats
> stats[],
> >                     ^~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> >   8fd75c58a09a ("i40e: move ethtool stats boiler plate code to
> i40e_ethtool_stats.h")
> >
> > It is not clear this patch has any value anyway as the moved functions
> > are only used in the file they were moved from.
> >
> > I reverted that commit for today.
> >
> > The same problem would exist in drivers/net/ethernet/intel/i40evf (where
> > a lot of code is duplicated from drivers/net/ethernet/intel/i40e) except
> > that this function is not declared inline there.
> > Luckily, i40e_ethtool_stats.h is only included my one file
> > drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c, otherwise there
> > would be multiple copies of __i40e_add_stat_strings().
> >
> > Surely there is some scope for factoring out some common code between
> > these two drivers?
> 
> Ping?
> 
> --
> Cheers,
> Stephen Rothwell

There's some discussion about this going on in the intel-wired-lan mailing list.

Thanks,
Jake

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-09-02 23:47 Stephen Rothwell
@ 2018-09-07  0:20 ` Stephen Rothwell
  2018-09-07 15:30   ` Keller, Jacob E
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-09-07  0:20 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jacob Keller,
	Jeff Kirsher, Andrew Bowers

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

Hi all,

On Mon, 3 Sep 2018 09:47:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/net/ethernet/intel/i40e/i40e_ethtool.c:9:
> drivers/net/ethernet/intel/i40e/i40e_ethtool.c: In function '__i40e_add_stat_strings':
> drivers/net/ethernet/intel/i40e/i40e_ethtool_stats.h:193:20: error: function '__i40e_add_stat_strings' can never be inlined because it uses variable argument lists
>  static inline void __i40e_add_stat_strings(u8 **p, const struct i40e_stats stats[],
>                     ^~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   8fd75c58a09a ("i40e: move ethtool stats boiler plate code to i40e_ethtool_stats.h")
> 
> It is not clear this patch has any value anyway as the moved functions
> are only used in the file they were moved from.
> 
> I reverted that commit for today.
> 
> The same problem would exist in drivers/net/ethernet/intel/i40evf (where
> a lot of code is duplicated from drivers/net/ethernet/intel/i40e) except
> that this function is not declared inline there.
> Luckily, i40e_ethtool_stats.h is only included my one file
> drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c, otherwise there
> would be multiple copies of __i40e_add_stat_strings().
> 
> Surely there is some scope for factoring out some common code between
> these two drivers?

Ping?

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2018-09-02 23:47 Stephen Rothwell
  2018-09-07  0:20 ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-09-02 23:47 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jacob Keller,
	Jeff Kirsher, Andrew Bowers

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

Hi all,

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

In file included from drivers/net/ethernet/intel/i40e/i40e_ethtool.c:9:
drivers/net/ethernet/intel/i40e/i40e_ethtool.c: In function '__i40e_add_stat_strings':
drivers/net/ethernet/intel/i40e/i40e_ethtool_stats.h:193:20: error: function '__i40e_add_stat_strings' can never be inlined because it uses variable argument lists
 static inline void __i40e_add_stat_strings(u8 **p, const struct i40e_stats stats[],
                    ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  8fd75c58a09a ("i40e: move ethtool stats boiler plate code to i40e_ethtool_stats.h")

It is not clear this patch has any value anyway as the moved functions
are only used in the file they were moved from.

I reverted that commit for today.

The same problem would exist in drivers/net/ethernet/intel/i40evf (where
a lot of code is duplicated from drivers/net/ethernet/intel/i40e) except
that this function is not declared inline there.
Luckily, i40e_ethtool_stats.h is only included my one file
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c, otherwise there
would be multiple copies of __i40e_add_stat_strings().

Surely there is some scope for factoring out some common code between
these two drivers?
-- 
Cheers,
Stephen Rothwell

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

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

* RE: linux-next: build failure after merge of the net-next tree
  2018-08-06  2:10 Stephen Rothwell
@ 2018-08-06  4:43 ` Y.b. Lu
  0 siblings, 0 replies; 249+ messages in thread
From: Y.b. Lu @ 2018-08-06  4:43 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi all,

Sorry for the trouble.
Just sent out the fix-up patch.
https://patchwork.ozlabs.org/patch/953695/

Thanks a lot.

Best regards,
Yangbo Lu

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Monday, August 6, 2018 10:10 AM
> To: David Miller <davem@davemloft.net>; Networking
> <netdev@vger.kernel.org>
> Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>; Linux Kernel Mailing
> List <linux-kernel@vger.kernel.org>; Y.b. Lu <yangbo.lu@nxp.com>
> Subject: linux-next: build failure after merge of the net-next tree
> 
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/ptp/ptp_qoriq.o: In function `qoriq_ptp_probe':
> ptp_qoriq.c:(.text+0xd0c): undefined reference to `__aeabi_uldivmod'
> 
> Caused by commit
> 
>   91305f281262 ("ptp_qoriq: support automatic configuration for ptp timer")
> 
> I just reverted that commit for today.
> 
> --
> Cheers,
> Stephen Rothwell

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

* linux-next: build failure after merge of the net-next tree
@ 2018-08-06  2:10 Stephen Rothwell
  2018-08-06  4:43 ` Y.b. Lu
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-08-06  2:10 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Yangbo Lu

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

Hi all,

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

drivers/ptp/ptp_qoriq.o: In function `qoriq_ptp_probe':
ptp_qoriq.c:(.text+0xd0c): undefined reference to `__aeabi_uldivmod'

Caused by commit

  91305f281262 ("ptp_qoriq: support automatic configuration for ptp timer")

I just 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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2018-08-03  2:14 Stephen Rothwell
  2018-08-03  2:34 ` Jakub Kicinski
@ 2018-08-03  2:44 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2018-08-03  2:44 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Aug 2018 12:14:30 +1000

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (perf) failed
> like this:
> 
> In file included from btf.c:10:0:
 ...
> Caused by commit
> 
>   89b1698c93a9 ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net")
> 
> Some of the lines in tools/lib/bpf/btf.[ch] were duplicated (they existed
> on both sides of the merge).
> 
> I have used the net-next tree from next-20180802 for today.

My bad, I am working on fixing this now.

Thanks.

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-08-03  2:14 Stephen Rothwell
@ 2018-08-03  2:34 ` Jakub Kicinski
  2018-08-03  2:44 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Jakub Kicinski @ 2018-08-03  2:34 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List

On Fri, 3 Aug 2018 12:14:30 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (perf) failed
> like this:
> 
> In file included from btf.c:10:0:
> btf.h:25:24: error: redundant redeclaration of 'btf__type_by_id' [-Werror=redundant-decls]
>  const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
>                         ^~~~~~~~~~~~~~~
> btf.h:20:24: note: previous declaration of 'btf__type_by_id' was here
>  const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
>                         ^~~~~~~~~~~~~~~
> btf.c:405:24: error: redefinition of 'btf__type_by_id'
>  const struct btf_type *btf__type_by_id(const struct btf *btf,
>                         ^~~~~~~~~~~~~~~
> btf.c:197:24: note: previous definition of 'btf__type_by_id' was here
>  const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id)
>                         ^~~~~~~~~~~~~~~
> btf.c:40:20: error: 'btf_name_by_offset' defined but not used [-Werror=unused-function]
>  static const char *btf_name_by_offset(const struct btf *btf, __u32 offset)
>                     ^~~~~~~~~~~~~~~~~~
> mv: cannot stat 'perf/.libbpf.o.tmp': No such file or directory
> tools/build/Makefile.build:96: recipe for target 'perf/libbpf.o' failed
> In file included from libbpf.c:52:0:
> btf.h:25:24: error: redundant redeclaration of 'btf__type_by_id' [-Werror=redundant-decls]
>  const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
>                         ^~~~~~~~~~~~~~~
> btf.h:20:24: note: previous declaration of 'btf__type_by_id' was here
>  const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
>                         ^~~~~~~~~~~~~~~
> mv: cannot stat 'perf/.libbpf.o.tmp': No such file or directory
> tools/build/Makefile.build:96: recipe for target 'perf/libbpf.o' failed
> 
> Caused by commit
> 
>   89b1698c93a9 ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net")
> 
> Some of the lines in tools/lib/bpf/btf.[ch] were duplicated (they existed
> on both sides of the merge).
> 
> I have used the net-next tree from next-20180802 for today.

I just noticed that too, fix out:

http://patchwork.ozlabs.org/patch/953018/

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

* linux-next: build failure after merge of the net-next tree
@ 2018-08-03  2:14 Stephen Rothwell
  2018-08-03  2:34 ` Jakub Kicinski
  2018-08-03  2:44 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2018-08-03  2:14 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

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

Hi all,

After merging the net-next tree, today's linux-next build (perf) failed
like this:

In file included from btf.c:10:0:
btf.h:25:24: error: redundant redeclaration of 'btf__type_by_id' [-Werror=redundant-decls]
 const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
                        ^~~~~~~~~~~~~~~
btf.h:20:24: note: previous declaration of 'btf__type_by_id' was here
 const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
                        ^~~~~~~~~~~~~~~
btf.c:405:24: error: redefinition of 'btf__type_by_id'
 const struct btf_type *btf__type_by_id(const struct btf *btf,
                        ^~~~~~~~~~~~~~~
btf.c:197:24: note: previous definition of 'btf__type_by_id' was here
 const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id)
                        ^~~~~~~~~~~~~~~
btf.c:40:20: error: 'btf_name_by_offset' defined but not used [-Werror=unused-function]
 static const char *btf_name_by_offset(const struct btf *btf, __u32 offset)
                    ^~~~~~~~~~~~~~~~~~
mv: cannot stat 'perf/.libbpf.o.tmp': No such file or directory
tools/build/Makefile.build:96: recipe for target 'perf/libbpf.o' failed
In file included from libbpf.c:52:0:
btf.h:25:24: error: redundant redeclaration of 'btf__type_by_id' [-Werror=redundant-decls]
 const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
                        ^~~~~~~~~~~~~~~
btf.h:20:24: note: previous declaration of 'btf__type_by_id' was here
 const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
                        ^~~~~~~~~~~~~~~
mv: cannot stat 'perf/.libbpf.o.tmp': No such file or directory
tools/build/Makefile.build:96: recipe for target 'perf/libbpf.o' failed

Caused by commit

  89b1698c93a9 ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net")

Some of the lines in tools/lib/bpf/btf.[ch] were duplicated (they existed
on both sides of the merge).

I have used the net-next tree from next-20180802 for today.

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-07-27 10:32 Stephen Rothwell
@ 2018-07-27 12:18 ` YueHaibing
  0 siblings, 0 replies; 249+ messages in thread
From: YueHaibing @ 2018-07-27 12:18 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

On 2018/7/27 18:32, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> hns_roce_hw_v1.c:(.text.hns_roce_v1_reset+0x8c): undefined reference to `.hns_dsaf_roce_reset'
> hns_roce_hw_v1.c:(.text.hns_roce_v1_reset+0xdc): undefined reference to `.hns_dsaf_roce_reset'
> 
> Caused by commit
> 
>   336a443bd9dd ("net: hns: Make many functions static")

Sorry,I forgot do a allyesconfig. And I have post a fix patch, Dvaid applied it:

[PATCH net-next] net: hns: make hns_dsaf_roce_reset non static

https://lkml.org/lkml/2018/7/26/939

> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 27 Jul 2018 20:23:20 +1000
> Subject: [PATCH] net: hns: make hns_dsaf_roce_reset() not static
> 
> This function is declared in a header file and used in a different
> source file.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
> index 7afc67510569..619e6ce465c2 100644
> --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
> +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
> @@ -2836,7 +2836,7 @@ module_platform_driver(g_dsaf_driver);
>   * @enable: false - request reset , true - drop reset
>   * retuen 0 - success , negative -fail
>   */
> -static int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)
> +int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)
>  {
>  	struct dsaf_device *dsaf_dev;
>  	struct platform_device *pdev;
> 

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

* linux-next: build failure after merge of the net-next tree
@ 2018-07-27 10:32 Stephen Rothwell
  2018-07-27 12:18 ` YueHaibing
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-07-27 10:32 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, YueHaibing

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

Hi all,

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

hns_roce_hw_v1.c:(.text.hns_roce_v1_reset+0x8c): undefined reference to `.hns_dsaf_roce_reset'
hns_roce_hw_v1.c:(.text.hns_roce_v1_reset+0xdc): undefined reference to `.hns_dsaf_roce_reset'

Caused by commit

  336a443bd9dd ("net: hns: Make many functions static")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Jul 2018 20:23:20 +1000
Subject: [PATCH] net: hns: make hns_dsaf_roce_reset() not static

This function is declared in a header file and used in a different
source file.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
index 7afc67510569..619e6ce465c2 100644
--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
@@ -2836,7 +2836,7 @@ module_platform_driver(g_dsaf_driver);
  * @enable: false - request reset , true - drop reset
  * retuen 0 - success , negative -fail
  */
-static int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)
+int hns_dsaf_roce_reset(struct fwnode_handle *dsaf_fwnode, bool dereset)
 {
 	struct dsaf_device *dsaf_dev;
 	struct platform_device *pdev;
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-07-03  0:47 Stephen Rothwell
@ 2018-07-03  7:34 ` Sabrina Dubroca
  0 siblings, 0 replies; 249+ messages in thread
From: Sabrina Dubroca @ 2018-07-03  7:34 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List

2018-07-03, 10:47:12 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
[...]
> I took a guess and aplied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 3 Jul 2018 10:37:05 +1000
> Subject: [PATCH] net: update for conversion of GRO SKB handling
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, this looks correct.

-- 
Sabrina

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

* linux-next: build failure after merge of the net-next tree
@ 2018-07-03  0:47 Stephen Rothwell
  2018-07-03  7:34 ` Sabrina Dubroca
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-07-03  0:47 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Sabrina Dubroca

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

Hi all,

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

net/ipv4/fou.c: In function 'gue_gro_receive':
net/ipv4/fou.c:451:35: error: passing argument 2 of 'skb_gro_flush_final_remcsum' from incompatible pointer type [-Werror=incompatible-pointer-types]
  skb_gro_flush_final_remcsum(skb, pp, flush, &grc);
                                   ^~
In file included from include/net/inet_sock.h:23:0,
                 from include/linux/udp.h:20,
                 from net/ipv4/fou.c:6:
include/linux/netdevice.h:2799:20: note: expected 'struct sk_buff **' but argument is of type 'struct sk_buff *'
 static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/net/vxlan.c: In function 'vxlan_gro_receive':
drivers/net/vxlan.c:627:35: error: passing argument 2 of 'skb_gro_flush_final_remcsum' from incompatible pointer type [-Werror=incompatible-pointer-types]
  skb_gro_flush_final_remcsum(skb, pp, flush, &grc);
                                   ^~
In file included from include/net/inet_sock.h:23:0,
                 from include/linux/udp.h:20,
                 from drivers/net/vxlan.c:17:
include/linux/netdevice.h:2799:20: note: expected 'struct sk_buff **' but argument is of type 'struct sk_buff *'
 static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  d4546c2509b1 ("net: Convert GRO SKB handling to list_head.")

from the net-next tree interacting with commit

  603d4cf8fe09 ("net: fix use-after-free in GRO with ESP")

from Linus' tree.

I took a guess and aplied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 3 Jul 2018 10:37:05 +1000
Subject: [PATCH] net: update for conversion of GRO SKB handling

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

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e1d4084c0651..64480a0f2c16 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2797,7 +2797,7 @@ static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp,
 		NAPI_GRO_CB(skb)->flush |= flush;
 }
 static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
-					       struct sk_buff **pp,
+					       struct sk_buff *pp,
 					       int flush,
 					       struct gro_remcsum *grc)
 {
@@ -2813,7 +2813,7 @@ static inline void skb_gro_flush_final(struct sk_buff *skb, struct sk_buff *pp,
 	NAPI_GRO_CB(skb)->flush |= flush;
 }
 static inline void skb_gro_flush_final_remcsum(struct sk_buff *skb,
-					       struct sk_buff **pp,
+					       struct sk_buff *pp,
 					       int flush,
 					       struct gro_remcsum *grc)
 {
-- 
2.17.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-06-01  8:52     ` Alexei Starovoitov
@ 2018-06-06  4:49       ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2018-06-06  4:49 UTC (permalink / raw)
  To: David Miller
  Cc: Alexei Starovoitov, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List, Jakub Kicinski, Alexei Starovoitov,
	Daniel Borkmann

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

Hi all,

On Fri, 1 Jun 2018 04:52:45 -0400 Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
>
> On Fri, Jun 01, 2018 at 01:59:43PM +1000, Stephen Rothwell wrote:
> > 
> > On Thu, 31 May 2018 07:38:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > On Tue, 29 May 2018 13:25:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > > >
> > > > After merging the net-next tree, today's linux-next build (x86_64
> > > > allmodconfig) failed like this:
> > > > 
> > > > x86_64-linux-ld: unknown architecture of input file `net/bpfilter/bpfilter_umh.o' is incompatible with i386:x86-64 output
> > > > 
> > > > Caused by commit
> > > > 
> > > >   d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
> > > > 
> > > > In my builds, the host is PowerPC 64 LE ...
> > > > 
> > > > I have reverted that commit along with
> > > > 
> > > >   61a552eb487f ("bpfilter: fix build dependency")
> > > >   13405468f49d ("bpfilter: don't pass O_CREAT when opening console for debug")
> > > > 
> > > > for today.    
> > > 
> > > I am still getting this failure (well, at least yesterday I did).  
> > 
> > Still happened today.  My guess is that bpfilter_umh needs to be built
> > with the kernel compiler (not the host compiler - since ir is meant to
> > run on the some machine as the kernel, right?) but will require the
> > kernel architecture libc etc
> 
> Sorry for delay. networking folks are traveling to netconf.
> The issue is being discussed here:
> https://patchwork.ozlabs.org/patch/921597/
> 
> Currently we're thinking how to add a check that hostcc's arch
> is equal to cross-cc target arch and ideally equal to arch
> of the host where it will be run.

Looks like this is fixed in today's tree by not building bpfilter when
CC cannot link against user libraries.  Unfortunately this means that
it will never be built by my infrastructure (since all my compilers are
minimal cross compilers) :-(

I may look into getting a different set of compilers (or doing my
PowerPC builds natively).
-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-06-01  3:59   ` Stephen Rothwell
@ 2018-06-01  8:52     ` Alexei Starovoitov
  2018-06-06  4:49       ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Alexei Starovoitov @ 2018-06-01  8:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List, Jakub Kicinski, Alexei Starovoitov,
	Daniel Borkmann

On Fri, Jun 01, 2018 at 01:59:43PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 31 May 2018 07:38:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 29 May 2018 13:25:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > >
> > > After merging the net-next tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > x86_64-linux-ld: unknown architecture of input file `net/bpfilter/bpfilter_umh.o' is incompatible with i386:x86-64 output
> > > 
> > > Caused by commit
> > > 
> > >   d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
> > > 
> > > In my builds, the host is PowerPC 64 LE ...
> > > 
> > > I have reverted that commit along with
> > > 
> > >   61a552eb487f ("bpfilter: fix build dependency")
> > >   13405468f49d ("bpfilter: don't pass O_CREAT when opening console for debug")
> > > 
> > > for today.  
> > 
> > I am still getting this failure (well, at least yesterday I did).
> 
> Still happened today.  My guess is that bpfilter_umh needs to be built
> with the kernel compiler (not the host compiler - since ir is meant to
> run on the some machine as the kernel, right?) but will require the
> kernel architecture libc etc
> 
> 
> I replaced the reverts above with the following:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 1 Jun 2018 13:33:28 +1000
> Subject: [PATCH] net: bpfilter: mark as BROKEN for now
> 
> This does not build in a cross compile environment
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/bpfilter/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
> index a948b072c28f..ea4be72fdf6e 100644
> --- a/net/bpfilter/Kconfig
> +++ b/net/bpfilter/Kconfig
> @@ -2,6 +2,7 @@ menuconfig BPFILTER
>  	bool "BPF based packet filtering framework (BPFILTER)"
>  	default n
>  	depends on NET && BPF && INET
> +	depends on BROKEN

yeah. that's another option.
Sorry for delay. networking folks are traveling to netconf.
The issue is being discussed here:
https://patchwork.ozlabs.org/patch/921597/

Currently we're thinking how to add a check that hostcc's arch
is equal to cross-cc target arch and ideally equal to arch
of the host where it will be run.

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-05-30 21:38 ` Stephen Rothwell
@ 2018-06-01  3:59   ` Stephen Rothwell
  2018-06-01  8:52     ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-06-01  3:59 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jakub Kicinski, Alexei Starovoitov, Daniel Borkmann

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

Hi all,

On Thu, 31 May 2018 07:38:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 29 May 2018 13:25:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the net-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > x86_64-linux-ld: unknown architecture of input file `net/bpfilter/bpfilter_umh.o' is incompatible with i386:x86-64 output
> > 
> > Caused by commit
> > 
> >   d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
> > 
> > In my builds, the host is PowerPC 64 LE ...
> > 
> > I have reverted that commit along with
> > 
> >   61a552eb487f ("bpfilter: fix build dependency")
> >   13405468f49d ("bpfilter: don't pass O_CREAT when opening console for debug")
> > 
> > for today.  
> 
> I am still getting this failure (well, at least yesterday I did).

Still happened today.  My guess is that bpfilter_umh needs to be built
with the kernel compiler (not the host compiler - since ir is meant to
run on the some machine as the kernel, right?) but will require the
kernel architecture libc etc


I replaced the reverts above with the following:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 1 Jun 2018 13:33:28 +1000
Subject: [PATCH] net: bpfilter: mark as BROKEN for now

This does not build in a cross compile environment

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

diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
index a948b072c28f..ea4be72fdf6e 100644
--- a/net/bpfilter/Kconfig
+++ b/net/bpfilter/Kconfig
@@ -2,6 +2,7 @@ menuconfig BPFILTER
 	bool "BPF based packet filtering framework (BPFILTER)"
 	default n
 	depends on NET && BPF && INET
+	depends on BROKEN
 	help
 	  This builds experimental bpfilter framework that is aiming to
 	  provide netfilter compatible functionality via BPF
-- 
2.17.0

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-05-29  3:25 Stephen Rothwell
@ 2018-05-30 21:38 ` Stephen Rothwell
  2018-06-01  3:59   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-05-30 21:38 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jakub Kicinski, Alexei Starovoitov, Daniel Borkmann

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

Hi all,

On Tue, 29 May 2018 13:25:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> x86_64-linux-ld: unknown architecture of input file `net/bpfilter/bpfilter_umh.o' is incompatible with i386:x86-64 output
> 
> Caused by commit
> 
>   d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")
> 
> In my builds, the host is PowerPC 64 LE ...
> 
> I have reverted that commit along with
> 
>   61a552eb487f ("bpfilter: fix build dependency")
>   13405468f49d ("bpfilter: don't pass O_CREAT when opening console for debug")
> 
> for today.

I am still getting this failure (well, at least yesterday I did).

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-05-29  3:42 Stephen Rothwell
@ 2018-05-29  5:41 ` Christoph Hellwig
  0 siblings, 0 replies; 249+ messages in thread
From: Christoph Hellwig @ 2018-05-29  5:41 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Al Viro, Linux-Next Mailing List,
	Linux Kernel Mailing List, Björn Töpel,
	Alexei Starovoitov, Christoph Hellwig

> [Christoph, I noticed that the comment above datagram_poll in
> net/core/datagram.c needs the function name updated]

I'll send a fix for that.

> 
> I have added the following merge fix patch for today:

This looks correct, thanks!

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

* linux-next: build failure after merge of the net-next tree
@ 2018-05-29  3:42 Stephen Rothwell
  2018-05-29  5:41 ` Christoph Hellwig
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-05-29  3:42 UTC (permalink / raw)
  To: David Miller, Networking, Al Viro
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Björn Töpel, Alexei Starovoitov, Christoph Hellwig

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

Hi all,

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

net/xdp/xsk.c: In function 'xsk_poll':
net/xdp/xsk.c:207:22: error: implicit declaration of function 'datagram_poll'; did you mean 'datagram_poll_mask'? [-Werror=implicit-function-declaration]
  unsigned int mask = datagram_poll(file, sock, wait);
                      ^~~~~~~~~~~~~ 
                      datagram_poll_mask

Caused by commit

  c497176cb2e4 ("xsk: add Rx receive functions and poll support")

interacting with commit

  db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")

from the vfs tree.

[Christoph, I noticed that the comment above datagram_poll in
net/core/datagram.c needs the function name updated]

I have added the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 29 May 2018 13:34:25 +1000
Subject: [PATCH] xsk: update for "net: convert datagram_poll users tp->poll_mask"

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

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index cce0e4f8a536..4ee140afbc61 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -201,10 +201,9 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
 	return xsk_generic_xmit(sk, m, total_len);
 }
 
-static unsigned int xsk_poll(struct file *file, struct socket *sock,
-			     struct poll_table_struct *wait)
+static __poll_t xsk_poll_mask(struct socket *sock, __poll_t events)
 {
-	unsigned int mask = datagram_poll(file, sock, wait);
+	__poll_t mask = datagram_poll_mask(sock, events);
 	struct sock *sk = sock->sk;
 	struct xdp_sock *xs = xdp_sk(sk);
 
@@ -580,7 +579,7 @@ static const struct proto_ops xsk_proto_ops = {
 	.socketpair	= sock_no_socketpair,
 	.accept		= sock_no_accept,
 	.getname	= sock_no_getname,
-	.poll		= xsk_poll,
+	.poll_mask	= xsk_poll_mask,
 	.ioctl		= sock_no_ioctl,
 	.listen		= sock_no_listen,
 	.shutdown	= sock_no_shutdown,
-- 
2.17.0

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2018-05-29  3:25 Stephen Rothwell
  2018-05-30 21:38 ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-05-29  3:25 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jakub Kicinski, Alexei Starovoitov, Daniel Borkmann

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

Hi all,

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

x86_64-linux-ld: unknown architecture of input file `net/bpfilter/bpfilter_umh.o' is incompatible with i386:x86-64 output

Caused by commit

  d2ba09c17a06 ("net: add skeleton of bpfilter kernel module")

In my builds, the host is PowerPC 64 LE ...

I have reverted that commit along with

  61a552eb487f ("bpfilter: fix build dependency")
  13405468f49d ("bpfilter: don't pass O_CREAT when opening console for debug")

for today.

-- 
Cheers,
Stephen Rothwell

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

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

* linux-next: build failure after merge of the net-next tree
@ 2018-02-28 23:30 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2018-02-28 23:30 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Arkadi Sharshevsky, Jiri Pirko

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

Hi all,

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

net/core/devlink.c: In function 'devlink_resource_validate_size':
net/core/devlink.c:2349:34: error: invalid type argument of '->' (have 'struct devlink_resource_size_params')
  if (size > resource->size_params->size_max) {
                                  ^~
net/core/devlink.c:2354:34: error: invalid type argument of '->' (have 'struct devlink_resource_size_params')
  if (size < resource->size_params->size_min) {
                                  ^~
net/core/devlink.c:2359:43: error: invalid type argument of '->' (have 'struct devlink_resource_size_params')
  div64_u64_rem(size, resource->size_params->size_granularity, &reminder);
                                           ^~

Caused by commit

  cc944ead839a ("devlink: Move size validation to core")

interacting with commit

  77d270967c5f ("mlxsw: spectrum: Fix handling of resource_size_param")

from the net tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Mar 2018 10:24:31 +1100
Subject: [PATCH] devlink: merge fix up for resource_size_param changes

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

diff --git a/net/core/devlink.c b/net/core/devlink.c
index e7cb957d9efb..1b5bf0d1cee9 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -2346,17 +2346,17 @@ devlink_resource_validate_size(struct devlink_resource *resource, u64 size,
 	u64 reminder;
 	int err = 0;
 
-	if (size > resource->size_params->size_max) {
+	if (size > resource->size_params.size_max) {
 		NL_SET_ERR_MSG_MOD(extack, "Size larger than maximum");
 		err = -EINVAL;
 	}
 
-	if (size < resource->size_params->size_min) {
+	if (size < resource->size_params.size_min) {
 		NL_SET_ERR_MSG_MOD(extack, "Size smaller than minimum");
 		err = -EINVAL;
 	}
 
-	div64_u64_rem(size, resource->size_params->size_granularity, &reminder);
+	div64_u64_rem(size, resource->size_params.size_granularity, &reminder);
 	if (reminder) {
 		NL_SET_ERR_MSG_MOD(extack, "Wrong granularity");
 		err = -EINVAL;
-- 
2.16.1

-- 
Cheers,
Stephen Rothwell

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-29  1:50 Stephen Rothwell
@ 2018-01-29  2:09 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2018-01-29  2:09 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ktkhai, ddstreet

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Jan 2018 12:50:28 +1100

> I have applied the following merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 29 Jan 2018 12:34:37 +1100
> Subject: [PATCH] net: fixup for "net: tcp: close sock if net namespace is exiting"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/net/net_namespace.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
> index 235105afa5e1..f306b2aa15a4 100644
> --- a/include/net/net_namespace.h
> +++ b/include/net/net_namespace.h
> @@ -225,7 +225,7 @@ int net_eq(const struct net *net1, const struct net *net2)
>  
>  static inline int check_net(const struct net *net)
>  {
> -	return atomic_read(&net->count) != 0;
> +	return refcount_read(&net->count) != 0;
>  }
>  
>  void net_drop_ns(void *);

Yep, this is perfect.

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

* linux-next: build failure after merge of the net-next tree
@ 2018-01-29  1:50 Stephen Rothwell
  2018-01-29  2:09 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-01-29  1:50 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Kirill Tkhai,
	Dan Streetman

Hi all,

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

In file included from /home/sfr/next/next/include/linux/init_task.h:17:0,
                 from /home/sfr/next/next/init/init_task.c:2:
/home/sfr/next/next/include/net/net_namespace.h: In function 'check_net':
/home/sfr/next/next/include/net/net_namespace.h:228:21: error: passing argument 1 of 'atomic_read' from incompatible pointer type [-Werror=incompatible-pointer-types]
  return atomic_read(&net->count) != 0;
                     ^
In file included from /home/sfr/next/next/include/linux/atomic.h:5:0,
                 from /home/sfr/next/next/include/linux/rcupdate.h:38,
                 from /home/sfr/next/next/include/linux/init_task.h:5,
                 from /home/sfr/next/next/init/init_task.c:2:
/home/sfr/next/next/arch/powerpc/include/asm/atomic.h:34:23: note: expected 'const atomic_t * {aka const struct <anonymous> *}' but argument is of type 'const refcount_t * {aka const struct refcount_struct *}'
 static __inline__ int atomic_read(const atomic_t *v)
                       ^~~~~~~~~~~

and several others similar.

Caused by commit

  273c28bc57ca ("net: Convert atomic_t net::count to refcount_t")

interacting with commit

  4ee806d51176 ("net: tcp: close sock if net namespace is exiting")

from the net tree.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Jan 2018 12:34:37 +1100
Subject: [PATCH] net: fixup for "net: tcp: close sock if net namespace is exiting"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/net/net_namespace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 235105afa5e1..f306b2aa15a4 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -225,7 +225,7 @@ int net_eq(const struct net *net1, const struct net *net2)
 
 static inline int check_net(const struct net *net)
 {
-	return atomic_read(&net->count) != 0;
+	return refcount_read(&net->count) != 0;
 }
 
 void net_drop_ns(void *);
-- 
2.15.1

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-12 16:21           ` Daniel Borkmann
@ 2018-01-12 16:43             ` Alexei Starovoitov
  0 siblings, 0 replies; 249+ messages in thread
From: Alexei Starovoitov @ 2018-01-12 16:43 UTC (permalink / raw)
  To: Daniel Borkmann; +Cc: David Miller, sfr, netdev, ast, linux-next, linux-kernel

On Fri, Jan 12, 2018 at 05:21:54PM +0100, Daniel Borkmann wrote:
> On 01/12/2018 04:56 PM, Alexei Starovoitov wrote:
> > On Fri, Jan 12, 2018 at 11:45:42AM +0100, Daniel Borkmann wrote:
> >> On 01/12/2018 05:21 AM, Alexei Starovoitov wrote:
> >>> On Thu, Jan 11, 2018 at 10:11:45PM -0500, David Miller wrote:
> >>>> From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> >>>> Date: Wed, 10 Jan 2018 17:58:54 -0800
> >>>>
> >>>>> On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
> >>>>>> Hi all,
> >>>>>>
> >>>>>> After merging the net-next tree, today's linux-next build (x86_64
> >>>>>> allmodconfig) failed like this:
> >>>>>>
> >>>>>> kernel/bpf/verifier.o: In function `bpf_check':
> >>>>>> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
> >>>>>>
> >>>>>> Caused by commit
> >>>>>>
> >>>>>>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
> >>>>>>
> >>>>>> interacting with commit
> >>>>>>
> >>>>>>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
> >>>>>>
> >>>>>> from the bpf and net trees.
> >>>>>>
> >>>>>> I have just reverted commit 290af86629b2 for today.  A better solution
> >>>>>> would be nice (lie fixing this in a merge between the net-next and net
> >>>>>> trees).
> >>>>>
> >>>>> that's due to 'endif' from 290af86629b2 needs to be moved above
> >>>>> bpf_patch_call_args() definition.
> >>>>
> >>>> That doesn't fix it, because then you'd need to expose
> >>>> interpreters_args as well and obviously that can't be right.
> >>>>
> >>>> Instead, we should never call bpf_patch_call_args() when JIT always on
> >>>> is enabled.  So if we fail to JIT the subprogs we should fail
> >>>> immediately.
> >>>
> >>> right, as I was trying to say one extra hunk would be needed for net-next.
> >>> I was reading this patch:
> >>> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> >>> index a2b211262c25..ca80559c4ec3 100644
> >>> --- a/kernel/bpf/verifier.c
> >>> +++ b/kernel/bpf/verifier.c
> >>> @@ -5267,7 +5267,11 @@ static int fixup_call_args(struct bpf_verifier_env *env)
> >>>                 depth = get_callee_stack_depth(env, insn, i);
> >>>                 if (depth < 0)
> >>>                         return depth;
> >>> +#ifdef CONFIG_BPF_JIT_ALWAYS_ON
> >>> +               return -ENOTSUPP;
> >>> +#else
> >>>                 bpf_patch_call_args(insn, depth);
> >>> +#endif
> >>>         }
> >>>         return 0;
> >>>
> >>> but below should be fine too.
> >>> Will test it asap.
> >>>
> >>>> This is the net --> net-next merge resolution I am about to use to fix
> >>>> this:
> >>>>
> >>>> ...
> >>>>  +static int fixup_call_args(struct bpf_verifier_env *env)
> >>>>  +{
> >>>>  +	struct bpf_prog *prog = env->prog;
> >>>>  +	struct bpf_insn *insn = prog->insnsi;
> >>>> - 	int i, depth;
> >>>> ++	int i, depth, err;
> >>>>  +
> >>>> - 	if (env->prog->jit_requested)
> >>>> - 		if (jit_subprogs(env) == 0)
> >>>> ++	err = 0;
> >>
> >> Looks fine to me. The only thing I was wondering was whether we should
> >> set err = -ENOTSUPP here above, but actually that is unnecessary. Say,
> >> if for some reason we would missed to set prog->jit_requested bit under
> >> CONFIG_BPF_JIT_ALWAYS_ON, we would return 0 here even if we would have
> >> calls in the prog. But that also means for bpf_prog_load() that right
> >> after bpf_check() returned, we would go into bpf_prog_select_runtime()
> >> since prog->bpf_func is still NULL at that point, and bpf_int_jit_compile()
> >> from there wouldn't do anything either since prog->jit_requested was
> >> not set in the first place, therefore we return with -ENOTSUPP from
> >> there. So the resolution looks fine to me, we can leave it as is.
> > 
> > jit_subprogs() can fail, so err = -ENOTSUPP is necessary.
> 
> But if jit_subprogs() fails, then the err is propagated at the end of
> the function (the 'return err' I mean).

right.
Also, since we do:
fp->jit_requested = ebpf_jit_enabled();
and
static inline bool ebpf_jit_enabled(void)
{
   return bpf_jit_enable && bpf_jit_is_ebpf();
}
and JIT_ALWAYS_ON depends on CONFIG_HAVE_EBPF_JIT
we should be good.

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-12 15:56         ` Alexei Starovoitov
@ 2018-01-12 16:21           ` Daniel Borkmann
  2018-01-12 16:43             ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: Daniel Borkmann @ 2018-01-12 16:21 UTC (permalink / raw)
  To: Alexei Starovoitov
  Cc: David Miller, sfr, netdev, ast, linux-next, linux-kernel

On 01/12/2018 04:56 PM, Alexei Starovoitov wrote:
> On Fri, Jan 12, 2018 at 11:45:42AM +0100, Daniel Borkmann wrote:
>> On 01/12/2018 05:21 AM, Alexei Starovoitov wrote:
>>> On Thu, Jan 11, 2018 at 10:11:45PM -0500, David Miller wrote:
>>>> From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
>>>> Date: Wed, 10 Jan 2018 17:58:54 -0800
>>>>
>>>>> On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
>>>>>> Hi all,
>>>>>>
>>>>>> After merging the net-next tree, today's linux-next build (x86_64
>>>>>> allmodconfig) failed like this:
>>>>>>
>>>>>> kernel/bpf/verifier.o: In function `bpf_check':
>>>>>> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
>>>>>>
>>>>>> Caused by commit
>>>>>>
>>>>>>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
>>>>>>
>>>>>> interacting with commit
>>>>>>
>>>>>>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
>>>>>>
>>>>>> from the bpf and net trees.
>>>>>>
>>>>>> I have just reverted commit 290af86629b2 for today.  A better solution
>>>>>> would be nice (lie fixing this in a merge between the net-next and net
>>>>>> trees).
>>>>>
>>>>> that's due to 'endif' from 290af86629b2 needs to be moved above
>>>>> bpf_patch_call_args() definition.
>>>>
>>>> That doesn't fix it, because then you'd need to expose
>>>> interpreters_args as well and obviously that can't be right.
>>>>
>>>> Instead, we should never call bpf_patch_call_args() when JIT always on
>>>> is enabled.  So if we fail to JIT the subprogs we should fail
>>>> immediately.
>>>
>>> right, as I was trying to say one extra hunk would be needed for net-next.
>>> I was reading this patch:
>>> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
>>> index a2b211262c25..ca80559c4ec3 100644
>>> --- a/kernel/bpf/verifier.c
>>> +++ b/kernel/bpf/verifier.c
>>> @@ -5267,7 +5267,11 @@ static int fixup_call_args(struct bpf_verifier_env *env)
>>>                 depth = get_callee_stack_depth(env, insn, i);
>>>                 if (depth < 0)
>>>                         return depth;
>>> +#ifdef CONFIG_BPF_JIT_ALWAYS_ON
>>> +               return -ENOTSUPP;
>>> +#else
>>>                 bpf_patch_call_args(insn, depth);
>>> +#endif
>>>         }
>>>         return 0;
>>>
>>> but below should be fine too.
>>> Will test it asap.
>>>
>>>> This is the net --> net-next merge resolution I am about to use to fix
>>>> this:
>>>>
>>>> ...
>>>>  +static int fixup_call_args(struct bpf_verifier_env *env)
>>>>  +{
>>>>  +	struct bpf_prog *prog = env->prog;
>>>>  +	struct bpf_insn *insn = prog->insnsi;
>>>> - 	int i, depth;
>>>> ++	int i, depth, err;
>>>>  +
>>>> - 	if (env->prog->jit_requested)
>>>> - 		if (jit_subprogs(env) == 0)
>>>> ++	err = 0;
>>
>> Looks fine to me. The only thing I was wondering was whether we should
>> set err = -ENOTSUPP here above, but actually that is unnecessary. Say,
>> if for some reason we would missed to set prog->jit_requested bit under
>> CONFIG_BPF_JIT_ALWAYS_ON, we would return 0 here even if we would have
>> calls in the prog. But that also means for bpf_prog_load() that right
>> after bpf_check() returned, we would go into bpf_prog_select_runtime()
>> since prog->bpf_func is still NULL at that point, and bpf_int_jit_compile()
>> from there wouldn't do anything either since prog->jit_requested was
>> not set in the first place, therefore we return with -ENOTSUPP from
>> there. So the resolution looks fine to me, we can leave it as is.
> 
> jit_subprogs() can fail, so err = -ENOTSUPP is necessary.

But if jit_subprogs() fails, then the err is propagated at the end of
the function (the 'return err' I mean).

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-12 10:45       ` Daniel Borkmann
@ 2018-01-12 15:56         ` Alexei Starovoitov
  2018-01-12 16:21           ` Daniel Borkmann
  0 siblings, 1 reply; 249+ messages in thread
From: Alexei Starovoitov @ 2018-01-12 15:56 UTC (permalink / raw)
  To: Daniel Borkmann; +Cc: David Miller, sfr, netdev, ast, linux-next, linux-kernel

On Fri, Jan 12, 2018 at 11:45:42AM +0100, Daniel Borkmann wrote:
> On 01/12/2018 05:21 AM, Alexei Starovoitov wrote:
> > On Thu, Jan 11, 2018 at 10:11:45PM -0500, David Miller wrote:
> >> From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> >> Date: Wed, 10 Jan 2018 17:58:54 -0800
> >>
> >>> On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
> >>>> Hi all,
> >>>>
> >>>> After merging the net-next tree, today's linux-next build (x86_64
> >>>> allmodconfig) failed like this:
> >>>>
> >>>> kernel/bpf/verifier.o: In function `bpf_check':
> >>>> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
> >>>>
> >>>> Caused by commit
> >>>>
> >>>>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
> >>>>
> >>>> interacting with commit
> >>>>
> >>>>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
> >>>>
> >>>> from the bpf and net trees.
> >>>>
> >>>> I have just reverted commit 290af86629b2 for today.  A better solution
> >>>> would be nice (lie fixing this in a merge between the net-next and net
> >>>> trees).
> >>>
> >>> that's due to 'endif' from 290af86629b2 needs to be moved above
> >>> bpf_patch_call_args() definition.
> >>
> >> That doesn't fix it, because then you'd need to expose
> >> interpreters_args as well and obviously that can't be right.
> >>
> >> Instead, we should never call bpf_patch_call_args() when JIT always on
> >> is enabled.  So if we fail to JIT the subprogs we should fail
> >> immediately.
> > 
> > right, as I was trying to say one extra hunk would be needed for net-next.
> > I was reading this patch:
> > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> > index a2b211262c25..ca80559c4ec3 100644
> > --- a/kernel/bpf/verifier.c
> > +++ b/kernel/bpf/verifier.c
> > @@ -5267,7 +5267,11 @@ static int fixup_call_args(struct bpf_verifier_env *env)
> >                 depth = get_callee_stack_depth(env, insn, i);
> >                 if (depth < 0)
> >                         return depth;
> > +#ifdef CONFIG_BPF_JIT_ALWAYS_ON
> > +               return -ENOTSUPP;
> > +#else
> >                 bpf_patch_call_args(insn, depth);
> > +#endif
> >         }
> >         return 0;
> > 
> > but below should be fine too.
> > Will test it asap.
> > 
> >> This is the net --> net-next merge resolution I am about to use to fix
> >> this:
> >>
> >> ...
> >>  +static int fixup_call_args(struct bpf_verifier_env *env)
> >>  +{
> >>  +	struct bpf_prog *prog = env->prog;
> >>  +	struct bpf_insn *insn = prog->insnsi;
> >> - 	int i, depth;
> >> ++	int i, depth, err;
> >>  +
> >> - 	if (env->prog->jit_requested)
> >> - 		if (jit_subprogs(env) == 0)
> >> ++	err = 0;
> 
> Looks fine to me. The only thing I was wondering was whether we should
> set err = -ENOTSUPP here above, but actually that is unnecessary. Say,
> if for some reason we would missed to set prog->jit_requested bit under
> CONFIG_BPF_JIT_ALWAYS_ON, we would return 0 here even if we would have
> calls in the prog. But that also means for bpf_prog_load() that right
> after bpf_check() returned, we would go into bpf_prog_select_runtime()
> since prog->bpf_func is still NULL at that point, and bpf_int_jit_compile()
> from there wouldn't do anything either since prog->jit_requested was
> not set in the first place, therefore we return with -ENOTSUPP from
> there. So the resolution looks fine to me, we can leave it as is.

jit_subprogs() can fail, so err = -ENOTSUPP is necessary.

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-12  4:21     ` Alexei Starovoitov
@ 2018-01-12 10:45       ` Daniel Borkmann
  2018-01-12 15:56         ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: Daniel Borkmann @ 2018-01-12 10:45 UTC (permalink / raw)
  To: Alexei Starovoitov, David Miller
  Cc: sfr, netdev, ast, linux-next, linux-kernel

On 01/12/2018 05:21 AM, Alexei Starovoitov wrote:
> On Thu, Jan 11, 2018 at 10:11:45PM -0500, David Miller wrote:
>> From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
>> Date: Wed, 10 Jan 2018 17:58:54 -0800
>>
>>> On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> After merging the net-next tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> kernel/bpf/verifier.o: In function `bpf_check':
>>>> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
>>>>
>>>> Caused by commit
>>>>
>>>>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
>>>>
>>>> interacting with commit
>>>>
>>>>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
>>>>
>>>> from the bpf and net trees.
>>>>
>>>> I have just reverted commit 290af86629b2 for today.  A better solution
>>>> would be nice (lie fixing this in a merge between the net-next and net
>>>> trees).
>>>
>>> that's due to 'endif' from 290af86629b2 needs to be moved above
>>> bpf_patch_call_args() definition.
>>
>> That doesn't fix it, because then you'd need to expose
>> interpreters_args as well and obviously that can't be right.
>>
>> Instead, we should never call bpf_patch_call_args() when JIT always on
>> is enabled.  So if we fail to JIT the subprogs we should fail
>> immediately.
> 
> right, as I was trying to say one extra hunk would be needed for net-next.
> I was reading this patch:
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index a2b211262c25..ca80559c4ec3 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -5267,7 +5267,11 @@ static int fixup_call_args(struct bpf_verifier_env *env)
>                 depth = get_callee_stack_depth(env, insn, i);
>                 if (depth < 0)
>                         return depth;
> +#ifdef CONFIG_BPF_JIT_ALWAYS_ON
> +               return -ENOTSUPP;
> +#else
>                 bpf_patch_call_args(insn, depth);
> +#endif
>         }
>         return 0;
> 
> but below should be fine too.
> Will test it asap.
> 
>> This is the net --> net-next merge resolution I am about to use to fix
>> this:
>>
>> ...
>>  +static int fixup_call_args(struct bpf_verifier_env *env)
>>  +{
>>  +	struct bpf_prog *prog = env->prog;
>>  +	struct bpf_insn *insn = prog->insnsi;
>> - 	int i, depth;
>> ++	int i, depth, err;
>>  +
>> - 	if (env->prog->jit_requested)
>> - 		if (jit_subprogs(env) == 0)
>> ++	err = 0;

Looks fine to me. The only thing I was wondering was whether we should
set err = -ENOTSUPP here above, but actually that is unnecessary. Say,
if for some reason we would missed to set prog->jit_requested bit under
CONFIG_BPF_JIT_ALWAYS_ON, we would return 0 here even if we would have
calls in the prog. But that also means for bpf_prog_load() that right
after bpf_check() returned, we would go into bpf_prog_select_runtime()
since prog->bpf_func is still NULL at that point, and bpf_int_jit_compile()
from there wouldn't do anything either since prog->jit_requested was
not set in the first place, therefore we return with -ENOTSUPP from
there. So the resolution looks fine to me, we can leave it as is.

>> ++	if (env->prog->jit_requested) {
>> ++		err = jit_subprogs(env);
>> ++		if (err == 0)
>>  +			return 0;
>> - 
>> ++	}
>> ++#ifndef CONFIG_BPF_JIT_ALWAYS_ON
>>  +	for (i = 0; i < prog->len; i++, insn++) {
>>  +		if (insn->code != (BPF_JMP | BPF_CALL) ||
>>  +		    insn->src_reg != BPF_PSEUDO_CALL)
>>  +			continue;
>>  +		depth = get_callee_stack_depth(env, insn, i);
>>  +		if (depth < 0)
>>  +			return depth;
>>  +		bpf_patch_call_args(insn, depth);
>>  +	}
>> - 	return 0;
>> ++	err = 0;
>> ++#endif
>> ++	return err;
>>  +}
>>  +
>>   /* fixup insn->imm field of bpf_call instructions
>>    * and inline eligible helpers as explicit sequence of BPF instructions
>>    *

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-12  3:11   ` David Miller
@ 2018-01-12  4:21     ` Alexei Starovoitov
  2018-01-12 10:45       ` Daniel Borkmann
  0 siblings, 1 reply; 249+ messages in thread
From: Alexei Starovoitov @ 2018-01-12  4:21 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, netdev, daniel, ast, linux-next, linux-kernel

On Thu, Jan 11, 2018 at 10:11:45PM -0500, David Miller wrote:
> From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
> Date: Wed, 10 Jan 2018 17:58:54 -0800
> 
> > On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
> >> Hi all,
> >> 
> >> After merging the net-next tree, today's linux-next build (x86_64
> >> allmodconfig) failed like this:
> >> 
> >> kernel/bpf/verifier.o: In function `bpf_check':
> >> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
> >> 
> >> Caused by commit
> >> 
> >>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
> >> 
> >> interacting with commit
> >> 
> >>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
> >> 
> >> from the bpf and net trees.
> >> 
> >> I have just reverted commit 290af86629b2 for today.  A better solution
> >> would be nice (lie fixing this in a merge between the net-next and net
> >> trees).
> > 
> > that's due to 'endif' from 290af86629b2 needs to be moved above
> > bpf_patch_call_args() definition.
> 
> That doesn't fix it, because then you'd need to expose
> interpreters_args as well and obviously that can't be right.
> 
> Instead, we should never call bpf_patch_call_args() when JIT always on
> is enabled.  So if we fail to JIT the subprogs we should fail
> immediately.

right, as I was trying to say one extra hunk would be needed for net-next.
I was reading this patch:
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index a2b211262c25..ca80559c4ec3 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -5267,7 +5267,11 @@ static int fixup_call_args(struct bpf_verifier_env *env)
                depth = get_callee_stack_depth(env, insn, i);
                if (depth < 0)
                        return depth;
+#ifdef CONFIG_BPF_JIT_ALWAYS_ON
+               return -ENOTSUPP;
+#else
                bpf_patch_call_args(insn, depth);
+#endif
        }
        return 0;

but below should be fine too.
Will test it asap.

> This is the net --> net-next merge resolution I am about to use to fix
> this:
> 
> ...
>  +static int fixup_call_args(struct bpf_verifier_env *env)
>  +{
>  +	struct bpf_prog *prog = env->prog;
>  +	struct bpf_insn *insn = prog->insnsi;
> - 	int i, depth;
> ++	int i, depth, err;
>  +
> - 	if (env->prog->jit_requested)
> - 		if (jit_subprogs(env) == 0)
> ++	err = 0;
> ++	if (env->prog->jit_requested) {
> ++		err = jit_subprogs(env);
> ++		if (err == 0)
>  +			return 0;
> - 
> ++	}
> ++#ifndef CONFIG_BPF_JIT_ALWAYS_ON
>  +	for (i = 0; i < prog->len; i++, insn++) {
>  +		if (insn->code != (BPF_JMP | BPF_CALL) ||
>  +		    insn->src_reg != BPF_PSEUDO_CALL)
>  +			continue;
>  +		depth = get_callee_stack_depth(env, insn, i);
>  +		if (depth < 0)
>  +			return depth;
>  +		bpf_patch_call_args(insn, depth);
>  +	}
> - 	return 0;
> ++	err = 0;
> ++#endif
> ++	return err;
>  +}
>  +
>   /* fixup insn->imm field of bpf_call instructions
>    * and inline eligible helpers as explicit sequence of BPF instructions
>    *

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-11  1:58 ` Alexei Starovoitov
@ 2018-01-12  3:11   ` David Miller
  2018-01-12  4:21     ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2018-01-12  3:11 UTC (permalink / raw)
  To: alexei.starovoitov; +Cc: sfr, netdev, daniel, ast, linux-next, linux-kernel

From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Wed, 10 Jan 2018 17:58:54 -0800

> On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
>> Hi all,
>> 
>> After merging the net-next tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>> 
>> kernel/bpf/verifier.o: In function `bpf_check':
>> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
>> 
>> Caused by commit
>> 
>>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
>> 
>> interacting with commit
>> 
>>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
>> 
>> from the bpf and net trees.
>> 
>> I have just reverted commit 290af86629b2 for today.  A better solution
>> would be nice (lie fixing this in a merge between the net-next and net
>> trees).
> 
> that's due to 'endif' from 290af86629b2 needs to be moved above
> bpf_patch_call_args() definition.

That doesn't fix it, because then you'd need to expose
interpreters_args as well and obviously that can't be right.

Instead, we should never call bpf_patch_call_args() when JIT always on
is enabled.  So if we fail to JIT the subprogs we should fail
immediately.

This is the net --> net-next merge resolution I am about to use to fix
this:

...
 +static int fixup_call_args(struct bpf_verifier_env *env)
 +{
 +	struct bpf_prog *prog = env->prog;
 +	struct bpf_insn *insn = prog->insnsi;
- 	int i, depth;
++	int i, depth, err;
 +
- 	if (env->prog->jit_requested)
- 		if (jit_subprogs(env) == 0)
++	err = 0;
++	if (env->prog->jit_requested) {
++		err = jit_subprogs(env);
++		if (err == 0)
 +			return 0;
- 
++	}
++#ifndef CONFIG_BPF_JIT_ALWAYS_ON
 +	for (i = 0; i < prog->len; i++, insn++) {
 +		if (insn->code != (BPF_JMP | BPF_CALL) ||
 +		    insn->src_reg != BPF_PSEUDO_CALL)
 +			continue;
 +		depth = get_callee_stack_depth(env, insn, i);
 +		if (depth < 0)
 +			return depth;
 +		bpf_patch_call_args(insn, depth);
 +	}
- 	return 0;
++	err = 0;
++#endif
++	return err;
 +}
 +
  /* fixup insn->imm field of bpf_call instructions
   * and inline eligible helpers as explicit sequence of BPF instructions
   *

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-11  0:53 Stephen Rothwell
@ 2018-01-11  1:58 ` Alexei Starovoitov
  2018-01-12  3:11   ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Alexei Starovoitov @ 2018-01-11  1:58 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Daniel Borkmann, Alexei Starovoitov,
	Linux-Next Mailing List, Linux Kernel Mailing List

On Thu, Jan 11, 2018 at 11:53:55AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> kernel/bpf/verifier.o: In function `bpf_check':
> verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'
> 
> Caused by commit
> 
>   1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")
> 
> interacting with commit
> 
>   290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")
> 
> from the bpf and net trees.
> 
> I have just reverted commit 290af86629b2 for today.  A better solution
> would be nice (lie fixing this in a merge between the net-next and net
> trees).

that's due to 'endif' from 290af86629b2 needs to be moved above
bpf_patch_call_args() definition.
There is another fixup needed for net-next.
I'll send a follow up patch when net gets merged into net-next.

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

* linux-next: build failure after merge of the net-next tree
@ 2018-01-11  0:53 Stephen Rothwell
  2018-01-11  1:58 ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2018-01-11  0:53 UTC (permalink / raw)
  To: David Miller, Networking, Daniel Borkmann, Alexei Starovoitov
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi all,

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

kernel/bpf/verifier.o: In function `bpf_check':
verifier.c:(.text+0xd86e): undefined reference to `bpf_patch_call_args'

Caused by commit

  1ea47e01ad6e ("bpf: add support for bpf_call to interpreter")

interacting with commit

  290af86629b2 ("bpf: introduce BPF_JIT_ALWAYS_ON config")

from the bpf and net trees.

I have just reverted commit 290af86629b2 for today.  A better solution
would be nice (lie fixing this in a merge between the net-next and net
trees).

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-10  4:06 Stephen Rothwell
  2018-01-10  5:53 ` Jason Wang
@ 2018-01-10 20:53 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2018-01-10 20:53 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, jasowang

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jan 2018 15:06:14 +1100

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 Jan 2018 15:01:41 +1100
> Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

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

* Re: linux-next: build failure after merge of the net-next tree
  2018-01-10  4:06 Stephen Rothwell
@ 2018-01-10  5:53 ` Jason Wang
  2018-01-10 20:53 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Jason Wang @ 2018-01-10  5:53 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List



On 2018年01月10日 12:06, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (sparc64
> defconfig) failed like this:
>
> net/socket.o: In function `tun_xdp_to_ptr':
> (.text+0x3180): multiple definition of `tun_xdp_to_ptr'
> fs/compat_ioctl.o:compat_ioctl.c:(.text+0x0): first defined here
> net/socket.o: In function `tun_ptr_to_xdp':
> (.text+0x31a0): multiple definition of `tun_ptr_to_xdp'
> fs/compat_ioctl.o:compat_ioctl.c:(.text+0x20): first defined here
>
> Caused by commit
>
>    fc72d1d54dd9 ("tuntap: XDP transmission")
>
> I applied the following fix for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 Jan 2018 15:01:41 +1100
> Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   include/linux/if_tun.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
> index 08e66827ad8e..c5b0a75a7812 100644
> --- a/include/linux/if_tun.h
> +++ b/include/linux/if_tun.h
> @@ -42,11 +42,11 @@ static inline bool tun_is_xdp_buff(void *ptr)
>   {
>   	return false;
>   }
> -void *tun_xdp_to_ptr(void *ptr)
> +static inline void *tun_xdp_to_ptr(void *ptr)
>   {
>   	return NULL;
>   }
> -void *tun_ptr_to_xdp(void *ptr)
> +static inline void *tun_ptr_to_xdp(void *ptr)
>   {
>   	return NULL;
>   }

Acked-by: Jason Wang <jasowang@redhat.com>

David, we need this for net-next, need I repost it?

Thanks

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

* linux-next: build failure after merge of the net-next tree
@ 2018-01-10  4:06 Stephen Rothwell
  2018-01-10  5:53 ` Jason Wang
  2018-01-10 20:53 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2018-01-10  4:06 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Jason Wang

Hi all,

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

net/socket.o: In function `tun_xdp_to_ptr':
(.text+0x3180): multiple definition of `tun_xdp_to_ptr'
fs/compat_ioctl.o:compat_ioctl.c:(.text+0x0): first defined here
net/socket.o: In function `tun_ptr_to_xdp':
(.text+0x31a0): multiple definition of `tun_ptr_to_xdp'
fs/compat_ioctl.o:compat_ioctl.c:(.text+0x20): first defined here

Caused by commit

  fc72d1d54dd9 ("tuntap: XDP transmission")

I applied the following fix for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jan 2018 15:01:41 +1100
Subject: [PATCH] tuntap: fix for "tuntap: XDP transmission"

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

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 08e66827ad8e..c5b0a75a7812 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -42,11 +42,11 @@ static inline bool tun_is_xdp_buff(void *ptr)
 {
 	return false;
 }
-void *tun_xdp_to_ptr(void *ptr)
+static inline void *tun_xdp_to_ptr(void *ptr)
 {
 	return NULL;
 }
-void *tun_ptr_to_xdp(void *ptr)
+static inline void *tun_ptr_to_xdp(void *ptr)
 {
 	return NULL;
 }
-- 
2.15.1




-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-12-22  0:45 Stephen Rothwell
@ 2017-12-22  7:51 ` Ido Schimmel
  0 siblings, 0 replies; 249+ messages in thread
From: Ido Schimmel @ 2017-12-22  7:51 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List, Ido Schimmel, Eric Dumazet

Hi Stephen,

On Fri, Dec 22, 2017 at 11:45:19AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:

[...]

> I have added the following merge fix patch for today (I am guessing
> a bit here):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 22 Dec 2017 11:25:13 +1100
> Subject: [PATCH] ipv6: fix up for "ipv6: Move dst->from into struct rt6_info"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/ipv6/route.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/ipv6/route.c b/net/ipv6/route.c
> index 4efaac956f0c..2490280b3394 100644
> --- a/net/ipv6/route.c
> +++ b/net/ipv6/route.c
> @@ -4321,9 +4321,8 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
>  		goto errout;
>  	}
>  
> -	if (fibmatch && rt->dst.from) {
> -		struct rt6_info *ort = container_of(rt->dst.from,
> -						    struct rt6_info, dst);
> +	if (fibmatch && rt->from) {
> +		struct rt6_info *ort = rt->from;

Your merge fix is correct. Thanks!

>  
>  		dst_hold(&ort->dst);
>  		ip6_rt_put(rt);

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

* linux-next: build failure after merge of the net-next tree
@ 2017-12-22  0:45 Stephen Rothwell
  2017-12-22  7:51 ` Ido Schimmel
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-12-22  0:45 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Ido Schimmel,
	Eric Dumazet

Hi all,

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

net/ipv6/route.c: In function 'inet6_rtm_getroute':
net/ipv6/route.c:4324:25: error: 'struct dst_entry' has no member named 'from'
  if (fibmatch && rt->dst.from) {
                         ^
In file included from include/linux/uio.h:12:0,
                 from include/linux/socket.h:8,
                 from net/ipv6/route.c:34:
net/ipv6/route.c:4325:46: error: 'struct dst_entry' has no member named 'from'
   struct rt6_info *ort = container_of(rt->dst.from,
                                              ^
include/linux/kernel.h:929:26: note: in definition of macro 'container_of'
  void *__mptr = (void *)(ptr);     \
                          ^
In file included from include/linux/kernel.h:10:0,
                 from include/linux/uio.h:12,
                 from include/linux/socket.h:8,
                 from net/ipv6/route.c:34:
net/ipv6/route.c:4325:46: error: 'struct dst_entry' has no member named 'from'
   struct rt6_info *ort = container_of(rt->dst.from,
                                              ^
include/linux/compiler.h:301:19: note: in definition of macro '__compiletime_assert'
   bool __cond = !(condition);    \
                   ^
include/linux/compiler.h:324:2: note: in expansion of macro '_compiletime_assert'
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
  ^
include/linux/build_bug.h:47:37: note: in expansion of macro 'compiletime_assert'
 #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
                                     ^
include/linux/kernel.h:930:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
  BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \
  ^
include/linux/kernel.h:930:20: note: in expansion of macro '__same_type'
  BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \
                    ^
net/ipv6/route.c:4325:26: note: in expansion of macro 'container_of'
   struct rt6_info *ort = container_of(rt->dst.from,
                          ^
net/ipv6/route.c:4325:46: error: 'struct dst_entry' has no member named 'from'
   struct rt6_info *ort = container_of(rt->dst.from,
                                              ^
include/linux/compiler.h:301:19: note: in definition of macro '__compiletime_assert'
   bool __cond = !(condition);    \
                   ^
include/linux/compiler.h:324:2: note: in expansion of macro '_compiletime_assert'
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
  ^
include/linux/build_bug.h:47:37: note: in expansion of macro 'compiletime_assert'
 #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
                                     ^
include/linux/kernel.h:930:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
  BUILD_BUG_ON_MSG(!__same_type(*(ptr), ((type *)0)->member) && \
  ^
include/linux/kernel.h:931:6: note: in expansion of macro '__same_type'
     !__same_type(*(ptr), void),   \
      ^
net/ipv6/route.c:4325:26: note: in expansion of macro 'container_of'
   struct rt6_info *ort = container_of(rt->dst.from,
                          ^

Caused by commit

  3a2232e92e87 ("ipv6: Move dst->from into struct rt6_info")

interacting with commit

  58acfd714e6b ("ipv6: Honor specified parameters in fibmatch lookup"

from the net tree.

I have added the following merge fix patch for today (I am guessing
a bit here):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Dec 2017 11:25:13 +1100
Subject: [PATCH] ipv6: fix up for "ipv6: Move dst->from into struct rt6_info"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/ipv6/route.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 4efaac956f0c..2490280b3394 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4321,9 +4321,8 @@ static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
 		goto errout;
 	}
 
-	if (fibmatch && rt->dst.from) {
-		struct rt6_info *ort = container_of(rt->dst.from,
-						    struct rt6_info, dst);
+	if (fibmatch && rt->from) {
+		struct rt6_info *ort = rt->from;
 
 		dst_hold(&ort->dst);
 		ip6_rt_put(rt);
-- 
2.15.0

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-12-20 23:43 Stephen Rothwell
@ 2017-12-20 23:59 ` Jakub Kicinski
  0 siblings, 0 replies; 249+ messages in thread
From: Jakub Kicinski @ 2017-12-20 23:59 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List, Daniel Borkmann

On Thu, 21 Dec 2017 10:43:04 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/netdevsim/bpf.c: In function 'nsim_bpf_setup_tc_block_cb':
> drivers/net/netdevsim/bpf.c:127:7: error: 'TC_CLSBPF_REPLACE' undeclared (first use in this function)
>   case TC_CLSBPF_REPLACE:
>        ^
> drivers/net/netdevsim/bpf.c:129:7: error: 'TC_CLSBPF_ADD' undeclared (first use in this function)
>   case TC_CLSBPF_ADD:
>        ^
> drivers/net/netdevsim/bpf.c:131:7: error: 'TC_CLSBPF_DESTROY' undeclared (first use in this function)
>   case TC_CLSBPF_DESTROY:
>        ^
> 
> Caused by commit
> 
>   31d3ad832948 ("netdevsim: add bpf offload support")
> 
> interacting with commit
> 
>   102740bd9436 ("cls_bpf: fix offload assumptions after callback conversion")
> 
> from the net tree.
> 
> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 21 Dec 2017 10:18:46 +1100
> Subject: [PATCH] netdevsim: fix up for "cls_bpf: fix offload assumptions after
>  callback conversion"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Hi Stephen, sorry about those merges today.  The proper fix is queued
up in patchwork for when net-next is merged in to net:

http://patchwork.ozlabs.org/patch/851063/

I will CC you on patches which may cause/fix merge trouble in the
future, often the information about how to resolve the conflict is
not part of the commit message.

Sorry I didn't think about CCing you earlier!

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

* linux-next: build failure after merge of the net-next tree
@ 2017-12-20 23:43 Stephen Rothwell
  2017-12-20 23:59 ` Jakub Kicinski
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-12-20 23:43 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jakub Kicinski, Daniel Borkmann

Hi all,

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

drivers/net/netdevsim/bpf.c: In function 'nsim_bpf_setup_tc_block_cb':
drivers/net/netdevsim/bpf.c:127:7: error: 'TC_CLSBPF_REPLACE' undeclared (first use in this function)
  case TC_CLSBPF_REPLACE:
       ^
drivers/net/netdevsim/bpf.c:129:7: error: 'TC_CLSBPF_ADD' undeclared (first use in this function)
  case TC_CLSBPF_ADD:
       ^
drivers/net/netdevsim/bpf.c:131:7: error: 'TC_CLSBPF_DESTROY' undeclared (first use in this function)
  case TC_CLSBPF_DESTROY:
       ^

Caused by commit

  31d3ad832948 ("netdevsim: add bpf offload support")

interacting with commit

  102740bd9436 ("cls_bpf: fix offload assumptions after callback conversion")

from the net tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Dec 2017 10:18:46 +1100
Subject: [PATCH] netdevsim: fix up for "cls_bpf: fix offload assumptions after
 callback conversion"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/netdevsim/bpf.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c
index 7da814686ad9..afaf980bbbe7 100644
--- a/drivers/net/netdevsim/bpf.c
+++ b/drivers/net/netdevsim/bpf.c
@@ -123,16 +123,10 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type,
 	if (prog && !prog->aux->offload && !ns->bpf_tc_non_bound_accept)
 		return -EOPNOTSUPP;
 
-	switch (cls_bpf->command) {
-	case TC_CLSBPF_REPLACE:
-		return nsim_bpf_offload(ns, prog, true);
-	case TC_CLSBPF_ADD:
-		return nsim_bpf_offload(ns, prog, false);
-	case TC_CLSBPF_DESTROY:
-		return nsim_bpf_offload(ns, NULL, true);
-	default:
+	if (cls_bpf->command != TC_CLSBPF_OFFLOAD)
 		return -EOPNOTSUPP;
-	}
+
+	return nsim_bpf_offload(ns, prog, cls_bpf->oldprog);
 }
 
 int nsim_bpf_disable_tc(struct netdevsim *ns)
-- 
2.15.0

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-09-29  1:36 Stephen Rothwell
@ 2017-09-29  2:07 ` Florian Fainelli
  0 siblings, 0 replies; 249+ messages in thread
From: Florian Fainelli @ 2017-09-29  2:07 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Vivien Didelot

Le 09/28/17 à 18:36, Stephen Rothwell a écrit :
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> net/dsa/slave.c: In function 'dsa_slave_create':
> net/dsa/slave.c:1191:18: error: 'struct dsa_slave_priv' has no member named 'phy'
>   phy_disconnect(p->phy);
>                   ^
> 
> Caused by commit
> 
>   0115dcd1787d ("net: dsa: use slave device phydev")
> 
> Interacting with commit
> 
>   e804441cfe0b ("net: dsa: Fix network device registration order")
> 
> from the net tree.
> 
> I applied the following merge fix patch (which I am not sure about):

Your resolution looks fine to me, thanks Stephen!

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 29 Sep 2017 11:28:45 +1000
> Subject: [PATCH] net: dsa: merge fix patch for removal of phy
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/dsa/slave.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index 8869954485db..9191c929c6c8 100644
> --- a/net/dsa/slave.c
> +++ b/net/dsa/slave.c
> @@ -1188,7 +1188,7 @@ int dsa_slave_create(struct dsa_port *port, const char *name)
>  	return 0;
>  
>  out_phy:
> -	phy_disconnect(p->phy);
> +	phy_disconnect(slave_dev->phydev);
>  	if (of_phy_is_fixed_link(p->dp->dn))
>  		of_phy_deregister_fixed_link(p->dp->dn);
>  out_free:
> 


-- 
Florian

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

* linux-next: build failure after merge of the net-next tree
@ 2017-09-29  1:36 Stephen Rothwell
  2017-09-29  2:07 ` Florian Fainelli
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-09-29  1:36 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Vivien Didelot, Florian Fainelli

Hi all,

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

net/dsa/slave.c: In function 'dsa_slave_create':
net/dsa/slave.c:1191:18: error: 'struct dsa_slave_priv' has no member named 'phy'
  phy_disconnect(p->phy);
                  ^

Caused by commit

  0115dcd1787d ("net: dsa: use slave device phydev")

Interacting with commit

  e804441cfe0b ("net: dsa: Fix network device registration order")

from the net tree.

I applied the following merge fix patch (which I am not sure about):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Sep 2017 11:28:45 +1000
Subject: [PATCH] net: dsa: merge fix patch for removal of phy

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

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 8869954485db..9191c929c6c8 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1188,7 +1188,7 @@ int dsa_slave_create(struct dsa_port *port, const char *name)
 	return 0;
 
 out_phy:
-	phy_disconnect(p->phy);
+	phy_disconnect(slave_dev->phydev);
 	if (of_phy_is_fixed_link(p->dp->dn))
 		of_phy_deregister_fixed_link(p->dp->dn);
 out_free:
-- 
2.14.1

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-09-22  1:37 ` David Miller
@ 2017-09-22  7:10   ` Paolo Abeni
  0 siblings, 0 replies; 249+ messages in thread
From: Paolo Abeni @ 2017-09-22  7:10 UTC (permalink / raw)
  To: David Miller, sfr; +Cc: netdev, linux-next, linux-kernel

On Thu, 2017-09-21 at 18:37 -0700, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 22 Sep 2017 11:03:55 +1000
> 
> > After merging the net-next tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > net/ipv4/fib_frontend.c: In function 'fib_validate_source':
> > net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
> >    if (net->ipv4.fib_has_custom_local_routes)
> >                 ^
> > net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
> > net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
> >    net->ipv4.fib_has_custom_local_routes = true;
> >             ^
> > 
> > Caused by commit
> > 
> >   6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")
> 
> Paolo, it seems this struct member should be placed outside of
> IP_MULTIPLE_TABLES protection, since users can insert custom
> local routes even without that set.
> 
> So I'm installing the following fix for this:
> 
> ====================
> [PATCH] ipv4: Move fib_has_custom_local_routes outside of IP_MULTIPLE_TABLES.
> 
> > net/ipv4/fib_frontend.c: In function 'fib_validate_source':
> > net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
> >    if (net->ipv4.fib_has_custom_local_routes)
> >                 ^
> > net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
> > net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
> >    net->ipv4.fib_has_custom_local_routes = true;
> >             ^
> 
> Fixes: 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  include/net/netns/ipv4.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
> index 20720721da4b..8387f099115e 100644
> --- a/include/net/netns/ipv4.h
> +++ b/include/net/netns/ipv4.h
> @@ -49,10 +49,10 @@ struct netns_ipv4 {
>  #ifdef CONFIG_IP_MULTIPLE_TABLES
>         struct fib_rules_ops    *rules_ops;
>         bool                    fib_has_custom_rules;
> -       bool                    fib_has_custom_local_routes;
>         struct fib_table __rcu  *fib_main;
>         struct fib_table __rcu  *fib_default;
>  #endif
> +       bool                    fib_has_custom_local_routes;
>  #ifdef CONFIG_IP_ROUTE_CLASSID
>         int                     fib_num_tclassid_users;
>  #endif
> -- 
> 2.13.5

My fault, I should have fuzzed the configuration before posting.

Fix looks good, thanks David!

Paolo

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-09-22  1:03 Stephen Rothwell
@ 2017-09-22  1:37 ` David Miller
  2017-09-22  7:10   ` Paolo Abeni
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2017-09-22  1:37 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, pabeni

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Sep 2017 11:03:55 +1000

> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> net/ipv4/fib_frontend.c: In function 'fib_validate_source':
> net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    if (net->ipv4.fib_has_custom_local_routes)
>                 ^
> net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
> net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    net->ipv4.fib_has_custom_local_routes = true;
>             ^
> 
> Caused by commit
> 
>   6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")

Paolo, it seems this struct member should be placed outside of
IP_MULTIPLE_TABLES protection, since users can insert custom
local routes even without that set.

So I'm installing the following fix for this:

====================
[PATCH] ipv4: Move fib_has_custom_local_routes outside of IP_MULTIPLE_TABLES.

> net/ipv4/fib_frontend.c: In function 'fib_validate_source':
> net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    if (net->ipv4.fib_has_custom_local_routes)
>                 ^
> net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
> net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    net->ipv4.fib_has_custom_local_routes = true;
>             ^

Fixes: 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/net/netns/ipv4.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 20720721da4b..8387f099115e 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -49,10 +49,10 @@ struct netns_ipv4 {
 #ifdef CONFIG_IP_MULTIPLE_TABLES
 	struct fib_rules_ops	*rules_ops;
 	bool			fib_has_custom_rules;
-	bool			fib_has_custom_local_routes;
 	struct fib_table __rcu	*fib_main;
 	struct fib_table __rcu	*fib_default;
 #endif
+	bool			fib_has_custom_local_routes;
 #ifdef CONFIG_IP_ROUTE_CLASSID
 	int			fib_num_tclassid_users;
 #endif
-- 
2.13.5

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

* linux-next: build failure after merge of the net-next tree
@ 2017-09-22  1:03 Stephen Rothwell
  2017-09-22  1:37 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-09-22  1:03 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Paolo Abeni

Hi all,

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

net/ipv4/fib_frontend.c: In function 'fib_validate_source':
net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
   if (net->ipv4.fib_has_custom_local_routes)
                ^
net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
   net->ipv4.fib_has_custom_local_routes = true;
            ^

Caused by commit

  6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")

This build has CONFIG_IP_MULTIPLE_TABLES unset.

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

* linux-next: build failure after merge of the net-next tree
@ 2017-08-15  2:28 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2017-08-15  2:28 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, David Wu

Hi all,

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

arch/arm/boot/dts/rk3228-evb.dtb: ERROR (phandle_references): Reference to non-existent node or label "phy0"

Caused by commit

  db40f15b53e4 ("ARM: dts: rk3228-evb: Enable the integrated PHY for gmac")

Its possible that the error is caused by an interaction with another
commit, but I could not find anything obvious.  I have reverted that
commit for today.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-07-18  1:09 Stephen Rothwell
@ 2017-07-18  4:59 ` John Fastabend
  0 siblings, 0 replies; 249+ messages in thread
From: John Fastabend @ 2017-07-18  4:59 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Jesper Dangaard Brouer, Daniel Borkmann

On 07/17/2017 06:09 PM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> net/core/filter.o: In function `xdp_do_flush_map':
> filter.c:(.text+0x3770): undefined reference to `__dev_map_flush'
> net/core/filter.o: In function `__bpf_tx_xdp':
> filter.c:(.text+0x56dc): undefined reference to `__dev_map_insert_ctx'
> net/core/filter.o: In function `xdp_do_redirect_map':
> filter.c:(.text+0x5e24): undefined reference to `__dev_map_lookup_elem'
> 
> Caused by commit
> 
>   11393cc9b9be ("xdp: Add batching support to redirect map")
> 
> This build has
> 
> CONFIG_BPF=y
> # CONFIG_BPF_SYSCALL is not set
> 
> I have used the net-next tree from next-20170717 for today.
> 

I missed testing without CONFIG_BPF_SYSCALL. Patch is posted to netdev
and on patchworks at,

https://patchwork.ozlabs.org/patch/789862/

Thanks,
John

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

* linux-next: build failure after merge of the net-next tree
@ 2017-07-18  1:09 Stephen Rothwell
  2017-07-18  4:59 ` John Fastabend
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-07-18  1:09 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	John Fastabend, Jesper Dangaard Brouer, Daniel Borkmann

Hi all,

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

net/core/filter.o: In function `xdp_do_flush_map':
filter.c:(.text+0x3770): undefined reference to `__dev_map_flush'
net/core/filter.o: In function `__bpf_tx_xdp':
filter.c:(.text+0x56dc): undefined reference to `__dev_map_insert_ctx'
net/core/filter.o: In function `xdp_do_redirect_map':
filter.c:(.text+0x5e24): undefined reference to `__dev_map_lookup_elem'

Caused by commit

  11393cc9b9be ("xdp: Add batching support to redirect map")

This build has

CONFIG_BPF=y
# CONFIG_BPF_SYSCALL is not set

I have used the net-next tree from next-20170717 for today.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-05-22  3:43   ` Stephen Rothwell
@ 2017-05-22 14:17     ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2017-05-22 14:17 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, mlichvar, willemb

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 May 2017 13:43:00 +1000

> Hi Dave,
> 
> On Sun, 21 May 2017 23:14:10 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 22 May 2017 11:16:05 +1000
>> 
>> > After merging the net-next tree, today's linux-next build (powerpc
>> > ppc64_defconfig) failed like this:
>> > 
>> > net/socket.c: In function 'put_ts_pktinfo':
>> > net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
>> >   put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
>> >                             ^
>> > Caused by commit
>> > 
>> >   aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")
>> > 
>> > This probably broke every architecture that has its own
>> > arch/<arch>/include/uapi/asm/socket.h that does not include
>> > include/uapi/asm-generic/socket.h :-(
>> > 
>> > I have used the net-next tree from next-20170519 for today.  
>> 
>> I've just pushed the following, thanks for the report:
> 
> Looks good except:
> 
>> diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
>> index 5147018..784b871 100644
>> --- a/arch/parisc/include/uapi/asm/socket.h
>> +++ b/arch/parisc/include/uapi/asm/socket.h
>> @@ -97,4 +97,6 @@
>>  
>>  #define SO_COOKIE		0x4032
>>  
>> +#define SCM_TIMESTAMPING_PKTINFO	58
> 
> Does this need to be 0x4033 (or something)?

Good catch, I'll fix this up!

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-05-22  3:14 ` David Miller
@ 2017-05-22  3:43   ` Stephen Rothwell
  2017-05-22 14:17     ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2017-05-22  3:43 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, mlichvar, willemb

Hi Dave,

On Sun, 21 May 2017 23:14:10 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 22 May 2017 11:16:05 +1000
> 
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > net/socket.c: In function 'put_ts_pktinfo':
> > net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
> >   put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
> >                             ^
> > Caused by commit
> > 
> >   aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")
> > 
> > This probably broke every architecture that has its own
> > arch/<arch>/include/uapi/asm/socket.h that does not include
> > include/uapi/asm-generic/socket.h :-(
> > 
> > I have used the net-next tree from next-20170519 for today.  
> 
> I've just pushed the following, thanks for the report:

Looks good except:

> diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
> index 5147018..784b871 100644
> --- a/arch/parisc/include/uapi/asm/socket.h
> +++ b/arch/parisc/include/uapi/asm/socket.h
> @@ -97,4 +97,6 @@
>  
>  #define SO_COOKIE		0x4032
>  
> +#define SCM_TIMESTAMPING_PKTINFO	58

Does this need to be 0x4033 (or something)?

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-05-22  1:16 Stephen Rothwell
  2017-05-22  3:14 ` David Miller
@ 2017-05-22  3:42 ` Willem de Bruijn
  1 sibling, 0 replies; 249+ messages in thread
From: Willem de Bruijn @ 2017-05-22  3:42 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, Networking, Linux-Next Mailing List,
	Linux Kernel Mailing List, Miroslav Lichvar, Willem de Bruijn

On Sun, May 21, 2017 at 9:16 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> net/socket.c: In function 'put_ts_pktinfo':
> net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
>   put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
>                             ^
>
> Caused by commit
>
>   aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")
>
> This probably broke every architecture that has its own
> arch/<arch>/include/uapi/asm/socket.h that does not include
> include/uapi/asm-generic/socket.h :-(

Indeed. I added the architecture specific versions in patch

  http://patchwork.ozlabs.org/patch/765238/

That fixes the powerpc build for me. The new option is now
defined in every file that also defines the last added such
option SCM_TIMESTAMPING_OPT_STATS. Apologies for
missing this earlier.

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-05-22  1:16 Stephen Rothwell
@ 2017-05-22  3:14 ` David Miller
  2017-05-22  3:43   ` Stephen Rothwell
  2017-05-22  3:42 ` Willem de Bruijn
  1 sibling, 1 reply; 249+ messages in thread
From: David Miller @ 2017-05-22  3:14 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, mlichvar, willemb

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 May 2017 11:16:05 +1000

> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> net/socket.c: In function 'put_ts_pktinfo':
> net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
>   put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
>                             ^
> Caused by commit
> 
>   aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")
> 
> This probably broke every architecture that has its own
> arch/<arch>/include/uapi/asm/socket.h that does not include
> include/uapi/asm-generic/socket.h :-(
> 
> I have used the net-next tree from next-20170519 for today.

I've just pushed the following, thanks for the report:

====================
net: Define SCM_TIMESTAMPING_PKTINFO on all architectures.

A definition was only provided for asm-generic/socket.h
using platforms, define it for the others as well

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/alpha/include/uapi/asm/socket.h   | 2 ++
 arch/frv/include/uapi/asm/socket.h     | 2 ++
 arch/ia64/include/uapi/asm/socket.h    | 2 ++
 arch/m32r/include/uapi/asm/socket.h    | 2 ++
 arch/mips/include/uapi/asm/socket.h    | 2 ++
 arch/mn10300/include/uapi/asm/socket.h | 2 ++
 arch/parisc/include/uapi/asm/socket.h  | 2 ++
 arch/powerpc/include/uapi/asm/socket.h | 2 ++
 arch/s390/include/uapi/asm/socket.h    | 2 ++
 arch/sparc/include/uapi/asm/socket.h   | 2 ++
 arch/xtensa/include/uapi/asm/socket.h  | 2 ++
 11 files changed, 22 insertions(+)

diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index 148d7a3..0926de6 100644
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -105,4 +105,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/frv/include/uapi/asm/socket.h b/arch/frv/include/uapi/asm/socket.h
index 1ccf456..e491ff0 100644
--- a/arch/frv/include/uapi/asm/socket.h
+++ b/arch/frv/include/uapi/asm/socket.h
@@ -98,5 +98,7 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _ASM_SOCKET_H */
 
diff --git a/arch/ia64/include/uapi/asm/socket.h b/arch/ia64/include/uapi/asm/socket.h
index 2c3f4b4..8693724 100644
--- a/arch/ia64/include/uapi/asm/socket.h
+++ b/arch/ia64/include/uapi/asm/socket.h
@@ -107,4 +107,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _ASM_IA64_SOCKET_H */
diff --git a/arch/m32r/include/uapi/asm/socket.h b/arch/m32r/include/uapi/asm/socket.h
index ae6548d..5d97890 100644
--- a/arch/m32r/include/uapi/asm/socket.h
+++ b/arch/m32r/include/uapi/asm/socket.h
@@ -98,4 +98,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _ASM_M32R_SOCKET_H */
diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index 3418ec9..365ff51 100644
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -116,4 +116,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/mn10300/include/uapi/asm/socket.h b/arch/mn10300/include/uapi/asm/socket.h
index 4526e92..d013c0d 100644
--- a/arch/mn10300/include/uapi/asm/socket.h
+++ b/arch/mn10300/include/uapi/asm/socket.h
@@ -98,4 +98,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index 5147018..784b871 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -97,4 +97,6 @@
 
 #define SO_COOKIE		0x4032
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _UAPI_ASM_SOCKET_H */
diff --git a/arch/powerpc/include/uapi/asm/socket.h b/arch/powerpc/include/uapi/asm/socket.h
index 58e2ec0..bc4ca72 100644
--- a/arch/powerpc/include/uapi/asm/socket.h
+++ b/arch/powerpc/include/uapi/asm/socket.h
@@ -105,4 +105,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif	/* _ASM_POWERPC_SOCKET_H */
diff --git a/arch/s390/include/uapi/asm/socket.h b/arch/s390/include/uapi/asm/socket.h
index e8e5ecf..fb9769d 100644
--- a/arch/s390/include/uapi/asm/socket.h
+++ b/arch/s390/include/uapi/asm/socket.h
@@ -104,4 +104,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif /* _ASM_SOCKET_H */
diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index 3f4ad19..5d67330 100644
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -94,6 +94,8 @@
 
 #define SO_COOKIE		0x003b
 
+#define SCM_TIMESTAMPING_PKTINFO	0x003c
+
 /* Security levels - as per NRL IPv6 - don't actually do anything */
 #define SO_SECURITY_AUTHENTICATION		0x5001
 #define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002
diff --git a/arch/xtensa/include/uapi/asm/socket.h b/arch/xtensa/include/uapi/asm/socket.h
index 1eb6d2f..982c253 100644
--- a/arch/xtensa/include/uapi/asm/socket.h
+++ b/arch/xtensa/include/uapi/asm/socket.h
@@ -109,4 +109,6 @@
 
 #define SO_COOKIE		57
 
+#define SCM_TIMESTAMPING_PKTINFO	58
+
 #endif	/* _XTENSA_SOCKET_H */
-- 
2.7.4

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

* linux-next: build failure after merge of the net-next tree
@ 2017-05-22  1:16 Stephen Rothwell
  2017-05-22  3:14 ` David Miller
  2017-05-22  3:42 ` Willem de Bruijn
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2017-05-22  1:16 UTC (permalink / raw)
  To: David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
	Miroslav Lichvar, Willem de Bruijn

Hi all,

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

net/socket.c: In function 'put_ts_pktinfo':
net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
  put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
                            ^

Caused by commit

  aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")

This probably broke every architecture that has its own
arch/<arch>/include/uapi/asm/socket.h that does not include
include/uapi/asm-generic/socket.h :-(

I have used the net-next tree from next-20170519 for today.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-01-09 23:59 Stephen Rothwell
  2017-01-10 15:14 ` Ursula Braun
@ 2017-02-22 23:34 ` Stephen Rothwell
  1 sibling, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2017-02-22 23:34 UTC (permalink / raw)
  To: David Miller, Networking, Al Viro
  Cc: linux-next, linux-kernel, Ursula Braun, Utz Bacher

Hi all,

On Tue, 10 Jan 2017 10:59:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/smc/af_smc.c: In function 'smc_splice_read':
> net/smc/af_smc.c:1258:39: error: passing argument 1 of 'smc->clcsock->ops->splice_read' from incompatible pointer type [-Werror=incompatible-pointer-types]
>    rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
>                                        ^
> net/smc/af_smc.c:1258:39: note: expected 'struct file *' but argument is of type 'struct socket *'
> net/smc/af_smc.c: At top level:
> net/smc/af_smc.c:1288:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .splice_read = smc_splice_read,   
>                  ^
> net/smc/af_smc.c:1288:17: note: (near initialization for 'smc_sock_ops.splice_read')
> 
> Caused by commit
> 
>   ac7138746e14 ("smc: establish new socket family")
> 
> interacting with commit
> 
>   15a8f657c71d ("switch socket ->splice_read() to struct file *")
> 
> from the vfs tree.
> 
> I applied the following merge fix patch which could well be incorrect ...
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jan 2017 10:52:38 +1100
> Subject: [PATCH] smc: merge fix for "switch socket ->splice_read() to struct file *"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/smc/af_smc.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 5d4208ad029e..4875e65f0c4a 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -1242,10 +1242,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page,
>  	return rc;
>  }
>  
> -static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
> +static ssize_t smc_splice_read(struct file *file, loff_t *ppos,
>  			       struct pipe_inode_info *pipe, size_t len,
>  				    unsigned int flags)
>  {
> +	struct socket *sock = file->private_data;
>  	struct sock *sk = sock->sk;
>  	struct smc_sock *smc;
>  	int rc = -ENOTCONN;
> @@ -1255,7 +1256,7 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
>  	if ((sk->sk_state != SMC_ACTIVE) && (sk->sk_state != SMC_CLOSED))
>  		goto out;
>  	if (smc->use_fallback) {
> -		rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
> +		rc = smc->clcsock->ops->splice_read(file, ppos,
>  						    pipe, len, flags);
>  	} else {
>  		rc = -EOPNOTSUPP;
> -- 
> 2.10.2

This fix up is now needed when the vfs tree is merged with Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2017-01-09 23:59 Stephen Rothwell
@ 2017-01-10 15:14 ` Ursula Braun
  2017-02-22 23:34 ` Stephen Rothwell
  1 sibling, 0 replies; 249+ messages in thread
From: Ursula Braun @ 2017-01-10 15:14 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Networking, Al Viro
  Cc: linux-next, linux-kernel, Utz Bacher

ACK - smc_splice_read() is just a place holder at the moment. Its implementation for AF_SMC will follow.

Regards, Ursula Braun

On 01/10/2017 12:59 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/smc/af_smc.c: In function 'smc_splice_read':
> net/smc/af_smc.c:1258:39: error: passing argument 1 of 'smc->clcsock->ops->splice_read' from incompatible pointer type [-Werror=incompatible-pointer-types]
>    rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
>                                        ^
> net/smc/af_smc.c:1258:39: note: expected 'struct file *' but argument is of type 'struct socket *'
> net/smc/af_smc.c: At top level:
> net/smc/af_smc.c:1288:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .splice_read = smc_splice_read,   
>                  ^
> net/smc/af_smc.c:1288:17: note: (near initialization for 'smc_sock_ops.splice_read')
> 
> Caused by commit
> 
>   ac7138746e14 ("smc: establish new socket family")
> 
> interacting with commit
> 
>   15a8f657c71d ("switch socket ->splice_read() to struct file *")
> 
> from the vfs tree.
> 
> I applied the following merge fix patch which could well be incorrect ...
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jan 2017 10:52:38 +1100
> Subject: [PATCH] smc: merge fix for "switch socket ->splice_read() to struct file *"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/smc/af_smc.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 5d4208ad029e..4875e65f0c4a 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -1242,10 +1242,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page,
>  	return rc;
>  }
> 
> -static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
> +static ssize_t smc_splice_read(struct file *file, loff_t *ppos,
>  			       struct pipe_inode_info *pipe, size_t len,
>  				    unsigned int flags)
>  {
> +	struct socket *sock = file->private_data;
>  	struct sock *sk = sock->sk;
>  	struct smc_sock *smc;
>  	int rc = -ENOTCONN;
> @@ -1255,7 +1256,7 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
>  	if ((sk->sk_state != SMC_ACTIVE) && (sk->sk_state != SMC_CLOSED))
>  		goto out;
>  	if (smc->use_fallback) {
> -		rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
> +		rc = smc->clcsock->ops->splice_read(file, ppos,
>  						    pipe, len, flags);
>  	} else {
>  		rc = -EOPNOTSUPP;
> 

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

* linux-next: build failure after merge of the net-next tree
@ 2017-01-09 23:59 Stephen Rothwell
  2017-01-10 15:14 ` Ursula Braun
  2017-02-22 23:34 ` Stephen Rothwell
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2017-01-09 23:59 UTC (permalink / raw)
  To: David Miller, Networking, Al Viro
  Cc: linux-next, linux-kernel, Ursula Braun, Utz Bacher

Hi all,

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

net/smc/af_smc.c: In function 'smc_splice_read':
net/smc/af_smc.c:1258:39: error: passing argument 1 of 'smc->clcsock->ops->splice_read' from incompatible pointer type [-Werror=incompatible-pointer-types]
   rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
                                       ^
net/smc/af_smc.c:1258:39: note: expected 'struct file *' but argument is of type 'struct socket *'
net/smc/af_smc.c: At top level:
net/smc/af_smc.c:1288:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .splice_read = smc_splice_read,   
                 ^
net/smc/af_smc.c:1288:17: note: (near initialization for 'smc_sock_ops.splice_read')

Caused by commit

  ac7138746e14 ("smc: establish new socket family")

interacting with commit

  15a8f657c71d ("switch socket ->splice_read() to struct file *")

from the vfs tree.

I applied the following merge fix patch which could well be incorrect ...

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Jan 2017 10:52:38 +1100
Subject: [PATCH] smc: merge fix for "switch socket ->splice_read() to struct file *"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/smc/af_smc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 5d4208ad029e..4875e65f0c4a 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1242,10 +1242,11 @@ static ssize_t smc_sendpage(struct socket *sock, struct page *page,
 	return rc;
 }
 
-static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
+static ssize_t smc_splice_read(struct file *file, loff_t *ppos,
 			       struct pipe_inode_info *pipe, size_t len,
 				    unsigned int flags)
 {
+	struct socket *sock = file->private_data;
 	struct sock *sk = sock->sk;
 	struct smc_sock *smc;
 	int rc = -ENOTCONN;
@@ -1255,7 +1256,7 @@ static ssize_t smc_splice_read(struct socket *sock, loff_t *ppos,
 	if ((sk->sk_state != SMC_ACTIVE) && (sk->sk_state != SMC_CLOSED))
 		goto out;
 	if (smc->use_fallback) {
-		rc = smc->clcsock->ops->splice_read(smc->clcsock, ppos,
+		rc = smc->clcsock->ops->splice_read(file, ppos,
 						    pipe, len, flags);
 	} else {
 		rc = -EOPNOTSUPP;
-- 
2.10.2

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-05-10 18:39 ` Bjorn Andersson
@ 2016-05-13 21:01   ` Arnd Bergmann
  0 siblings, 0 replies; 249+ messages in thread
From: Arnd Bergmann @ 2016-05-13 21:01 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Bjorn Andersson, Stephen Rothwell, David Miller, Andy Gross,
	netdev, linux-kernel, linux-next, Olof Johansson

On Tuesday 10 May 2016 11:39:34 Bjorn Andersson wrote:
> On Mon 09 May 18:29 PDT 2016, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > After merging the net-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> >   .callback = qcom_smd_qrtr_callback,
> >               ^
> > net/qrtr/smd.c:106:14: note: (near initialization for 'qcom_smd_qrtr_driver.callback')
> > 
> > Caused by commit
> > 
> >   bdabad3e363d ("net: Add Qualcomm IPC router")
> > 
> > interacting with commit
> > 
> >   b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")
> > 
> > from the arm-soc tree.
> > 
> > I added the following merge fix patch (and it turned out I needed the
> > new stubs).
> > 
> 
> Sorry for not spotting this issue earlier, I missed Andy's second pull
> request towards arm-soc and thought the SMD changes missed this cycle.
> 
> 
> Your patch looks good, but I'm not sure how we should approach the merge
> window; Andy can't pick the patch because he doesn't have the qrtr code
> and David doesn't have the SMD patches coming through Andy.
> 
> FWIW, Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> 
> I assume we could have the QRTR go through Andy and arm-soc, with
> David's approval and this fix squashed in. But we're running rather late
> in this cycle, perhaps we should just back the QRTR patches out and I
> can respin and resend them after the merge window (for v4.8 instead)?

I'd suggest you do a merge of next-next with the qcom/soc-2 branch that
we have in arm-soc and resolve the conflict in the merge, then send
a pull request with the merge to davem.

Alternatively, in case Linus merges net-next before we get that fix
in, I could send Stephen's fix to Linus along with the pull requests.

	Arnd

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-05-10  1:29 Stephen Rothwell
  2016-05-10  1:52 ` Andy Gross
@ 2016-05-10 18:39 ` Bjorn Andersson
  2016-05-13 21:01   ` Arnd Bergmann
  1 sibling, 1 reply; 249+ messages in thread
From: Bjorn Andersson @ 2016-05-10 18:39 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, Andy Gross
  Cc: netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
	linux-next, linux-kernel

On Mon 09 May 18:29 PDT 2016, Stephen Rothwell wrote:

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .callback = qcom_smd_qrtr_callback,
>               ^
> net/qrtr/smd.c:106:14: note: (near initialization for 'qcom_smd_qrtr_driver.callback')
> 
> Caused by commit
> 
>   bdabad3e363d ("net: Add Qualcomm IPC router")
> 
> interacting with commit
> 
>   b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")
> 
> from the arm-soc tree.
> 
> I added the following merge fix patch (and it turned out I needed the
> new stubs).
> 

Sorry for not spotting this issue earlier, I missed Andy's second pull
request towards arm-soc and thought the SMD changes missed this cycle.


Your patch looks good, but I'm not sure how we should approach the merge
window; Andy can't pick the patch because he doesn't have the qrtr code
and David doesn't have the SMD patches coming through Andy.

FWIW, Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>


I assume we could have the QRTR go through Andy and arm-soc, with
David's approval and this fix squashed in. But we're running rather late
in this cycle, perhaps we should just back the QRTR patches out and I
can respin and resend them after the merge window (for v4.8 instead)?

Suggestions are welcome.

Regards,
Bjorn

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-05-10  1:29 Stephen Rothwell
@ 2016-05-10  1:52 ` Andy Gross
  2016-05-10 18:39 ` Bjorn Andersson
  1 sibling, 0 replies; 249+ messages in thread
From: Andy Gross @ 2016-05-10  1:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, Olof Johansson, Arnd Bergmann,
	linux-arm-kernel, linux-next, Linux Kernel list, Bjorn Andersson

On 9 May 2016 at 20:29, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
>   .callback = qcom_smd_qrtr_callback,
>               ^
> net/qrtr/smd.c:106:14: note: (near initialization for 'qcom_smd_qrtr_driver.callback')
>
> Caused by commit
>
>   bdabad3e363d ("net: Add Qualcomm IPC router")
>
> interacting with commit
>
>   b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")
>
> from the arm-soc tree.
>
> I added the following merge fix patch (and it turned out I needed the
> new stubs).

Thanks for fixing this up.  I'll work with Bjorn to get this resolved.
I'll have something up for tomorrow's next pull.


Regards,

Andy Gross

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-05-10  1:29 Stephen Rothwell
@ 2016-05-10  1:32 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2016-05-10  1:32 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 May 2016 11:29:14 +1000

> Caused by commit
> 
>   e800072c18f0 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> 
> which seems to have reversed some of the merge fixes in commit
> 
>   cba653210056 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
> 
> But I am not reaaly sure what has happened here :-(
> 
> I tried to use the net-next tree from next-20160509 but that now has
> conflicts agains other changes, so I applied the following fix patch
> for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 May 2016 11:20:23 +1000
> Subject: [PATCH] net-next: fix bad merge
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, I'll try to sort this out.

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

* linux-next: build failure after merge of the net-next tree
@ 2016-05-10  1:29 Stephen Rothwell
  2016-05-10  1:32 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2016-05-10  1:29 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel

Hi all,

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

In file included from drivers/net/ethernet/mellanox/mlx5/core/en_main.c:37:0:
drivers/net/ethernet/mellanox/mlx5/core/en.h:525:29: error: field 'fts' has incomplete type
  struct mlx5e_flow_tables   fts;   
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:526:29: error: field 'eth_addr' has incomplete type
  struct mlx5e_eth_addr_db   eth_addr;
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:527:29: error: field 'vlan' has incomplete type
  struct mlx5e_vlan_db       vlan;  
                             ^
In file included from drivers/net/ethernet/mellanox/mlx5/core/en_fs.c:38:0:
drivers/net/ethernet/mellanox/mlx5/core/en.h:525:29: error: field 'fts' has incomplete type
  struct mlx5e_flow_tables   fts;   
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:526:29: error: field 'eth_addr' has incomplete type
  struct mlx5e_eth_addr_db   eth_addr;
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:527:29: error: field 'vlan' has incomplete type
  struct mlx5e_vlan_db       vlan;  
                             ^
In file included from drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c:33:0:
drivers/net/ethernet/mellanox/mlx5/core/en.h:525:29: error: field 'fts' has incomplete type
  struct mlx5e_flow_tables   fts;   
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:526:29: error: field 'eth_addr' has incomplete type
  struct mlx5e_eth_addr_db   eth_addr;
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en.h:527:29: error: field 'vlan' has incomplete type
  struct mlx5e_vlan_db       vlan;  
                             ^
drivers/net/ethernet/mellanox/mlx5/core/en_main.c:2619:0: error: unterminated #ifdef
 #ifdef CONFIG_MLX5_CORE_EN_VXLAN   
 ^

Caused by commit

  e800072c18f0 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")

which seems to have reversed some of the merge fixes in commit

  cba653210056 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")

But I am not reaaly sure what has happened here :-(

I tried to use the net-next tree from next-20160509 but that now has
conflicts agains other changes, so I applied the following fix patch
for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 May 2016 11:20:23 +1000
Subject: [PATCH] net-next: fix bad merge

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/mellanox/mlx5/core/en.h      | 3 ---
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index 7aea32e085b3..19b1b021af2d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -522,9 +522,6 @@ struct mlx5e_priv {
 	struct mlx5e_direct_tir    direct_tir[MLX5E_MAX_NUM_CHANNELS];
 
 	struct mlx5e_flow_steering fs;
-	struct mlx5e_flow_tables   fts;
-	struct mlx5e_eth_addr_db   eth_addr;
-	struct mlx5e_vlan_db       vlan;
 #ifdef CONFIG_MLX5_CORE_EN_VXLAN
 	struct mlx5e_vxlan_db      vxlan;
 #endif
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index b60a1bc6f457..98be1ce3afd8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2620,6 +2620,7 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = {
 	.ndo_add_vxlan_port      = mlx5e_add_vxlan_port,
 	.ndo_del_vxlan_port      = mlx5e_del_vxlan_port,
 	.ndo_features_check      = mlx5e_features_check,
+#endif
 #ifdef CONFIG_RFS_ACCEL
 	.ndo_rx_flow_steer	 = mlx5e_rx_flow_steer,
 #endif
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

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

* linux-next: build failure after merge of the net-next tree
@ 2016-05-10  1:29 Stephen Rothwell
  2016-05-10  1:52 ` Andy Gross
  2016-05-10 18:39 ` Bjorn Andersson
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2016-05-10  1:29 UTC (permalink / raw)
  To: David Miller, netdev, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Bjorn Andersson, Andy Gross

Hi all,

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

net/qrtr/smd.c:106:14: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
  .callback = qcom_smd_qrtr_callback,
              ^
net/qrtr/smd.c:106:14: note: (near initialization for 'qcom_smd_qrtr_driver.callback')

Caused by commit

  bdabad3e363d ("net: Add Qualcomm IPC router")

interacting with commit

  b853cb9628bf ("soc: qcom: smd: Make callback pass channel reference")

from the arm-soc tree.

I added the following merge fix patch (and it turned out I needed the
new stubs).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 May 2016 11:14:06 +1000
Subject: [PATCH] soc: qcom: smd: fix for Qualcomm IPC router and callback API
 change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/soc/qcom/smd.h | 9 +++++++++
 net/qrtr/smd.c               | 9 ++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/include/linux/soc/qcom/smd.h b/include/linux/soc/qcom/smd.h
index 086e36d76be9..fbebbfc82ed3 100644
--- a/include/linux/soc/qcom/smd.h
+++ b/include/linux/soc/qcom/smd.h
@@ -70,6 +70,15 @@ static inline void qcom_smd_driver_unregister(struct qcom_smd_driver *drv)
 	WARN_ON(1);
 }
 
+static inline void *qcom_smd_get_drvdata(struct qcom_smd_channel *channel)
+{
+	return NULL;
+}
+
+static inline void qcom_smd_set_drvdata(struct qcom_smd_channel *channel, void *data)
+{
+}
+
 static inline int qcom_smd_send(struct qcom_smd_channel *channel,
 				const void *data, int len)
 {
diff --git a/net/qrtr/smd.c b/net/qrtr/smd.c
index 84ebce73aa23..0d11132b3370 100644
--- a/net/qrtr/smd.c
+++ b/net/qrtr/smd.c
@@ -21,13 +21,14 @@
 struct qrtr_smd_dev {
 	struct qrtr_endpoint ep;
 	struct qcom_smd_channel *channel;
+	struct device *dev;
 };
 
 /* from smd to qrtr */
-static int qcom_smd_qrtr_callback(struct qcom_smd_device *sdev,
+static int qcom_smd_qrtr_callback(struct qcom_smd_channel *channel,
 				  const void *data, size_t len)
 {
-	struct qrtr_smd_dev *qdev = dev_get_drvdata(&sdev->dev);
+	struct qrtr_smd_dev *qdev = qcom_smd_get_drvdata(channel);
 	int rc;
 
 	if (!qdev)
@@ -35,7 +36,7 @@ static int qcom_smd_qrtr_callback(struct qcom_smd_device *sdev,
 
 	rc = qrtr_endpoint_post(&qdev->ep, data, len);
 	if (rc == -EINVAL) {
-		dev_err(&sdev->dev, "invalid ipcrouter packet\n");
+		dev_err(qdev->dev, "invalid ipcrouter packet\n");
 		/* return 0 to let smd drop the packet */
 		rc = 0;
 	}
@@ -73,12 +74,14 @@ static int qcom_smd_qrtr_probe(struct qcom_smd_device *sdev)
 		return -ENOMEM;
 
 	qdev->channel = sdev->channel;
+	qdev->dev = &sdev->dev;
 	qdev->ep.xmit = qcom_smd_qrtr_send;
 
 	rc = qrtr_endpoint_register(&qdev->ep, QRTR_EP_NID_AUTO);
 	if (rc)
 		return rc;
 
+	qcom_smd_set_drvdata(sdev->channel, qdev);
 	dev_set_drvdata(&sdev->dev, qdev);
 
 	dev_dbg(&sdev->dev, "Qualcomm SMD QRTR driver probed\n");
-- 
2.7.0

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-04-22 23:20     ` Jeff Kirsher
@ 2016-04-24 22:59       ` Mark Brown
  0 siblings, 0 replies; 249+ messages in thread
From: Mark Brown @ 2016-04-24 22:59 UTC (permalink / raw)
  To: Jeff Kirsher
  Cc: David Miller, sfr, netdev, linux-next, linux-kernel,
	mark.d.rustad, andrewx.bowers, kernel-build-reports,
	linaro-kernel

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

On Fri, Apr 22, 2016 at 04:20:43PM -0700, Jeff Kirsher wrote:
> On Fri, 2016-04-22 at 10:20 +0100, Mark Brown wrote:

> > > Jeff, please have your folks look into this.  Probably just a
> > simple
> > > conversion to mdelay().

> > This is still present, it's been breaking ARM allmodconfig builds for
> > about two weeks now.

> Interesting that no one spoke up until just a week ago.  I have a fix
> and I ready to push it to David Miller.

Like Stephen said it had been there for a couple of days already at the
time it was reported; I happened to be busy at the time it came up so
wasn't looking at the build reports myself.  If you've got a fix please
get it submitted ASAP, having common test configurations broken for any
length of time does get disruptive.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-04-22  9:20   ` Mark Brown
@ 2016-04-22 23:20     ` Jeff Kirsher
  2016-04-24 22:59       ` Mark Brown
  0 siblings, 1 reply; 249+ messages in thread
From: Jeff Kirsher @ 2016-04-22 23:20 UTC (permalink / raw)
  To: Mark Brown, David Miller
  Cc: sfr, netdev, linux-next, linux-kernel, mark.d.rustad,
	andrewx.bowers, kernel-build-reports, linaro-kernel

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

On Fri, 2016-04-22 at 10:20 +0100, Mark Brown wrote:
> On Wed, Apr 13, 2016 at 11:15:13AM -0400, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> > > After merging the net-next tree, today's linux-next build (arm
> > > allmodconfig) failed like thisi (this has actually been failing
> for a
> > > few days, now):
> 
> > > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko]
> undefined!
> 
> > > Caused by commit
> 
> > >   49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
> 
> > > arm only allows udelay()s up to 2 milliseconds.  This commit
> > > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
> 
> > Jeff, please have your folks look into this.  Probably just a
> simple
> > conversion to mdelay().
> 
> This is still present, it's been breaking ARM allmodconfig builds for
> about two weeks now.

Interesting that no one spoke up until just a week ago.  I have a fix
and I ready to push it to David Miller.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-04-13 15:15 ` David Miller
  2016-04-17  9:47   ` Arnd Bergmann
@ 2016-04-22  9:20   ` Mark Brown
  2016-04-22 23:20     ` Jeff Kirsher
  1 sibling, 1 reply; 249+ messages in thread
From: Mark Brown @ 2016-04-22  9:20 UTC (permalink / raw)
  To: David Miller
  Cc: sfr, netdev, linux-next, linux-kernel, mark.d.rustad,
	jeffrey.t.kirsher, andrewx.bowers, kernel-build-reports,
	linaro-kernel

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

On Wed, Apr 13, 2016 at 11:15:13AM -0400, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>

> > After merging the net-next tree, today's linux-next build (arm
> > allmodconfig) failed like thisi (this has actually been failing for a
> > few days, now):

> > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!

> > Caused by commit

> >   49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")

> > arm only allows udelay()s up to 2 milliseconds.  This commit
> > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.

> Jeff, please have your folks look into this.  Probably just a simple
> conversion to mdelay().

This is still present, it's been breaking ARM allmodconfig builds for
about two weeks now.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-04-13 15:15 ` David Miller
@ 2016-04-17  9:47   ` Arnd Bergmann
  2016-04-22  9:20   ` Mark Brown
  1 sibling, 0 replies; 249+ messages in thread
From: Arnd Bergmann @ 2016-04-17  9:47 UTC (permalink / raw)
  To: kernel-build-reports
  Cc: David Miller, sfr, andrewx.bowers, linaro-kernel, netdev,
	linux-kernel, linux-next, jeffrey.t.kirsher, mark.d.rustad

On Wednesday 13 April 2016 11:15:13 David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 13 Apr 2016 17:50:28 +1000
> 
> > After merging the net-next tree, today's linux-next build (arm
> > allmodconfig) failed like thisi (this has actually been failing for a
> > few days, now):
> > 
> > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
> > 
> > Caused by commit
> > 
> >   49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
> > 
> > arm only allows udelay()s up to 2 milliseconds.  This commit
> > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
> 
> Jeff, please have your folks look into this.  Probably just a simple
> conversion to mdelay().
> 

I sent a patch, pretty sure we can use msleep() here rather than
a wasteful mdelay().

	Arnd

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-04-13  7:50 Stephen Rothwell
@ 2016-04-13 15:15 ` David Miller
  2016-04-17  9:47   ` Arnd Bergmann
  2016-04-22  9:20   ` Mark Brown
  0 siblings, 2 replies; 249+ messages in thread
From: David Miller @ 2016-04-13 15:15 UTC (permalink / raw)
  To: sfr
  Cc: netdev, linux-next, linux-kernel, mark.d.rustad,
	jeffrey.t.kirsher, andrewx.bowers, broonie, kernel-build-reports,
	linaro-kernel

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 13 Apr 2016 17:50:28 +1000

> After merging the net-next tree, today's linux-next build (arm
> allmodconfig) failed like thisi (this has actually been failing for a
> few days, now):
> 
> ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
> 
> Caused by commit
> 
>   49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
> 
> arm only allows udelay()s up to 2 milliseconds.  This commit
> adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.

Jeff, please have your folks look into this.  Probably just a simple
conversion to mdelay().

Thanks!

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

* linux-next: build failure after merge of the net-next tree
@ 2016-04-13  7:50 Stephen Rothwell
  2016-04-13 15:15 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2016-04-13  7:50 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Mark Rustad, Jeff Kirsher,
	Andrew Bowers, Build bot for Mark Brown, kernel-build-reports,
	linaro-kernel

Hi all,

[A report from Mark's buildbot]

After merging the net-next tree, today's linux-next build (arm
allmodconfig) failed like thisi (this has actually been failing for a
few days, now):

ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!

Caused by commit

  49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")

arm only allows udelay()s up to 2 milliseconds.  This commit
adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.

-- 
Cheers,
Stephen Rothwell

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

* RE: linux-next: build failure after merge of the net-next tree
  2016-02-18 20:28 ` David Miller
@ 2016-02-18 22:14   ` Yuval Mintz
  0 siblings, 0 replies; 249+ messages in thread
From: Yuval Mintz @ 2016-02-18 22:14 UTC (permalink / raw)
  To: David Miller, sfr; +Cc: netdev, linux-next, linux-kernel, Ariel Elior

> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > In file included from drivers/net/ethernet/broadcom/bnx2x/bnx2x.h:56:0,
> >                  from drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:30:
> > drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c: In function
> 'bnx2x_dcbx_get_ap_feature':
> > drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:224:11: error:
> 'DCBX_APP_SF_DEFAULT' undeclared (first use in this function)
> >            DCBX_APP_SF_DEFAULT) &&
> >            ^
> > Caused by commit
> >
> >   e5d3a51cefbb ("This adds support for default application priority.")
> >
> > This build is big endian.
> 
> Yuval and Ariel, you _MUST_ fix this.
> 
> This build failure has been in the tree for 24 hours and I haven't heard anything
> from you two yet.

Hi Dave,

Perhaps I wasn't clear enough in the title I've provided for the fixing patch,
but I've sent it yesterday and it's marked as 'under review' for net-next.
The patch is "bnx2x: Add missing HSI for big-endian machines".

Sorry about all the noise.

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-02-18  1:28 Stephen Rothwell
@ 2016-02-18 20:28 ` David Miller
  2016-02-18 22:14   ` Yuval Mintz
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2016-02-18 20:28 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, Yuval.Mintz, Ariel.Elior

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 Feb 2016 12:28:55 +1100

> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from drivers/net/ethernet/broadcom/bnx2x/bnx2x.h:56:0,
>                  from drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:30:
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c: In function 'bnx2x_dcbx_get_ap_feature':
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:224:11: error: 'DCBX_APP_SF_DEFAULT' undeclared (first use in this function)
>            DCBX_APP_SF_DEFAULT) &&  
>            ^
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h:120:45: note: in definition of macro 'GET_FLAGS'
>  #define GET_FLAGS(flags, bits)  ((flags) & (bits))
>                                              ^
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:224:11: note: each undeclared identifier is reported only once for each function it appears in
>            DCBX_APP_SF_DEFAULT) &&  
>            ^
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h:120:45: note: in definition of macro 'GET_FLAGS'
>  #define GET_FLAGS(flags, bits)  ((flags) & (bits))
>                                              ^
> 
> Caused by commit
> 
>   e5d3a51cefbb ("This adds support for default application priority.")
> 
> This build is big endian.

Yuval and Ariel, you _MUST_ fix this.

This build failure has been in the tree for 24 hours and I haven't heard anything
from you two yet.

If this persists for another day I'm reverting all of your changes.

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

* linux-next: build failure after merge of the net-next tree
@ 2016-02-18  1:28 Stephen Rothwell
  2016-02-18 20:28 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2016-02-18  1:28 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Yuval Mintz, Ariel Elior

Hi all,

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

In file included from drivers/net/ethernet/broadcom/bnx2x/bnx2x.h:56:0,
                 from drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:30:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c: In function 'bnx2x_dcbx_get_ap_feature':
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:224:11: error: 'DCBX_APP_SF_DEFAULT' undeclared (first use in this function)
           DCBX_APP_SF_DEFAULT) &&  
           ^
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h:120:45: note: in definition of macro 'GET_FLAGS'
 #define GET_FLAGS(flags, bits)  ((flags) & (bits))
                                             ^
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c:224:11: note: each undeclared identifier is reported only once for each function it appears in
           DCBX_APP_SF_DEFAULT) &&  
           ^
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h:120:45: note: in definition of macro 'GET_FLAGS'
 #define GET_FLAGS(flags, bits)  ((flags) & (bits))
                                             ^

Caused by commit

  e5d3a51cefbb ("This adds support for default application priority.")

This build is big endian.

I have used the net-next tree from next-20160217 for today.

-- 
Cheers,
Stephen Rothwell

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

* Re: linux-next: build failure after merge of the net-next tree
  2016-01-11  2:46 Stephen Rothwell
@ 2016-01-11  3:02 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2016-01-11  3:02 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, andrew, Henri.Roosen

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2016 13:46:15 +1100

> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Jan 2016 13:25:09 +1100
> Subject: [PATCH] phy: micrel: fix up for "phy: Add an mdio_device structure"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, it's correct and I'll make sure I do this when
I merge net into net-next.

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

* linux-next: build failure after merge of the net-next tree
@ 2016-01-11  2:46 Stephen Rothwell
  2016-01-11  3:02 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2016-01-11  2:46 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Andrew Lunn, Roosen Henri

Hi all,

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

drivers/net/phy/micrel.c: In function 'ksz9031_config_init':
drivers/net/phy/micrel.c:492:22: error: 'struct phy_device' has no member named 'dev'
  dev_walker = &phydev->dev;
                      ^

Caused by commit

  e5a03bfd873c ("phy: Add an mdio_device structure")

interacting with commit

  b4c19f71252e ("phy: micrel: Fix finding PHY properties in MAC node for KSZ9031.")

from the net tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2016 13:25:09 +1100
Subject: [PATCH] phy: micrel: fix up for "phy: Add an mdio_device structure"

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

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 41b598548f2e..03833dbfca67 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -489,7 +489,7 @@ static int ksz9031_config_init(struct phy_device *phydev)
 	 * properties in the MAC node. Walk up the tree of devices to
 	 * find a device with an OF node.
 	 */
-	dev_walker = &phydev->dev;
+	dev_walker = &phydev->mdio.dev;
 	do {
 		of_node = dev_walker->of_node;
 		dev_walker = dev_walker->parent;
-- 
2.6.4

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

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

* linux-next: build failure after merge of the net-next tree
@ 2015-10-06  5:34 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-10-06  5:34 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Peter Nørlund

Hi all,

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

net/built-in.o: In function `fib_rebalance':
fib_semantics.c:(.text+0x9d6d4): undefined reference to `__divdi3'

Caused by commit

  0e884c78ee19 ("ipv4: L3 hash-based multipath")

I have reverted that commit (and the following commit since it may depend
on the former) for today.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-08-24  3:33 ` David Miller
@ 2015-08-24  4:20   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-08-24  4:20 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, jbenc

Hi Dave,

On Sun, 23 Aug 2015 20:33:25 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 24 Aug 2015 13:21:11 +1000
> 
> > After merging the net-next tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> 
> Fixed by:
> 
> ====================
> [PATCH] route: fix breakage after moving lwtunnel state

Thanks, I will get that tomorrow.  I must try to remember to check to
see if you have added fixes to your tree when I get these errors (not
that it happens all that often).

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-08-24  3:21 Stephen Rothwell
@ 2015-08-24  3:33 ` David Miller
  2015-08-24  4:20   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-08-24  3:33 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, jbenc

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Aug 2015 13:21:11 +1000

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

Fixed by:

====================
[PATCH] route: fix breakage after moving lwtunnel state

__recnt and related fields need to be in its own cacheline for performance
reasons. Commit 61adedf3e3f1 ("route: move lwtunnel state to dst_entry")
broke that on 32bit archs, causing BUILD_BUG_ON in dst_hold to be triggered.

This patch fixes the breakage by moving the lwtunnel state to the end of
dst_entry on 32bit archs. Unfortunately, this makes it share the cacheline
with __refcnt and may affect performance, thus further patches may be
needed.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 61adedf3e3f1 ("route: move lwtunnel state to dst_entry")
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/net/dst.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/net/dst.h b/include/net/dst.h
index 0a9a723..ef8f1d4 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -44,7 +44,6 @@ struct dst_entry {
 #else
 	void			*__pad1;
 #endif
-	struct lwtunnel_state   *lwtstate;
 	int			(*input)(struct sk_buff *);
 	int			(*output)(struct sock *sk, struct sk_buff *skb);
 
@@ -85,11 +84,12 @@ struct dst_entry {
 	__u32			__pad2;
 #endif
 
+#ifdef CONFIG_64BIT
+	struct lwtunnel_state   *lwtstate;
 	/*
 	 * Align __refcnt to a 64 bytes alignment
 	 * (L1_CACHE_SIZE would be too much)
 	 */
-#ifdef CONFIG_64BIT
 	long			__pad_to_align_refcnt[1];
 #endif
 	/*
@@ -99,6 +99,9 @@ struct dst_entry {
 	atomic_t		__refcnt;	/* client references	*/
 	int			__use;
 	unsigned long		lastuse;
+#ifndef CONFIG_64BIT
+	struct lwtunnel_state   *lwtstate;
+#endif
 	union {
 		struct dst_entry	*next;
 		struct rtable __rcu	*rt_next;
-- 
2.1.0

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

* linux-next: build failure after merge of the net-next tree
@ 2015-08-24  3:21 Stephen Rothwell
  2015-08-24  3:33 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-08-24  3:21 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jiri Benc

Hi all,

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

In function 'dst_hold',
    inlined from '__ipv6_dev_ac_dec' at /home/sfr/next/next/net/ipv6/anycast.c:328:2:
/home/sfr/next/next/include/linux/compiler.h:447:38: error: call to '__compiletime_assert_243' declared with attribute error: BUILD_BUG_ON failed: offsetof(struct dst_entry, __refcnt) & 63
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
                                      ^
/home/sfr/next/next/include/linux/compiler.h:430:4: note: in definition of macro '__compiletime_assert'
    prefix ## suffix();    \
    ^
/home/sfr/next/next/include/linux/compiler.h:447:2: note: in expansion of macro '_compiletime_assert'
  _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
  ^
/home/sfr/next/next/include/linux/bug.h:50:37: note: in expansion of macro 'compiletime_assert'
 #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
                                     ^
/home/sfr/next/next/include/linux/bug.h:74:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
  BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
  ^
/home/sfr/next/next/include/net/dst.h:243:2: note: in expansion of macro 'BUILD_BUG_ON'
  BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63);
  ^

And many more :-(

Caused by commit

  61adedf3e3f1 ("route: move lwtunnel state to dst_entry")

I have used the net-next tree from next-20150821 for today.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-08-20  2:57 Stephen Rothwell
@ 2015-08-20  5:16 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-08-20  5:16 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, jbenc

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 20 Aug 2015 12:57:34 +1000

> After merging the net-next tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> net/ipv4/fib_semantics.c: In function 'fib_encap_match':
> net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function 'lwtstate_free' [-Werror=implicit-function-declaration]
>    lwtstate_free(lwtstate);
>    ^
> 
> Caused by commit
> 
>   df383e6240ef ("lwtunnel: fix memory leak")
> 
> CONFIG_LWTUNNEL is not set for this build.
> 
> I reverted that commit for today.

Ought to already be fixed by:

====================
From 824e7383e92815cb591793c74cc836aa5165f7f8 Mon Sep 17 00:00:00 2001
From: Ying Xue <ying.xue@windriver.com>
Date: Wed, 19 Aug 2015 15:46:17 +0800
Subject: [PATCH 1/2] lwtunnel: Fix the sparse warnings in fib_encap_match
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When CONFIG_LWTUNNEL config is not enabled, the lwtstate_free() is not
declared in lwtunnel.h at all. However, even in this case, the function
is still referenced in fib_semantics.c so that there appears the
following sparse warnings:

net/ipv4/fib_semantics.c:553:17: error: undefined identifier 'lwtstate_free'
  CC      net/ipv4/fib_semantics.o
  net/ipv4/fib_semantics.c: In function ‘fib_encap_match’:
  net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function ‘lwtstate_free’ [-Werror=implicit-function-declaration]
  cc1: some warnings being treated as errors
  make[1]: *** [net/ipv4/fib_semantics.o] Error 1
  make: *** [net/ipv4/fib_semantics.o] Error 2

To eliminate the error, we define an empty function for lwtstate_free()
in lwtunnel.h when CONFIG_LWTUNNEL is disabled.

Fixes: df383e6240ef ("lwtunnel: fix memory leak")
Cc: Jiri Benc <jbenc@redhat.com>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/net/lwtunnel.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index 34fd8f7..cfee539 100644
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@ -93,6 +93,10 @@ int lwtunnel_input6(struct sk_buff *skb);
 
 #else
 
+static inline void lwtstate_free(struct lwtunnel_state *lws)
+{
+}
+
 static inline struct lwtunnel_state *
 lwtstate_get(struct lwtunnel_state *lws)
 {
-- 
2.1.0


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

* linux-next: build failure after merge of the net-next tree
@ 2015-08-20  2:57 Stephen Rothwell
  2015-08-20  5:16 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-08-20  2:57 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Jiri Benc

Hi all,

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

net/ipv4/fib_semantics.c: In function 'fib_encap_match':
net/ipv4/fib_semantics.c:553:3: error: implicit declaration of function 'lwtstate_free' [-Werror=implicit-function-declaration]
   lwtstate_free(lwtstate);
   ^

Caused by commit

  df383e6240ef ("lwtunnel: fix memory leak")

CONFIG_LWTUNNEL is not set for this build.

I reverted that commit for today.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-08-18  8:39 Stephen Rothwell
@ 2015-08-18 21:25 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-08-18 21:25 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, _govind, nalreddy

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Aug 2015 18:39:17 +1000

> drivers/net/built-in.o: In function `.vnic_wq_devcmd2_alloc':
> (.text+0x49fe40): multiple definition of `.vnic_wq_devcmd2_alloc'
> drivers/scsi/built-in.o:(.text+0xb4318): first defined here
> drivers/net/built-in.o:(.opd+0x2af00): multiple definition of `vnic_wq_devcmd2_alloc'
> drivers/scsi/built-in.o:(.opd+0xad70): first defined here
> drivers/net/built-in.o: In function `.vnic_wq_init_start':
> (.text+0x49f9c0): multiple definition of `.vnic_wq_init_start'
> drivers/scsi/built-in.o:(.text+0xb3b58): first defined here
> drivers/net/built-in.o:(.opd+0x2ae88): multiple definition of `vnic_wq_init_start'
> drivers/scsi/built-in.o:(.opd+0xace0): first defined here

I've committed the following to fix this:

====================
[PATCH] enic: Fix namespace pollution causing build errors.

drivers/net/built-in.o: In function `.vnic_wq_devcmd2_alloc':
(.text+0x49fe40): multiple definition of `.vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.text+0xb4318): first defined here
drivers/net/built-in.o:(.opd+0x2af00): multiple definition of `vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.opd+0xad70): first defined here
drivers/net/built-in.o: In function `.vnic_wq_init_start':
(.text+0x49f9c0): multiple definition of `.vnic_wq_init_start'
drivers/scsi/built-in.o:(.text+0xb3b58): first defined here
drivers/net/built-in.o:(.opd+0x2ae88): multiple definition of `vnic_wq_init_start'
drivers/scsi/built-in.o:(.opd+0xace0): first defined here

Rename these to 'enic_*' to avoid the conflict with the functiosn of
the same name in the snic scsi driver.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/cisco/enic/vnic_dev.c | 4 ++--
 drivers/net/ethernet/cisco/enic/vnic_wq.c  | 6 +++---
 drivers/net/ethernet/cisco/enic/vnic_wq.h  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/cisco/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
index 9f6c641..19a49a6 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_dev.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_dev.c
@@ -388,7 +388,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
 
 	vdev->devcmd2->color = 1;
 	vdev->devcmd2->result_size = DEVCMD2_RING_SIZE;
-	err = vnic_wq_devcmd2_alloc(vdev, &vdev->devcmd2->wq, DEVCMD2_RING_SIZE,
+	err = enic_wq_devcmd2_alloc(vdev, &vdev->devcmd2->wq, DEVCMD2_RING_SIZE,
 				    DEVCMD2_DESC_SIZE);
 	if (err)
 		goto err_free_devcmd2;
@@ -400,7 +400,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev)
 		return -ENODEV;
 	}
 
-	vnic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0,
+	enic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0,
 			   0);
 	vnic_wq_enable(&vdev->devcmd2->wq);
 
diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
index 627f3b1..05ad16a 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_wq.c
+++ b/drivers/net/ethernet/cisco/enic/vnic_wq.c
@@ -114,7 +114,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
 	return 0;
 }
 
-int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
+int enic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
 			  unsigned int desc_count, unsigned int desc_size)
 {
 	int err;
@@ -131,7 +131,7 @@ int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
 	return err;
 }
 
-void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
+void enic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
 			unsigned int fetch_index, unsigned int posted_index,
 			unsigned int error_interrupt_enable,
 			unsigned int error_interrupt_offset)
@@ -158,7 +158,7 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int cq_index,
 	unsigned int error_interrupt_enable,
 	unsigned int error_interrupt_offset)
 {
-	vnic_wq_init_start(wq, cq_index, 0, 0,
+	enic_wq_init_start(wq, cq_index, 0, 0,
 		error_interrupt_enable,
 		error_interrupt_offset);
 }
diff --git a/drivers/net/ethernet/cisco/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h
index c9b25d3..8944af9 100644
--- a/drivers/net/ethernet/cisco/enic/vnic_wq.h
+++ b/drivers/net/ethernet/cisco/enic/vnic_wq.h
@@ -185,9 +185,9 @@ void vnic_wq_enable(struct vnic_wq *wq);
 int vnic_wq_disable(struct vnic_wq *wq);
 void vnic_wq_clean(struct vnic_wq *wq,
 	void (*buf_clean)(struct vnic_wq *wq, struct vnic_wq_buf *buf));
-int vnic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
+int enic_wq_devcmd2_alloc(struct vnic_dev *vdev, struct vnic_wq *wq,
 			  unsigned int desc_count, unsigned int desc_size);
-void vnic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
+void enic_wq_init_start(struct vnic_wq *wq, unsigned int cq_index,
 			unsigned int fetch_index, unsigned int posted_index,
 			unsigned int error_interrupt_enable,
 			unsigned int error_interrupt_offset);
-- 
2.1.0

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

* linux-next: build failure after merge of the net-next tree
@ 2015-08-18  8:39 Stephen Rothwell
  2015-08-18 21:25 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-08-18  8:39 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Govindarajulu Varadarajan,
	N V V Satyanarayana Reddy

Hi all,

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

drivers/net/built-in.o: In function `.vnic_wq_devcmd2_alloc':
(.text+0x49fe40): multiple definition of `.vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.text+0xb4318): first defined here
drivers/net/built-in.o:(.opd+0x2af00): multiple definition of `vnic_wq_devcmd2_alloc'
drivers/scsi/built-in.o:(.opd+0xad70): first defined here
drivers/net/built-in.o: In function `.vnic_wq_init_start':
(.text+0x49f9c0): multiple definition of `.vnic_wq_init_start'
drivers/scsi/built-in.o:(.text+0xb3b58): first defined here
drivers/net/built-in.o:(.opd+0x2ae88): multiple definition of `vnic_wq_init_start'
drivers/scsi/built-in.o:(.opd+0xace0): first defined here

Caused by commit

  373fb0873d43 ("enic: add devcmd2")

I have reverted that commit for today.

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

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

* linux-next: build failure after merge of the net-next tree
@ 2015-07-23  1:58 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-07-23  1:58 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Thomas Graf

Hi all,

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

net/ipv4/ip_tunnel_core.c:301:1: warning: data definition has no type or storage class
 module_init(ip_tunnel_core_init);
 ^
net/ipv4/ip_tunnel_core.c:301:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int]
net/ipv4/ip_tunnel_core.c:301:1: warning: parameter names (without types) in function declaration
net/ipv4/ip_tunnel_core.c:307:1: warning: data definition has no type or storage class
 module_exit(ip_tunnel_core_exit);
 ^
net/ipv4/ip_tunnel_core.c:307:1: error: type defaults to 'int' in declaration of 'module_exit' [-Werror=implicit-int]
net/ipv4/ip_tunnel_core.c:307:1: warning: parameter names (without types) in function declaration
net/ipv4/ip_tunnel_core.c:295:19: warning: 'ip_tunnel_core_init' defined but not used [-Wunused-function]
 static int __init ip_tunnel_core_init(void)
                   ^

Caused by commit

  3093fbe7ff4b ("route: Per route IP tunnel metadata via lightweight tunnel")

Forgot to include module.h ...

I have used the net-next tree from next-20150722 for today.

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-06-24  7:37 Stephen Rothwell
@ 2015-06-24  8:01 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-06-24  8:01 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, stripathi, isubramanian

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 24 Jun 2015 17:37:10 +1000

> I have applied this patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 24 Jun 2015 17:29:51 +1000
> Subject: [PATCH] drivers: net: xgene: fix for ACPI support without ACPI
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-06-24  7:37 Stephen Rothwell
  2015-06-24  8:01 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-06-24  7:37 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Suman Tripathi, Iyappan Subramanian

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

Hi all,

After merging the net-next tree, today's linux-next build (KCONFIG_NAME)
failed like this:

drivers/net/ethernet/apm/xgene/xgene_enet_main.c: In function 'xgene_get_port_id_acpi':
drivers/net/ethernet/apm/xgene/xgene_enet_main.c:880:2: error: implicit declaration of function 'acpi_evaluate_integer' [-Werror=implicit-function-declaration]
  status = acpi_evaluate_integer(ACPI_HANDLE(dev), "_SUN", NULL, &temp);
  ^
drivers/net/ethernet/apm/xgene/xgene_enet_main.c: At top level:
drivers/net/ethernet/apm/xgene/xgene_enet_main.c:874:12: warning: 'xgene_get_port_id_acpi' defined but not used [-Wunused-function]
 static int xgene_get_port_id_acpi(struct device *dev,
            ^

Caused by commit 0738c54d6324 ("drivers: net: xgene: Fix the ACPI support
for RGMII/SGMII0/XFI interface of APM X-Gene SoC ethernet controller").

I have applied this patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 24 Jun 2015 17:29:51 +1000
Subject: [PATCH] drivers: net: xgene: fix for ACPI support without ACPI

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index b334f279ce8d..95153b234c71 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -871,6 +871,7 @@ static const struct net_device_ops xgene_ndev_ops = {
 	.ndo_set_mac_address = xgene_enet_set_mac_address,
 };
 
+#ifdef CONFIG_ACPI
 static int xgene_get_port_id_acpi(struct device *dev,
 				  struct xgene_enet_pdata *pdata)
 {
@@ -886,6 +887,7 @@ static int xgene_get_port_id_acpi(struct device *dev,
 
 	return 0;
 }
+#endif
 
 static int xgene_get_port_id_dt(struct device *dev, struct xgene_enet_pdata *pdata)
 {
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-06-01  3:44 Stephen Rothwell
@ 2015-06-01  4:35 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-06-01  4:35 UTC (permalink / raw)
  To: sfr; +Cc: netdev, rusty, linux-next, linux-kernel, saeedm, ranas, achiad, amirv

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Jun 2015 13:44:13 +1000

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint':
> drivers/net/ethernet/mellanox/mlx5/core/main.c:474:2: error: implicit declaration of function 'cpumask_set_cpu_local_first' [-Werror=implicit-function-declaration]
>   err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
>   ^
> 
> Caused by commit db058a186f98 ("net/mlx5_core: Set irq affinity hints")
> interacting with commit f36963c9d3f6 ("cpumask_set_cpu_local_first =>
> cpumask_local_spread, lament") from Linus' tree.
> 
> I have applied the following merge fix patch (Dave, you could do this
> by back merging commit f36963c9d3f6 from Linus' tree - which is based
> on v4.1-rc2 if that worries you).  Please yell if this is not correct
> (it does build).

Thanks Stephen, I'll take care of this next time I merge.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-06-01  3:44 Stephen Rothwell
  2015-06-01  4:35 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-06-01  3:44 UTC (permalink / raw)
  To: David Miller, netdev, Rusty Russell
  Cc: linux-next, linux-kernel, Saeed Mahameed, Rana Shahout,
	Achiad Shochat, Amir Vadai

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

Hi all,

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

drivers/net/ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint':
drivers/net/ethernet/mellanox/mlx5/core/main.c:474:2: error: implicit declaration of function 'cpumask_set_cpu_local_first' [-Werror=implicit-function-declaration]
  err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
  ^

Caused by commit db058a186f98 ("net/mlx5_core: Set irq affinity hints")
interacting with commit f36963c9d3f6 ("cpumask_set_cpu_local_first =>
cpumask_local_spread, lament") from Linus' tree.

I have applied the following merge fix patch (Dave, you could do this
by back merging commit f36963c9d3f6 from Linus' tree - which is based
on v4.1-rc2 if that worries you).  Please yell if this is not correct
(it does build).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Jun 2015 13:36:49 +1000
Subject: [PATCH] net/mlx5_core: merge fix for cpumask_set_cpu_local_first API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 1c37f587426d..2510fed3494d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -471,11 +471,8 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)
 		return -ENOMEM;
 	}
 
-	err = cpumask_set_cpu_local_first(i, numa_node, priv->irq_info[i].mask);
-	if (err) {
-		mlx5_core_warn(mdev, "cpumask_set_cpu_local_first failed");
-		goto err_clear_mask;
-	}
+	cpumask_set_cpu(cpumask_local_spread(i, numa_node),
+			priv->irq_info[i].mask);
 
 	err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);
 	if (err) {
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-30  4:05 Stephen Rothwell
@ 2015-03-31 18:13 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-03-31 18:13 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ben.hutchings

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Mar 2015 15:05:34 +1100

> Caused by a bad merge between commits 1e9e39f4a298 ("usbnet: Fix
> tx_packets stat for FLAG_MULTI_FRAME drivers") and 7a1e890e2168
> ("usbnet: Fix tx_bytes statistic running backward in cdc_ncm") form the
> net tree and commit 6588af614e7b ("usbnet: Fix tx_packets stat for
> FLAG_MULTI_FRAME drivers") from the net-next tree.  (Presumably,
> 6588af614e7b was cherry-picked as a bug fix.  So, Dave, something to
> watch for if you merge net into net-next.)

Thanks a lot for bringing this to my attention Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-03-30  4:05 Stephen Rothwell
  2015-03-31 18:13 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-03-30  4:05 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Ben Hutchings

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

Hi all,

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

drivers/net/usb/cdc_ncm.c: In function 'cdc_ncm_fill_tx_frame':
drivers/net/usb/cdc_ncm.c:1187:2: error: too few arguments to function 'usbnet_set_skb_tx_stats'
  usbnet_set_skb_tx_stats(skb_out, n);
  ^
In file included from drivers/net/usb/cdc_ncm.c:51:0:
include/linux/usb/usbnet.h:238:1: note: declared here
 usbnet_set_skb_tx_stats(struct sk_buff *skb,
 ^

Caused by a bad merge between commits 1e9e39f4a298 ("usbnet: Fix
tx_packets stat for FLAG_MULTI_FRAME drivers") and 7a1e890e2168
("usbnet: Fix tx_bytes statistic running backward in cdc_ncm") form the
net tree and commit 6588af614e7b ("usbnet: Fix tx_packets stat for
FLAG_MULTI_FRAME drivers") from the net-next tree.  (Presumably,
6588af614e7b was cherry-picked as a bug fix.  So, Dave, something to
watch for if you merge net into net-next.)

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Mar 2015 14:59:49 +1100
Subject: [PATCH] usbnet: fix bad merge in cdc_ncm.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/usb/cdc_ncm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index ee6fed0af6f5..c3e4da9e79ca 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -1184,8 +1184,6 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
 	usbnet_set_skb_tx_stats(skb_out, n,
 				ctx->tx_curr_frame_payload - skb_out->len);
 
-	usbnet_set_skb_tx_stats(skb_out, n);
-
 	return skb_out;
 
 exit_no_skb:
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-24 10:43   ` Christoph Hellwig
@ 2015-03-24 15:59     ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-03-24 15:59 UTC (permalink / raw)
  To: hch; +Cc: sfr, netdev, viro, linux-next, linux-kernel, tadeusz.struk

From: Christoph Hellwig <hch@lst.de>
Date: Tue, 24 Mar 2015 11:43:46 +0100

> On Mon, Mar 23, 2015 at 11:00:03PM -0400, David Miller wrote:
>> Ok, more conflicts wiht Al's vfs work.
>> 
>> This is starting to pile on, heavily...
> 
> These are my changes.  But I think it would be much better if any aio-related
> changes like this one we be one on top of my changes in Al's iocb branch,
> there have been various changes, and it would be better to review and
> commit the changes on top of it instead of carrying the changes as fixups.
> 
> Nevermind the actual test coverage..

That's no longer possible as my tree never rebases and the commits are pushed
out already.

Another solution to this set of conflicts, is therefore necessary.

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-24  3:00 ` David Miller
@ 2015-03-24 10:43   ` Christoph Hellwig
  2015-03-24 15:59     ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Christoph Hellwig @ 2015-03-24 10:43 UTC (permalink / raw)
  To: David Miller
  Cc: sfr, netdev, viro, linux-next, linux-kernel, hch, tadeusz.struk

On Mon, Mar 23, 2015 at 11:00:03PM -0400, David Miller wrote:
> Ok, more conflicts wiht Al's vfs work.
> 
> This is starting to pile on, heavily...

These are my changes.  But I think it would be much better if any aio-related
changes like this one we be one on top of my changes in Al's iocb branch,
there have been various changes, and it would be better to review and
commit the changes on top of it instead of carrying the changes as fixups.

Nevermind the actual test coverage..

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-24  2:45 Stephen Rothwell
@ 2015-03-24  3:00 ` David Miller
  2015-03-24 10:43   ` Christoph Hellwig
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-03-24  3:00 UTC (permalink / raw)
  To: sfr; +Cc: netdev, viro, linux-next, linux-kernel, hch, tadeusz.struk

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Mar 2015 13:45:08 +1100

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> crypto/algif_skcipher.c: In function 'skcipher_async_cb':
> crypto/algif_skcipher.c:109:2: error: implicit declaration of function 'aio_complete' [-Werror=implicit-function-declaration]
>   aio_complete(iocb, err, err);
>   ^
> 
> Caused by commit a596999b7ddf ("crypto: algif - change algif_skcipher
> to be asynchronous") interacting with commit 04b2fa9f8f36 ("fs: split
> generic and aio kiocb") from the vfs tree.
> 
> I applied the following merge fix patch (which gets it building, but I
> am not sure if more is needed).

Ok, more conflicts wiht Al's vfs work.

This is starting to pile on, heavily...

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

* linux-next: build failure after merge of the net-next tree
@ 2015-03-24  2:45 Stephen Rothwell
  2015-03-24  3:00 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-03-24  2:45 UTC (permalink / raw)
  To: David Miller, netdev, Al Viro
  Cc: linux-next, linux-kernel, Christoph Hellwig, Tadeusz Struk

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

Hi all,

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

crypto/algif_skcipher.c: In function 'skcipher_async_cb':
crypto/algif_skcipher.c:109:2: error: implicit declaration of function 'aio_complete' [-Werror=implicit-function-declaration]
  aio_complete(iocb, err, err);
  ^

Caused by commit a596999b7ddf ("crypto: algif - change algif_skcipher
to be asynchronous") interacting with commit 04b2fa9f8f36 ("fs: split
generic and aio kiocb") from the vfs tree.

I applied the following merge fix patch (which gets it building, but I
am not sure if more is needed).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Mar 2015 13:40:45 +1100
Subject: [PATCH] crypto: algif - cope with aio_complete() going away

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

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 8276f21ea7be..506eb5f62b03 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -106,7 +106,7 @@ static void skcipher_async_cb(struct crypto_async_request *req, int err)
 	atomic_dec(&ctx->inflight);
 	skcipher_free_async_sgls(sreq);
 	kfree(req);
-	aio_complete(iocb, err, err);
+	iocb->ki_complete(iocb, err, err);
 }
 
 static inline int skcipher_sndbuf(struct sock *sk)
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-06  2:01     ` David Miller
@ 2015-03-06  2:42       ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-03-06  2:42 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, ebiederm

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

Hi Dave,

On Thu, 05 Mar 2015 21:01:47 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> The perils of working on multiple workstations :-)
> 
> Pushed out now, sorry about that.

No worries.  I know what its like as we get older ;-)

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-05 23:26   ` Stephen Rothwell
@ 2015-03-06  2:01     ` David Miller
  2015-03-06  2:42       ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-03-06  2:01 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ebiederm

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 6 Mar 2015 10:26:14 +1100

> On Thu, 05 Mar 2015 00:01:58 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 5 Mar 2015 13:42:47 +1100
>> 
>> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>> > Date: Thu, 5 Mar 2015 13:37:05 +1100
>> > Subject: [PATCH] mpls: using vzalloc requires including vmalloc.h
>> > 
>> > Fixes this build error:
>> > 
>> > net/mpls/af_mpls.c: In function 'resize_platform_label_table':
>> > net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
>> >     labels = vzalloc(size);
>> >     ^
>> > 
>> > Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table")
>> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> 
>> Applied, thanks Stephen.
> 
> I don't see it in net-next?

The perils of working on multiple workstations :-)

Pushed out now, sorry about that.

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-05  5:01 ` David Miller
@ 2015-03-05 23:26   ` Stephen Rothwell
  2015-03-06  2:01     ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-03-05 23:26 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, ebiederm

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

Hi Dave,

On Thu, 05 Mar 2015 00:01:58 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 5 Mar 2015 13:42:47 +1100
> 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 5 Mar 2015 13:37:05 +1100
> > Subject: [PATCH] mpls: using vzalloc requires including vmalloc.h
> > 
> > Fixes this build error:
> > 
> > net/mpls/af_mpls.c: In function 'resize_platform_label_table':
> > net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
> >     labels = vzalloc(size);
> >     ^
> > 
> > Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table")
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> 
> Applied, thanks Stephen.

I don't see it in net-next?

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-03-05  2:42 Stephen Rothwell
@ 2015-03-05  5:01 ` David Miller
  2015-03-05 23:26   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-03-05  5:01 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ebiederm

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Mar 2015 13:42:47 +1100

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 5 Mar 2015 13:37:05 +1100
> Subject: [PATCH] mpls: using vzalloc requires including vmalloc.h
> 
> Fixes this build error:
> 
> net/mpls/af_mpls.c: In function 'resize_platform_label_table':
> net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
>     labels = vzalloc(size);
>     ^
> 
> Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-03-05  2:42 Stephen Rothwell
  2015-03-05  5:01 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-03-05  2:42 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric W. Biederman

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

Hi all,

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

net/mpls/af_mpls.c: In function 'resize_platform_label_table':
net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
    labels = vzalloc(size);
    ^

Caused by commit 7720c01f3f59 ("mpls: Add a sysctl to control the size
of the mpls label table").

I have added this commit for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Mar 2015 13:37:05 +1100
Subject: [PATCH] mpls: using vzalloc requires including vmalloc.h

Fixes this build error:

net/mpls/af_mpls.c: In function 'resize_platform_label_table':
net/mpls/af_mpls.c:767:4: error: implicit declaration of function 'vzalloc' [-Werror=implicit-function-declaration]
    labels = vzalloc(size);
    ^

Fixes: 7720c01f3f59 ("mpls: Add a sysctl to control the size of the mpls label table")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/mpls/af_mpls.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 23e51d13b0ff..20cf48a8593d 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -7,6 +7,7 @@
 #include <linux/if_arp.h>
 #include <linux/ipv6.h>
 #include <linux/mpls.h>
+#include <linux/vmalloc.h>
 #include <net/ip.h>
 #include <net/dst.h>
 #include <net/sock.h>
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-02-10 11:02 Stephen Rothwell
@ 2015-02-11  4:51 ` Jeff Kirsher
  0 siblings, 0 replies; 249+ messages in thread
From: Jeff Kirsher @ 2015-02-11  4:51 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Carolyn Wyborny

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

On Tue, 2015-02-10 at 22:02 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (i386
> allmodconfig and a few others) failed like this:
> 
> drivers/net/ethernet/intel/i40e/i40e_txrx.c: In function
> 'i40e_setup_rx_descriptors':
> drivers/net/ethernet/intel/i40e/i40e_txrx.c:1101:3: error:
> incompatible type for argument 1 of '__seqcount_init'
> include/linux/seqlock.h:53:20: note: expected 'struct seqcount_t *'
> but argument is of type 'seqcount_t'
> 
> Caused by commit 638702bd59a3 ("i40e/i40evf: Add call to
> u64_stats_init
> to init").
> 
> Discovered after the release, so no fix done.
> 
> The indentation of the lines added by that patch is also a bit
> strange.

Yeah, this was fixed with the follow on patch:

commit c07a213db1437a8fd40c328e6a2c426723caec65
Author: Carolyn Wyborny <carolyn.wyborny@intel.com>
Date:   Tue Feb 10 07:33:15 2015 +0000

    i40e: Fix for stats init function call in Rx setup
    
    This patch fixes indentation issue and error found in argument
    reported by static analysis.  Without this patch, sparse and other
    static analysis errors will be found.
    
    Reported-by: Fengguang Wu <fengguang.wu@intel.com>
    Reported-by: Julia Lawall <julia.lawall@lip6.fr>
    Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* linux-next: build failure after merge of the net-next tree
@ 2015-02-10 11:02 Stephen Rothwell
  2015-02-11  4:51 ` Jeff Kirsher
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-02-10 11:02 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Carolyn Wyborny, Jeff Kirsher

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

Hi all,

After merging the net-next tree, today's linux-next build (i386
allmodconfig and a few others) failed like this:

drivers/net/ethernet/intel/i40e/i40e_txrx.c: In function 'i40e_setup_rx_descriptors':
drivers/net/ethernet/intel/i40e/i40e_txrx.c:1101:3: error: incompatible type for argument 1 of '__seqcount_init'
include/linux/seqlock.h:53:20: note: expected 'struct seqcount_t *' but argument is of type 'seqcount_t'

Caused by commit 638702bd59a3 ("i40e/i40evf: Add call to u64_stats_init
to init").

Discovered after the release, so no fix done.

The indentation of the lines added by that patch is also a bit strange.
-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-02-09  3:07 Stephen Rothwell
@ 2015-02-09  5:52 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2015-02-09  5:52 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, herbert

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Feb 2015 14:07:45 +1100

> diff --git a/lib/rhashtable.c b/lib/rhashtable.c
> index e96fc00208bc..9cc4c4a90d00 100644
> --- a/lib/rhashtable.c
> +++ b/lib/rhashtable.c
> @@ -23,6 +23,7 @@
>  #include <linux/jhash.h>
>  #include <linux/random.h>
>  #include <linux/rhashtable.h>
> +#include <linux/err.h>
>  
>  #define HASH_DEFAULT_SIZE	64UL
>  #define HASH_MIN_SIZE		4UL

Applied, thanks Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-02-09  3:07 Stephen Rothwell
  2015-02-09  5:52 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-02-09  3:07 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Herbert Xu

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

Hi all,

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

lib/rhashtable.c: In function 'rhashtable_walk_next':
lib/rhashtable.c:1002:3: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration]
   return ERR_PTR(-EAGAIN);
   ^
lib/rhashtable.c:1002:3: warning: return makes pointer from integer without a cast

Caused by commit f2dba9c6ff0d ("rhashtable: Introduce
rhashtable_walk_*"). See Rule 1 in Documentation/SubmitChecklist.

I have added the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Feb 2015 14:04:03 +1100
Subject: [PATCH] rhashtable: using ERR_PTR requires linux/err.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 lib/rhashtable.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index e96fc00208bc..9cc4c4a90d00 100644
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -23,6 +23,7 @@
 #include <linux/jhash.h>
 #include <linux/random.h>
 #include <linux/rhashtable.h>
+#include <linux/err.h>
 
 #define HASH_DEFAULT_SIZE	64UL
 #define HASH_MIN_SIZE		4UL
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-19  3:13 ` Marcel Holtmann
@ 2015-01-19  3:30   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-19  3:30 UTC (permalink / raw)
  To: Marcel Holtmann
  Cc: David S. Miller, netdev, linux-next, linux-kernel, Jiri Pirko,
	Scott Feldman, Gustavo F. Padovan

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

Hi Marcel,

On Sun, 18 Jan 2015 19:13:17 -0800 Marcel Holtmann <marcel@holtmann.org> wrote:
>
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > In file included from net/bridge/br.c:22:0:
> > include/net/switchdev.h:73:1: error: expected identifier or '(' before '{' token
> > {
> > ^
> > include/net/switchdev.h:71:19: warning: 'call_netdev_switch_notifiers' declared 'static' but never defined [-Wunused-function]
> > static inline int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
> >                   ^
> > 
> > Caused by commit 03bf0c281234 ("switchdev: introduce switchdev notifier").
> > 
> > I have used the net-next tree from next-20150116 for today.  I also had
> > to use the bluetooth tree from next-20150116 as it was fast forwarded
> > to be the same as the net-next tree today.
> 
> it seems Dave forgot to push out his net-next tree, but in theory it should contain a fix for it.

Or he did so after I fetched his tree this morning.  Either way, I
assume it will be fixed tomorrow.

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-19  3:06 Stephen Rothwell
@ 2015-01-19  3:13 ` Marcel Holtmann
  2015-01-19  3:30   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Marcel Holtmann @ 2015-01-19  3:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David S. Miller, netdev, linux-next, linux-kernel, Jiri Pirko,
	Scott Feldman, Gustavo F. Padovan

Hi Stephen,

> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from net/bridge/br.c:22:0:
> include/net/switchdev.h:73:1: error: expected identifier or '(' before '{' token
> {
> ^
> include/net/switchdev.h:71:19: warning: 'call_netdev_switch_notifiers' declared 'static' but never defined [-Wunused-function]
> static inline int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
>                   ^
> 
> Caused by commit 03bf0c281234 ("switchdev: introduce switchdev notifier").
> 
> I have used the net-next tree from next-20150116 for today.  I also had
> to use the bluetooth tree from next-20150116 as it was fast forwarded
> to be the same as the net-next tree today.

it seems Dave forgot to push out his net-next tree, but in theory it should contain a fix for it.

Regards

Marcel

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

* linux-next: build failure after merge of the net-next tree
@ 2015-01-19  3:06 Stephen Rothwell
  2015-01-19  3:13 ` Marcel Holtmann
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-19  3:06 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jiri Pirko, Scott Feldman, Gustavo Padovan

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

Hi all,

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

In file included from net/bridge/br.c:22:0:
include/net/switchdev.h:73:1: error: expected identifier or '(' before '{' token
 {
 ^
include/net/switchdev.h:71:19: warning: 'call_netdev_switch_notifiers' declared 'static' but never defined [-Wunused-function]
 static inline int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
                   ^

Caused by commit 03bf0c281234 ("switchdev: introduce switchdev notifier").

I have used the net-next tree from next-20150116 for today.  I also had
to use the bluetooth tree from next-20150116 as it was fast forwarded
to be the same as the net-next tree 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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-12  3:08 ` David Miller
@ 2015-01-12  3:12   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-12  3:12 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, xiyou.wangcong, vlee

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

Hi David,

On Sun, 11 Jan 2015 22:08:29 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> It's fixed as of 5 minutes ago in the net-next tree, sorry for this.

OK, thanks.

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-12  3:05 Stephen Rothwell
@ 2015-01-12  3:08 ` David Miller
  2015-01-12  3:12   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-01-12  3:08 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, xiyou.wangcong, vlee

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Jan 2015 14:05:15 +1100

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> Documentation/networking/timestamping/txtimestamp.c: In function '__recv_errmsg_cmsg':
> Documentation/networking/timestamping/txtimestamp.c:205:33: error: dereferencing pointer to incomplete type
> Documentation/networking/timestamping/txtimestamp.c:206:23: error: dereferencing pointer to incomplete type
> 
> Caused by commit cd91cc5bdddf ("doc: fix the compile error of
> txtimestamp.c").  On (at least) Debian stable, the system's definition
> of struct in6_pktinfo depends on __USE_GNU being defined (at least, I
> think that is the problem).
> 
> I have reverted that commit for today.

It's fixed as of 5 minutes ago in the net-next tree, sorry for this.

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

* linux-next: build failure after merge of the net-next tree
@ 2015-01-12  3:05 Stephen Rothwell
  2015-01-12  3:08 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-12  3:05 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, WANG Cong, Vinson Lee

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

Hi all,

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

Documentation/networking/timestamping/txtimestamp.c: In function '__recv_errmsg_cmsg':
Documentation/networking/timestamping/txtimestamp.c:205:33: error: dereferencing pointer to incomplete type
Documentation/networking/timestamping/txtimestamp.c:206:23: error: dereferencing pointer to incomplete type

Caused by commit cd91cc5bdddf ("doc: fix the compile error of
txtimestamp.c").  On (at least) Debian stable, the system's definition
of struct in6_pktinfo depends on __USE_GNU being defined (at least, I
think that is the problem).

I have reverted that commit 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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-03 19:45 ` David Miller
@ 2015-01-05  3:36   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-05  3:36 UTC (permalink / raw)
  To: David Miller
  Cc: netdev, linux-next, linux-kernel, richardcochran, jeffrey.t.kirsher

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

Hi David,

On Sat, 03 Jan 2015 14:45:30 -0500 (EST) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 3 Jan 2015 09:11:01 +1100
> 
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
> > drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
> >   mdev->cycles.mask = CLOCKSOURCE_MASK(48);
> 
> Stephen please let me know if this failure is persisting.

All the ones I reported are fixed, thanks.

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-02 22:11 Stephen Rothwell
  2015-01-02 22:21 ` Sedat Dilek
  2015-01-03  3:01 ` Stephen Rothwell
@ 2015-01-03 19:45 ` David Miller
  2015-01-05  3:36   ` Stephen Rothwell
  2 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2015-01-03 19:45 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, richardcochran, jeffrey.t.kirsher

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 3 Jan 2015 09:11:01 +1100

> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
> drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
>   mdev->cycles.mask = CLOCKSOURCE_MASK(48);

Stephen please let me know if this failure is persisting.

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

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-02 22:11 Stephen Rothwell
  2015-01-02 22:21 ` Sedat Dilek
@ 2015-01-03  3:01 ` Stephen Rothwell
  2015-01-03 19:45 ` David Miller
  2 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-03  3:01 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Richard Cochran, Jeff Kirsher

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

Hi all,

On Sat, 3 Jan 2015 09:11:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
> drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
>   mdev->cycles.mask = CLOCKSOURCE_MASK(48);
>   ^
> drivers/net/ethernet/mellanox/mlx4/en_clock.c:257:3: error: implicit declaration of function 'clocksource_khz2mult' [-Werror=implicit-function-declaration]
>    clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);
>    ^
> drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c: In function 'ixgbe_ptp_start_cyclecounter':
> drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c:796:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
>   adapter->cc.mask = CLOCKSOURCE_MASK(64);
>   ^
> 

My powerpc allyesconfig build also produced this:

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c: In function 'bnx2x_init_cyclecounter':
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c:14613:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
  bp->cyclecounter.mask = CLOCKSOURCE_MASK(64);
  ^

So I added this patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 3 Jan 2015 12:15:37 +1100
Subject: [PATCH] bnx2x: Include clocksource.h to get CLOCKSOURCE_MASK

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2c951326a85d..119c190721da 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -57,6 +57,7 @@
 #include <linux/semaphore.h>
 #include <linux/stringify.h>
 #include <linux/vmalloc.h>
+#include <linux/clocksource.h>
 
 #include "bnx2x.h"
 #include "bnx2x_init.h"
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-02 22:21 ` Sedat Dilek
@ 2015-01-02 23:32   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-02 23:32 UTC (permalink / raw)
  To: Sedat Dilek
  Cc: David Miller, netdev, linux-next, LKML, Richard Cochran, Jeff Kirsher

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

Hi Sedat,

On Fri, 2 Jan 2015 23:21:05 +0100 Sedat Dilek <sedat.dilek@gmail.com> wrote:
>
> On Fri, Jan 2, 2015 at 11:11 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
> > drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
> >   mdev->cycles.mask = CLOCKSOURCE_MASK(48);
> >   ^
> > drivers/net/ethernet/mellanox/mlx4/en_clock.c:257:3: error: implicit declaration of function 'clocksource_khz2mult' [-Werror=implicit-function-declaration]
> >    clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);
> >    ^
> > drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c: In function 'ixgbe_ptp_start_cyclecounter':
> > drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c:796:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
> >   adapter->cc.mask = CLOCKSOURCE_MASK(64);
> >   ^
> >
> > Presumably caused by commit 74d23cc704d1 ("time: move the
> > timecounter/cyclecounter code into its own file").
> 
> Just FYI...
> 
> Richard posted a new patch-series "[PATCH net-next 0/7] Fixing the
> "Time Counter fixes and improvements" on linux-nextdev fixing this.
> 
> - Sedat -
> 
> [1] https://lkml.org/lkml/2015/1/1/27

Thanks, so hopefully I won't need my patch for very long.
-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2015-01-02 22:11 Stephen Rothwell
@ 2015-01-02 22:21 ` Sedat Dilek
  2015-01-02 23:32   ` Stephen Rothwell
  2015-01-03  3:01 ` Stephen Rothwell
  2015-01-03 19:45 ` David Miller
  2 siblings, 1 reply; 249+ messages in thread
From: Sedat Dilek @ 2015-01-02 22:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, LKML, Richard Cochran, Jeff Kirsher

On Fri, Jan 2, 2015 at 11:11 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
> drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
>   mdev->cycles.mask = CLOCKSOURCE_MASK(48);
>   ^
> drivers/net/ethernet/mellanox/mlx4/en_clock.c:257:3: error: implicit declaration of function 'clocksource_khz2mult' [-Werror=implicit-function-declaration]
>    clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);
>    ^
> drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c: In function 'ixgbe_ptp_start_cyclecounter':
> drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c:796:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
>   adapter->cc.mask = CLOCKSOURCE_MASK(64);
>   ^
>
> Presumably caused by commit 74d23cc704d1 ("time: move the
> timecounter/cyclecounter code into its own file").
>

Happy new 2015 Stephen...

[ The last days I revived my linux-next build-script inspired by
willing to test block-loop-mq v3 patchset against next-20141231 ]

Just FYI...

Richard posted a new patch-series "[PATCH net-next 0/7] Fixing the
"Time Counter fixes and improvements" on linux-nextdev fixing this.

- Sedat -

[1] https://lkml.org/lkml/2015/1/1/27

> I added the following commit for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Sat, 3 Jan 2015 09:07:21 +1100
> Subject: [PATCH] ixgbe_ptp, mlx4: Include clocksource.h to get CLOCKSOURCE_MASK
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c  | 1 +
>  drivers/net/ethernet/mellanox/mlx4/en_clock.c | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
> index 47c29eaaa140..73548280cbae 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
> @@ -25,6 +25,7 @@
>    Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
>
>  *******************************************************************************/
> +#include <linux/clocksource.h>
>  #include "ixgbe.h"
>  #include <linux/ptp_classify.h>
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> index e9cce4f72b24..7c6ef4b48f8e 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> @@ -31,6 +31,7 @@
>   *
>   */
>
> +#include <linux/clocksource.h>
>  #include <linux/mlx4/device.h>
>
>  #include "mlx4_en.h"
> --
> 2.1.4
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

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

* linux-next: build failure after merge of the net-next tree
@ 2015-01-02 22:11 Stephen Rothwell
  2015-01-02 22:21 ` Sedat Dilek
                   ` (2 more replies)
  0 siblings, 3 replies; 249+ messages in thread
From: Stephen Rothwell @ 2015-01-02 22:11 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Richard Cochran, Jeff Kirsher

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

Hi all,

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

drivers/net/ethernet/mellanox/mlx4/en_clock.c: In function 'mlx4_en_init_timestamp':
drivers/net/ethernet/mellanox/mlx4/en_clock.c:249:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
  mdev->cycles.mask = CLOCKSOURCE_MASK(48);
  ^
drivers/net/ethernet/mellanox/mlx4/en_clock.c:257:3: error: implicit declaration of function 'clocksource_khz2mult' [-Werror=implicit-function-declaration]
   clocksource_khz2mult(1000 * dev->caps.hca_core_clock, mdev->cycles.shift);
   ^
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c: In function 'ixgbe_ptp_start_cyclecounter':
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c:796:2: error: implicit declaration of function 'CLOCKSOURCE_MASK' [-Werror=implicit-function-declaration]
  adapter->cc.mask = CLOCKSOURCE_MASK(64);
  ^

Presumably caused by commit 74d23cc704d1 ("time: move the
timecounter/cyclecounter code into its own file").

I added the following commit for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sat, 3 Jan 2015 09:07:21 +1100
Subject: [PATCH] ixgbe_ptp, mlx4: Include clocksource.h to get CLOCKSOURCE_MASK

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c  | 1 +
 drivers/net/ethernet/mellanox/mlx4/en_clock.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index 47c29eaaa140..73548280cbae 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -25,6 +25,7 @@
   Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
 
 *******************************************************************************/
+#include <linux/clocksource.h>
 #include "ixgbe.h"
 #include <linux/ptp_classify.h>
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
index e9cce4f72b24..7c6ef4b48f8e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
@@ -31,6 +31,7 @@
  *
  */
 
+#include <linux/clocksource.h>
 #include <linux/mlx4/device.h>
 
 #include "mlx4_en.h"
-- 
2.1.4

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2014-12-10  8:54 Stephen Rothwell
  2014-12-10 10:14 ` Hariprasad S
@ 2014-12-10 20:52 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2014-12-10 20:52 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, hariprasad

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Dec 2014 19:54:05 +1100

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 10 Dec 2014 19:48:02 +1100
> Subject: [PATCH] cxgb4/cxgb4vf: global named must be unique
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks.

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-12-10  8:54 Stephen Rothwell
@ 2014-12-10 10:14 ` Hariprasad S
  2014-12-10 20:52 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Hariprasad S @ 2014-12-10 10:14 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel

On Wed, Dec 10, 2014 at 19:54:05 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/chelsio/cxgb4vf/built-in.o:(.opd+0x630): multiple definition of `t4_bar2_sge_qregs'
> drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.opd+0x14d0): first defined here
> drivers/net/ethernet/chelsio/cxgb4vf/built-in.o: In function `.t4_bar2_sge_qregs':
> (.text+0x9220): multiple definition of `.t4_bar2_sge_qregs'
> drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.text+0x24e24): first defined here
> 
> Caused by commit e85c9a7abfa4 ("cxgb4/cxgb4vf: Add code to calculate T5
> BAR2 Offsets for SGE Queue Registers") which added both versions.  :-(
> 
> I have applied this fir patch for today (including the subject
> typo :-)):
> 
My bad. Thanks for the fix.

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

* linux-next: build failure after merge of the net-next tree
@ 2014-12-10  8:54 Stephen Rothwell
  2014-12-10 10:14 ` Hariprasad S
  2014-12-10 20:52 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-12-10  8:54 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Hariprasad Shenai

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

Hi all,

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

drivers/net/ethernet/chelsio/cxgb4vf/built-in.o:(.opd+0x630): multiple definition of `t4_bar2_sge_qregs'
drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.opd+0x14d0): first defined here
drivers/net/ethernet/chelsio/cxgb4vf/built-in.o: In function `.t4_bar2_sge_qregs':
(.text+0x9220): multiple definition of `.t4_bar2_sge_qregs'
drivers/net/ethernet/chelsio/cxgb4/built-in.o:(.text+0x24e24): first defined here

Caused by commit e85c9a7abfa4 ("cxgb4/cxgb4vf: Add code to calculate T5
BAR2 Offsets for SGE Queue Registers") which added both versions.  :-(

I have applied this fir patch for today (including the subject
typo :-)):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Dec 2014 19:48:02 +1100
Subject: [PATCH] cxgb4/cxgb4vf: global named must be unique

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h      | 2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ++--
 drivers/net/ethernet/chelsio/cxgb4/sge.c        | 2 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 2c37e1bf253a..a18d33fdb271 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1007,7 +1007,7 @@ int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,
 int t4_prep_adapter(struct adapter *adapter);
 
 enum t4_bar2_qtype { T4_BAR2_QTYPE_EGRESS, T4_BAR2_QTYPE_INGRESS };
-int t4_bar2_sge_qregs(struct adapter *adapter,
+int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
 		      unsigned int qid,
 		      enum t4_bar2_qtype qtype,
 		      u64 *pbar2_qoffset,
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index c8c5b3d36d4e..1645f59648f0 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -3815,7 +3815,7 @@ int cxgb4_bar2_sge_qregs(struct net_device *dev,
 			 u64 *pbar2_qoffset,
 			 unsigned int *pbar2_qid)
 {
-	return t4_bar2_sge_qregs(netdev2adap(dev),
+	return cxgb4_t4_bar2_sge_qregs(netdev2adap(dev),
 				 qid,
 				 (qtype == CXGB4_BAR2_QTYPE_EGRESS
 				  ? T4_BAR2_QTYPE_EGRESS
@@ -4011,7 +4011,7 @@ static void process_db_drop(struct work_struct *work)
 		unsigned int bar2_qid;
 		int ret;
 
-		ret = t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,
+		ret = cxgb4_t4_bar2_sge_qregs(adap, qid, T4_BAR2_QTYPE_EGRESS,
 					&bar2_qoffset, &bar2_qid);
 		if (ret)
 			dev_err(adap->pdev_dev, "doorbell drop recovery: "
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index f12debd98dac..ebf935a1e352 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -2270,7 +2270,7 @@ static void __iomem *bar2_address(struct adapter *adapter,
 	u64 bar2_qoffset;
 	int ret;
 
-	ret = t4_bar2_sge_qregs(adapter, qid, qtype,
+	ret = cxgb4_t4_bar2_sge_qregs(adapter, qid, qtype,
 				&bar2_qoffset, pbar2_qid);
 	if (ret)
 		return NULL;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 67345c73e570..28d04153f999 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -4031,7 +4031,7 @@ int t4_prep_adapter(struct adapter *adapter)
 }
 
 /**
- *	t4_bar2_sge_qregs - return BAR2 SGE Queue register information
+ *	cxgb4_t4_bar2_sge_qregs - return BAR2 SGE Queue register information
  *	@adapter: the adapter
  *	@qid: the Queue ID
  *	@qtype: the Ingress or Egress type for @qid
@@ -4055,7 +4055,7 @@ int t4_prep_adapter(struct adapter *adapter)
  *	Write Combining Doorbell Buffer. If the BAR2 Queue ID is not 0,
  *	then these "Inferred Queue ID" register may not be used.
  */
-int t4_bar2_sge_qregs(struct adapter *adapter,
+int cxgb4_t4_bar2_sge_qregs(struct adapter *adapter,
 		      unsigned int qid,
 		      enum t4_bar2_qtype qtype,
 		      u64 *pbar2_qoffset,
-- 
2.1.3

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2014-11-17  2:34 Stephen Rothwell
@ 2014-11-22  3:30 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2014-11-22  3:30 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, jrajahalme, pshelar

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Nov 2014 13:34:04 +1100

> I applied the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 17 Nov 2014 13:31:33 +1100
> Subject: [PATCH] openvswitch: fix up for OVS_NLERR API change
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, I integrated this into the merge commit when
I merge net into net-next just now.

Thanks again.

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

* linux-next: build failure after merge of the net-next tree
@ 2014-11-17  2:34 Stephen Rothwell
  2014-11-22  3:30 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-11-17  2:34 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Jarno Rajahalme, Pravin B Shelar

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

Hi all,

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

In file included from include/linux/printk.h:6:0,
                 from include/linux/kernel.h:13,
                 from net/openvswitch/flow.h:23,
                 from net/openvswitch/flow_netlink.c:21:
net/openvswitch/flow_netlink.c: In function 'ovs_key_from_nlattrs':
include/linux/kern_levels.h:4:18: error: called object is not a function or function pointer
 #define KERN_SOH "\001"  /* ASCII Start Of Header */
                  ^
include/linux/kern_levels.h:13:19: note: in expansion of macro 'KERN_SOH'
 #define KERN_INFO KERN_SOH "6" /* informational */
                   ^
include/linux/printk.h:247:9: note: in expansion of macro 'KERN_INFO'
  printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
         ^
net/openvswitch/datapath.h:205:3: note: in expansion of macro 'pr_info'
   pr_info("netlink: " fmt "\n", ##__VA_ARGS__); \
   ^
net/openvswitch/flow_netlink.c:777:4: note: in expansion of macro 'OVS_NLERR'
    OVS_NLERR("IPv6 flow label %x is out of range (max=%x).\n",
    ^
net/openvswitch/datapath.h:205:27: error: expected ')' before string constant
   pr_info("netlink: " fmt "\n", ##__VA_ARGS__); \
                           ^
net/openvswitch/flow_netlink.c:19:41: note: in definition of macro 'pr_fmt'
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
                                         ^
net/openvswitch/datapath.h:205:3: note: in expansion of macro 'pr_info'
   pr_info("netlink: " fmt "\n", ##__VA_ARGS__); \
   ^
net/openvswitch/flow_netlink.c:777:4: note: in expansion of macro 'OVS_NLERR'
    OVS_NLERR("IPv6 flow label %x is out of range (max=%x).\n",
    ^

Caused by commit 05da5898a96c ("openvswitch: Add support for
OVS_FLOW_ATTR_PROBE") interacting with commit fecaef85f718
("openvswitch: Validate IPv6 flow key and mask values") from the net
tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 17 Nov 2014 13:31:33 +1100
Subject: [PATCH] openvswitch: fix up for OVS_NLERR API change

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

diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index 259b2f1ebd0d..45bdcf596414 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -774,7 +774,7 @@ static int ovs_key_from_nlattrs(struct sw_flow_match *match, u64 attrs,
 		}
 
 		if (ipv6_key->ipv6_label & htonl(0xFFF00000)) {
-			OVS_NLERR("IPv6 flow label %x is out of range (max=%x).\n",
+			OVS_NLERR(log, "IPv6 flow label %x is out of range (max=%x).\n",
 				  ntohl(ipv6_key->ipv6_label), (1 << 20) - 1);
 			return -EINVAL;
 		}
-- 
2.1.3

-- 
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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2014-10-01  7:04 Stephen Rothwell
  2014-10-01  7:29 ` Jeff Kirsher
@ 2014-10-01 17:42 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2014-10-01 17:42 UTC (permalink / raw)
  To: sfr
  Cc: netdev, linux-next, linux-kernel, alexander.h.duyck, jeffrey.t.kirsher

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Oct 2014 17:04:03 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 1 Oct 2014 17:00:49 +1000
> Subject: [PATCH] fm10k: using vmalloc requires including linux/vmalloc.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks Stephen.

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-10-01  7:04 Stephen Rothwell
@ 2014-10-01  7:29 ` Jeff Kirsher
  2014-10-01 17:42 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Jeff Kirsher @ 2014-10-01  7:29 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Alexander Duyck

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

On Wed, 2014-10-01 at 17:04 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit_done':
> drivers/net/ethernet/xilinx/ll_temac_main.c:633:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
>     dev_kfree_skb_irq((struct sk_buff *)cur_p->app4);
>                       ^
> drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c: In function 'fm10k_set_ringparam':
> drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:477:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
>   temp_ring = vmalloc(i * sizeof(struct fm10k_ring));
>   ^
> drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:477:12: warning: assignment makes pointer from integer without a cast
>   temp_ring = vmalloc(i * sizeof(struct fm10k_ring));
>             ^
> drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:546:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
>   vfree(temp_ring);
>   ^
> 
> Caused by commit 82dd0f7ee9a3 ("fm10k: Add ethtool support").  See Rule
> 1 in Documentation/SubmitChecklist.
> 
> I have added the following fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 1 Oct 2014 17:00:49 +1000
> Subject: [PATCH] fm10k: using vmalloc requires including linux/vmalloc.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

> ---
>  drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> index a9bbe60347d8..2d04464e6aa3 100644
> --- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> +++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
> @@ -18,6 +18,8 @@
>   * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
>   */
>  
> +#include <linux/vmalloc.h>
> +
>  #include "fm10k.h"
>  
>  struct fm10k_stats {
> -- 
> 2.1.1
> 



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

* linux-next: build failure after merge of the net-next tree
@ 2014-10-01  7:04 Stephen Rothwell
  2014-10-01  7:29 ` Jeff Kirsher
  2014-10-01 17:42 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-10-01  7:04 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Alexander Duyck, Jeff Kirsher

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

Hi all,

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

drivers/net/ethernet/xilinx/ll_temac_main.c: In function 'temac_start_xmit_done':
drivers/net/ethernet/xilinx/ll_temac_main.c:633:22: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
    dev_kfree_skb_irq((struct sk_buff *)cur_p->app4);
                      ^
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c: In function 'fm10k_set_ringparam':
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:477:2: error: implicit declaration of function 'vmalloc' [-Werror=implicit-function-declaration]
  temp_ring = vmalloc(i * sizeof(struct fm10k_ring));
  ^
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:477:12: warning: assignment makes pointer from integer without a cast
  temp_ring = vmalloc(i * sizeof(struct fm10k_ring));
            ^
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c:546:2: error: implicit declaration of function 'vfree' [-Werror=implicit-function-declaration]
  vfree(temp_ring);
  ^

Caused by commit 82dd0f7ee9a3 ("fm10k: Add ethtool support").  See Rule
1 in Documentation/SubmitChecklist.

I have added the following fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 1 Oct 2014 17:00:49 +1000
Subject: [PATCH] fm10k: using vmalloc requires including linux/vmalloc.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index a9bbe60347d8..2d04464e6aa3 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -18,6 +18,8 @@
  * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
  */
 
+#include <linux/vmalloc.h>
+
 #include "fm10k.h"
 
 struct fm10k_stats {
-- 
2.1.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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
  2014-09-30  3:13 Stephen Rothwell
@ 2014-09-30  3:22 ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-09-30  3:22 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Pablo Neira Ayuso

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

Hi all,

On Tue, 30 Sep 2014 13:13:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> net/bridge/br_nf_core.c:77:1: error: expected identifier or '(' before '{' token
>  {
>  ^
> net/bridge/br_nf_core.c:88:12: error: redefinition of 'br_nf_core_init'
>  int __init br_nf_core_init(void)
>             ^
> In file included from net/bridge/br_nf_core.c:23:0:
> net/bridge/br_private.h:762:19: note: previous definition of 'br_nf_core_init' was here
>  static inline int br_nf_core_init(void) { return 0; }
>                    ^
> net/bridge/br_nf_core.c:93:6: error: redefinition of 'br_nf_core_fini'
>  void br_nf_core_fini(void)
>       ^
> In file included from net/bridge/br_nf_core.c:23:0:
> net/bridge/br_private.h:763:20: note: previous definition of 'br_nf_core_fini' was here
>  static inline void br_nf_core_fini(void) {}
>                     ^
> 
> Caused by commit 34666d467cbf ("netfilter: bridge: move br_netfilter
> out of the core").  This build has CONFIG_BRIDGE_NETFILTER not set ...
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 30 Sep 2014 13:09:09 +1000
> Subject: [PATCH] netfilter: bridge: don't build br_nf_core unless necessary
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/bridge/Makefile | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/net/bridge/Makefile b/net/bridge/Makefile
> index 5e3eac5dc8b9..eb653a225397 100644
> --- a/net/bridge/Makefile
> +++ b/net/bridge/Makefile
> @@ -6,12 +6,11 @@ obj-$(CONFIG_BRIDGE) += bridge.o
>  
>  bridge-y	:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
>  			br_ioctl.o br_stp.o br_stp_bpdu.o \
> -			br_stp_if.o br_stp_timer.o br_netlink.o \
> -			br_nf_core.o
> +			br_stp_if.o br_stp_timer.o br_netlink.o
>  
>  bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
>  
> -obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
> +obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o br_nf_core.o
>  
>  bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o
>  
> -- 
> 2.1.1

After whish I get this from an x86_64 allmodconfig build:

ERROR: "br_nf_core_fini" [net/bridge/bridge.ko] undefined!
ERROR: "br_netfilter_rtable_init" [net/bridge/bridge.ko] undefined!
ERROR: "br_nf_core_init" [net/bridge/bridge.ko] undefined!

So I gave up :-(

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

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

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

* linux-next: build failure after merge of the net-next tree
@ 2014-09-30  3:13 Stephen Rothwell
  2014-09-30  3:22 ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-09-30  3:13 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Pablo Neira Ayuso

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

Hi all,

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

net/bridge/br_nf_core.c:77:1: error: expected identifier or '(' before '{' token
 {
 ^
net/bridge/br_nf_core.c:88:12: error: redefinition of 'br_nf_core_init'
 int __init br_nf_core_init(void)
            ^
In file included from net/bridge/br_nf_core.c:23:0:
net/bridge/br_private.h:762:19: note: previous definition of 'br_nf_core_init' was here
 static inline int br_nf_core_init(void) { return 0; }
                   ^
net/bridge/br_nf_core.c:93:6: error: redefinition of 'br_nf_core_fini'
 void br_nf_core_fini(void)
      ^
In file included from net/bridge/br_nf_core.c:23:0:
net/bridge/br_private.h:763:20: note: previous definition of 'br_nf_core_fini' was here
 static inline void br_nf_core_fini(void) {}
                    ^

Caused by commit 34666d467cbf ("netfilter: bridge: move br_netfilter
out of the core").  This build has CONFIG_BRIDGE_NETFILTER not set ...

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Sep 2014 13:09:09 +1000
Subject: [PATCH] netfilter: bridge: don't build br_nf_core unless necessary

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/bridge/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/bridge/Makefile b/net/bridge/Makefile
index 5e3eac5dc8b9..eb653a225397 100644
--- a/net/bridge/Makefile
+++ b/net/bridge/Makefile
@@ -6,12 +6,11 @@ obj-$(CONFIG_BRIDGE) += bridge.o
 
 bridge-y	:= br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \
 			br_ioctl.o br_stp.o br_stp_bpdu.o \
-			br_stp_if.o br_stp_timer.o br_netlink.o \
-			br_nf_core.o
+			br_stp_if.o br_stp_timer.o br_netlink.o
 
 bridge-$(CONFIG_SYSFS) += br_sysfs_if.o br_sysfs_br.o
 
-obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o
+obj-$(CONFIG_BRIDGE_NETFILTER) += br_netfilter.o br_nf_core.o
 
 bridge-$(CONFIG_BRIDGE_IGMP_SNOOPING) += br_multicast.o br_mdb.o
 
-- 
2.1.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] 249+ messages in thread

* Re: linux-next: build failure after merge of the net-next tree
@ 2014-07-18  4:35 Anish Bhatt
  0 siblings, 0 replies; 249+ messages in thread
From: Anish Bhatt @ 2014-07-18  4:35 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Manoj Malviya, netdev, Karen Xie, linux-next, linux-kernel, David Miller

This is totally my bad. Already posted the fix some time ago.

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

* linux-next: build failure after merge of the net-next tree
@ 2014-07-18  3:21 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-07-18  3:21 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Anish Bhatt, Karen Xie, Manoj Malviya

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

Hi all,

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

ERROR: ".ipv6_dev_get_saddr" [drivers/scsi/cxgbi/libcxgbi.ko] undefined!
ERROR: ".ip6_route_output" [drivers/scsi/cxgbi/libcxgbi.ko] undefined!

Caused by commit fc8d0590d914 ("libcxgbi: Add ipv6 api to driver").
Presumably some missing Kconfig dependency (this build does not have
CONFIG_IPV6 enabled) or it needs some #ifdef guarding.

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-07-09  3:47 ` David Miller
@ 2014-07-09  3:53   ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-07-09  3:53 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-next, linux-kernel, therbert

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

Hi David,

On Tue, 08 Jul 2014 20:47:51 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 9 Jul 2014 13:26:19 +1000
> 
> > After merging the net-next tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> 
> This got fixed 5 minutes ago.

Thanks, I guess that will be picked up tomorrow.

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-07-09  3:26 Stephen Rothwell
@ 2014-07-09  3:47 ` David Miller
  2014-07-09  3:53   ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2014-07-09  3:47 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, therbert

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 9 Jul 2014 13:26:19 +1000

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

This got fixed 5 minutes ago.

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

* linux-next: build failure after merge of the net-next tree
@ 2014-07-09  3:26 Stephen Rothwell
  2014-07-09  3:47 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-07-09  3:26 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Tom Herbert

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

Hi all,

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

In file included from include/linux/tcp.h:23:0,
                 from include/linux/ipv6.h:63,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:27,
                 from include/linux/nfs_fs.h:30,
                 from init/do_mounts.c:32:
include/net/ipv6.h: In function 'ip6_set_txhash':
include/net/sock.h:327:33: error: 'struct sock_common' has no member named 'skc_v6_daddr'
 #define sk_v6_daddr  __sk_common.skc_v6_daddr
                                 ^
include/net/ipv6.h:695:49: note: in expansion of macro 'sk_v6_daddr'
  keys.dst = (__force __be32)ipv6_addr_hash(&sk->sk_v6_daddr);
                                                 ^
In file included from include/linux/sunrpc/clnt.h:27:0,
                 from include/linux/nfs_fs.h:30,
                 from init/do_mounts.c:32:
include/net/ipv6.h: In function 'ip6_make_flowlabel':
include/net/ipv6.h:705:37: error: 'struct net' has no member named 'ipv6'
  if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) {
                                     ^

And lots more ...

Caused by commits b73c3d0e4f0e ("net: Save TX flow hash in sock and set
in skbuf on xmit") and cb1ce2ef387b ("ipv6: Implement automatic flow
label generation on transmit").  This build has CONFIG_IPV6 unset.

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-06-30  2:47 Stephen Rothwell
@ 2014-06-30  6:47 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2014-06-30  6:47 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, octavian.purdila

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Jun 2014 12:47:50 +1000

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from include/net/inet_connection_sock.h:23:0,
>                  from include/linux/tcp.h:24,
>                  from include/net/tcp.h:24,
>                  from net/ipv4/tcp_input.c:72:
> net/ipv4/tcp_input.c: In function 'pr_drop_req':
> include/net/inet_sock.h:77:41: error: 'struct sock_common' has no member named 'skc_v6_daddr'
>  #define ir_v6_rmt_addr  req.__req_common.skc_v6_daddr
>                                          ^
> include/net/sock.h:2273:57: note: in expansion of macro 'ir_v6_rmt_addr'
>   do { if (net_msg_warn && net_ratelimit()) printk(fmt,##args); } while(0)
>                                                          ^
> net/ipv4/tcp_input.c:5889:3: note: in expansion of macro 'LIMIT_NETDEBUG'
>    LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI6/%u\n"),
>    ^
> 
> Caused by commit 1fb6f159fd21 ("tcp: add tcp_conn_request").  This
> build has CONFIG_IPV6 unset.

I've just pushed a fix for this, sorry about that.

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

* linux-next: build failure after merge of the net-next tree
@ 2014-06-30  2:47 Stephen Rothwell
  2014-06-30  6:47 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-06-30  2:47 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Octavian Purdila

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

Hi all,

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

In file included from include/net/inet_connection_sock.h:23:0,
                 from include/linux/tcp.h:24,
                 from include/net/tcp.h:24,
                 from net/ipv4/tcp_input.c:72:
net/ipv4/tcp_input.c: In function 'pr_drop_req':
include/net/inet_sock.h:77:41: error: 'struct sock_common' has no member named 'skc_v6_daddr'
 #define ir_v6_rmt_addr  req.__req_common.skc_v6_daddr
                                         ^
include/net/sock.h:2273:57: note: in expansion of macro 'ir_v6_rmt_addr'
  do { if (net_msg_warn && net_ratelimit()) printk(fmt,##args); } while(0)
                                                         ^
net/ipv4/tcp_input.c:5889:3: note: in expansion of macro 'LIMIT_NETDEBUG'
   LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI6/%u\n"),
   ^

Caused by commit 1fb6f159fd21 ("tcp: add tcp_conn_request").  This
build has CONFIG_IPV6 unset.

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

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

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

* linux-next: build failure after merge of the net-next tree
@ 2014-06-12  2:14 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-06-12  2:14 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Linus Lüssing

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

Hi all,

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

net/bridge/br_multicast.c: In function 'br_multicast_has_querier_adjacent':
net/bridge/br_multicast.c:2248:25: error: 'struct net_bridge' has no member named 'ip6_other_query'
   if (!timer_pending(&br->ip6_other_query.timer) ||
                         ^
In file included from include/linux/idr.h:18:0,
                 from include/linux/kernfs.h:14,
                 from include/linux/sysfs.h:15,
                 from include/linux/kobject.h:21,
                 from include/linux/device.h:17,
                 from include/linux/dma-mapping.h:5,
                 from arch/powerpc/include/asm/machdep.h:14,
                 from arch/powerpc/include/asm/archrandom.h:6,
                 from include/linux/random.h:81,
                 from include/linux/net.h:22,
                 from include/linux/skbuff.h:27,
                 from include/linux/if_ether.h:23,
                 from net/bridge/br_multicast.c:15:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
In file included from include/linux/err.h:4:0,
                 from net/bridge/br_multicast.c:13:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
In file included from include/linux/idr.h:18:0,
                 from include/linux/kernfs.h:14,
                 from include/linux/sysfs.h:15,
                 from include/linux/kobject.h:21,
                 from include/linux/device.h:17,
                 from include/linux/dma-mapping.h:5,
                 from arch/powerpc/include/asm/machdep.h:14,
                 from arch/powerpc/include/asm/archrandom.h:6,
                 from include/linux/random.h:81,
                 from include/linux/net.h:22,
                 from include/linux/skbuff.h:27,
                 from include/linux/if_ether.h:23,
                 from net/bridge/br_multicast.c:15:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^

Caused by commit 2cd4143192e8 ("bridge: memorize and export selected
IGMP/MLD querier port").  This build has CONFIG_IPV6 not set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-06-06  6:45 Stephen Rothwell
@ 2014-06-06 13:21 ` Tom Lendacky
  0 siblings, 0 replies; 249+ messages in thread
From: Tom Lendacky @ 2014-06-06 13:21 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, netdev; +Cc: linux-next, linux-kernel

On 06/06/2014 01:45 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
>
>
> drivers/net/ethernet/amd/xgbe/xgbe-dev.c:119:25: fatal error: asm/cputype.h: No such file or directory
>   #include <asm/cputype.h>
>                           ^

I accidentally left this in from driver debugging and it is not
necessary.  Patch to follow.

Tom

>
> Caused by commit c5aa9e3b8156 ("amd-xgbe: Initial AMD 10GbE platform driver").
>
> I reverted commit 54a4ca8e3730 ("Merge branch 'amd-xgbe'") for today.
>

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

* linux-next: build failure after merge of the net-next tree
@ 2014-06-06  6:45 Stephen Rothwell
  2014-06-06 13:21 ` Tom Lendacky
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-06-06  6:45 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Lendacky, Thomas

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

Hi all,

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


drivers/net/ethernet/amd/xgbe/xgbe-dev.c:119:25: fatal error: asm/cputype.h: No such file or directory
 #include <asm/cputype.h>
                         ^

Caused by commit c5aa9e3b8156 ("amd-xgbe: Initial AMD 10GbE platform driver").

I reverted commit 54a4ca8e3730 ("Merge branch 'amd-xgbe'") for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-06-06  4:06 Stephen Rothwell
@ 2014-06-06  4:12 ` Alexei Starovoitov
  0 siblings, 0 replies; 249+ messages in thread
From: Alexei Starovoitov @ 2014-06-06  4:12 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel

On Thu, Jun 5, 2014 at 9:06 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> net/core/filter.c: In function 'convert_bpf_extensions':
> net/core/filter.c:696:17: error: 'A_REG' undeclared (first use in this function)
>    insn->a_reg = A_REG;
>                  ^
>
> Caused by my bad merge resolution :-(
>
> I applied this in the hope that it is correct (at least it builds):

Thank you.
It is correct.
I think Dave was about to push the same fix to net-next.
You're too fast :)

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 6 Jun 2014 14:00:07 +1000
> Subject: [PATCH] net: filter: merge fix up
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/core/filter.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 7b46e4553c17..74dd87596257 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -691,10 +691,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
>                 *insn = BPF_ALU32_IMM(BPF_AND, BPF_REG_A, PKT_TYPE_MAX);
>  #ifdef __BIG_ENDIAN_BITFIELD
>                 insn++;
> -
> -               insn->code = BPF_ALU | BPF_RSH | BPF_K;
> -               insn->a_reg = A_REG;
> -               insn->imm = 5;
> +               *insn = BPF_ALU32_IMM(BPF_RSH, BPF_REG_A, 5);
>  #endif
>                 break;
>
> --
> 2.0.0
>
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au

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

* linux-next: build failure after merge of the net-next tree
@ 2014-06-06  4:06 Stephen Rothwell
  2014-06-06  4:12 ` Alexei Starovoitov
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-06-06  4:06 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel

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

Hi all,

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

net/core/filter.c: In function 'convert_bpf_extensions':
net/core/filter.c:696:17: error: 'A_REG' undeclared (first use in this function)
   insn->a_reg = A_REG;
                 ^

Caused by my bad merge resolution :-(

I applied this in the hope that it is correct (at least it builds):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 6 Jun 2014 14:00:07 +1000
Subject: [PATCH] net: filter: merge fix up

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/core/filter.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/core/filter.c b/net/core/filter.c
index 7b46e4553c17..74dd87596257 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -691,10 +691,7 @@ static bool convert_bpf_extensions(struct sock_filter *fp,
 		*insn = BPF_ALU32_IMM(BPF_AND, BPF_REG_A, PKT_TYPE_MAX);
 #ifdef __BIG_ENDIAN_BITFIELD
 		insn++;
-
-		insn->code = BPF_ALU | BPF_RSH | BPF_K;
-		insn->a_reg = A_REG;
-		insn->imm = 5;
+		*insn = BPF_ALU32_IMM(BPF_RSH, BPF_REG_A, 5);
 #endif
 		break;
 
-- 
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] 249+ messages in thread

* linux-next: build failure after merge of the net-next tree
@ 2014-06-02  8:36 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-06-02  8:36 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Daniel Mack

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

Hi all,

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

ERROR: "of_mdiobus_link_phydev" [drivers/net/phy/libphy.ko] undefined!

Caused by commit 86f6cf41272d ("net: of_mdio: add
of_mdiobus_link_phydev()") from te net-next tree.

CONFIG_PHYLIB=m for this build.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* linux-next: build failure after merge of the net-next tree
@ 2014-05-19  3:38 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2014-05-19  3:38 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Bjørn Mork

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

Hi all,

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

drivers/built-in.o: In function `cdc_ncm_get_coalesce':
ak8975.c:(.text+0x1ac994): undefined reference to `__aeabi_uldivmod'

(The file name above seems to be rubbish, the above function is in
drivers/net/usb/cdc_ncm.c)

Probably caused by commit 6c4e548ff366 ("net: cdc_ncm: use ethtool to
tune coalescing settings").  I assume that there are some 64 bit
divides in that function.

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2014-01-06  4:54 Stephen Rothwell
@ 2014-01-06  5:10 ` Hannes Frederic Sowa
  0 siblings, 0 replies; 249+ messages in thread
From: Hannes Frederic Sowa @ 2014-01-06  5:10 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Li RongQing

On Mon, Jan 06, 2014 at 03:54:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from net/core/dev.c:134:0:
> include/linux/if_macvlan.h: In function 'macvlan_count_rx':
> include/linux/if_macvlan.h:68:3: error: invalid use of undefined type 'struct vlan_pcpu_stats'
>    pcpu_stats = this_cpu_ptr(vlan->pcpu_stats);
>    ^
> 
> And lots more.
> 
> Caused by commit cdf3e274cf1b ("macvlan: unify macvlan_pcpu_stats and
> vlan_pcpu_stats");
> 
> I have reverted that commit for today.

This is fixed by:
https://git.kernel.org/cgit/linux/kernel/git/davem/net-next.git/commit/?id=1e85c9b66d86a776e78c332d5d32ae370ab84d3f

Greetings,

  Hannes

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

* linux-next: build failure after merge of the net-next tree
@ 2014-01-06  4:54 Stephen Rothwell
  2014-01-06  5:10 ` Hannes Frederic Sowa
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2014-01-06  4:54 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Li RongQing

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

Hi all,

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

In file included from net/core/dev.c:134:0:
include/linux/if_macvlan.h: In function 'macvlan_count_rx':
include/linux/if_macvlan.h:68:3: error: invalid use of undefined type 'struct vlan_pcpu_stats'
   pcpu_stats = this_cpu_ptr(vlan->pcpu_stats);
   ^

And lots more.

Caused by commit cdf3e274cf1b ("macvlan: unify macvlan_pcpu_stats and
vlan_pcpu_stats");

I have reverted that commit for today.
--- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-19  0:57 Stephen Rothwell
@ 2013-12-19 19:09 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2013-12-19 19:09 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ffusco

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Dec 2013 11:57:10 +1100

> Caused by commit 71ae8aac3e19 ("lib: introduce arch optimized hash
> library").  Read Rule 1 in Documentation/SubmitChecklist :-(  Hint:
> __read_mostly is defined in linux/cache.h ...
> 
> I have used the net-next tree from next-20131217 again today.

Sorry for this breaking in two different ways two days in a row :-/

I hope with the following commit everything is good now:

====================
>From 237217546d44fe06c16b8895eecaef22f18ba5ee Mon Sep 17 00:00:00 2001
From: Francesco Fusco <ffusco@redhat.com>
Date: Wed, 18 Dec 2013 16:05:48 +0100
Subject: [PATCH] lib: hash: follow-up fixups for arch hash

This patch adds the include file to pull in __read_mostly on some
architectures e.g. ppc and also fixes up signatures in generic
asm.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Francesco Fusco <ffusco@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/asm-generic/hash.h | 4 ++--
 lib/hash.c                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/asm-generic/hash.h b/include/asm-generic/hash.h
index 05cb342..b631284 100644
--- a/include/asm-generic/hash.h
+++ b/include/asm-generic/hash.h
@@ -1,8 +1,8 @@
 #ifndef __ASM_GENERIC_HASH_H
 #define __ASM_GENERIC_HASH_H
 
-struct arch_hash_ops;
-static inline void setup_arch_fast_hash(struct arch_hash_ops *ops)
+struct fast_hash_ops;
+static inline void setup_arch_fast_hash(struct fast_hash_ops *ops)
 {
 }
 
diff --git a/lib/hash.c b/lib/hash.c
index b89f06a..fea973f 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -12,6 +12,7 @@
 
 #include <linux/jhash.h>
 #include <linux/hash.h>
+#include <linux/cache.h>
 
 static struct fast_hash_ops arch_hash_ops __read_mostly = {
 	.hash  = jhash,
-- 
1.7.11.7

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

* linux-next: build failure after merge of the net-next tree
@ 2013-12-19  0:57 Stephen Rothwell
  2013-12-19 19:09 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2013-12-19  0:57 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Francesco Fusco

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

Hi all,

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

lib/hash.c:16:43: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__read_mostly'
 static struct fast_hash_ops arch_hash_ops __read_mostly = {
                                           ^
lib/hash.c: In function 'arch_fast_hash':
lib/hash.c:23:9: error: 'arch_hash_ops' undeclared (first use in this function)
  return arch_hash_ops.hash(data, len, seed);
         ^
lib/hash.c:23:9: note: each undeclared identifier is reported only once for each function it appears in
lib/hash.c: In function 'arch_fast_hash2':
lib/hash.c:29:9: error: 'arch_hash_ops' undeclared (first use in this function)
  return arch_hash_ops.hash2(data, len, seed);
         ^
lib/hash.c: In function 'hashlib_init':
lib/hash.c:35:24: error: 'arch_hash_ops' undeclared (first use in this function)
  setup_arch_fast_hash(&arch_hash_ops);
                        ^
lib/hash.c: In function 'arch_fast_hash':
lib/hash.c:24:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^
lib/hash.c: In function 'arch_fast_hash2':
lib/hash.c:30:1: warning: control reaches end of non-void function [-Wreturn-type]
 }
 ^

Caused by commit 71ae8aac3e19 ("lib: introduce arch optimized hash
library").  Read Rule 1 in Documentation/SubmitChecklist :-(  Hint:
__read_mostly is defined in linux/cache.h ...

I have used the net-next tree from next-20131217 again today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18 10:15       ` Peter Zijlstra
  2013-12-18 10:32         ` Geert Uytterhoeven
@ 2013-12-18 17:06         ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2013-12-18 17:06 UTC (permalink / raw)
  To: peterz
  Cc: geert, sfr, netdev, linux-next, linux-kernel, ffusco, dborkman, tgraf

From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 18 Dec 2013 11:15:23 +0100

> So unless there's a sane and easy way to keep it sorted; I'm going to
> ignore that rule.

Me too, it's unreasonable and of dubious value.

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18  2:30   ` David Miller
  2013-12-18  8:33     ` Geert Uytterhoeven
@ 2013-12-18 15:10     ` Francesco Fusco
  1 sibling, 0 replies; 249+ messages in thread
From: Francesco Fusco @ 2013-12-18 15:10 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, netdev, linux-next, linux-kernel, dborkman, tgraf

On 12/18/2013 03:30 AM, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 17 Dec 2013 21:21:45 -0500 (EST)
>
>> I'll try to fix this up, thanks for the report.
>
> Here's what I committed, thanks again Stephen:
>
> ====================
> [PATCH] lib: Add missing arch generic-y entries for asm-generic/hash.h
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: David S. Miller <davem@davemloft.net>

Sorry for the inconvenient. Thanks for fixing it up.

Francesco

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18 11:33             ` Peter Zijlstra
@ 2013-12-18 11:36               ` Peter Zijlstra
  0 siblings, 0 replies; 249+ messages in thread
From: Peter Zijlstra @ 2013-12-18 11:36 UTC (permalink / raw)
  To: David Laight
  Cc: Geert Uytterhoeven, David Miller, Stephen Rothwell, netdev,
	Linux-Next, linux-kernel, ffusco, dborkman, tgraf, Joe Perches

On Wed, Dec 18, 2013 at 12:33:24PM +0100, Peter Zijlstra wrote:
> On Wed, Dec 18, 2013 at 11:07:34AM -0000, David Laight wrote:
> > > > And sort(1) is annoying in that it doesn't do in-place sort; you'll end
> > > > up with empty files if you try the naive thing.
> > > >
> > > > Worse most of those Kbuild files include other random garbage, which
> > > > makes automated sorting harder still.
> > > >
> > > > So unless there's a sane and easy way to keep it sorted; I'm going to
> > > > ignore that rule.
> > > 
> > > Not keeping them sorted causes merge conflicts and duplicate/missing
> > > entries.
> 
> Surely sorting doesn't cure missing entries. Also sorting can at most
> reduce merge conflicts, not take them out entirely.

In fact, manually editing these files carries a far greater risk of
causing missing entries than sorting could possibly cure.

Also, missing entires isn't much of a problem to begin with, compilers
are rather good at finding the problem.

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18 11:07           ` David Laight
@ 2013-12-18 11:33             ` Peter Zijlstra
  2013-12-18 11:36               ` Peter Zijlstra
  0 siblings, 1 reply; 249+ messages in thread
From: Peter Zijlstra @ 2013-12-18 11:33 UTC (permalink / raw)
  To: David Laight
  Cc: Geert Uytterhoeven, David Miller, Stephen Rothwell, netdev,
	Linux-Next, linux-kernel, ffusco, dborkman, tgraf, Joe Perches

On Wed, Dec 18, 2013 at 11:07:34AM -0000, David Laight wrote:
> > > And sort(1) is annoying in that it doesn't do in-place sort; you'll end
> > > up with empty files if you try the naive thing.
> > >
> > > Worse most of those Kbuild files include other random garbage, which
> > > makes automated sorting harder still.
> > >
> > > So unless there's a sane and easy way to keep it sorted; I'm going to
> > > ignore that rule.
> > 
> > Not keeping them sorted causes merge conflicts and duplicate/missing
> > entries.

Surely sorting doesn't cure missing entries. Also sorting can at most
reduce merge conflicts, not take them out entirely.

> Edit in vi put cursor on the first line to be sorted and type !}sort
> (assuming there is a nice blank line at the end).

That's a manual operation, and therefore disqualified.

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

* RE: linux-next: build failure after merge of the net-next tree
  2013-12-18 10:32         ` Geert Uytterhoeven
@ 2013-12-18 11:07           ` David Laight
  2013-12-18 11:33             ` Peter Zijlstra
  0 siblings, 1 reply; 249+ messages in thread
From: David Laight @ 2013-12-18 11:07 UTC (permalink / raw)
  To: Geert Uytterhoeven, Peter Zijlstra
  Cc: David Miller, Stephen Rothwell, netdev, Linux-Next, linux-kernel,
	ffusco, dborkman, tgraf, Joe Perches

> > And sort(1) is annoying in that it doesn't do in-place sort; you'll end
> > up with empty files if you try the naive thing.
> >
> > Worse most of those Kbuild files include other random garbage, which
> > makes automated sorting harder still.
> >
> > So unless there's a sane and easy way to keep it sorted; I'm going to
> > ignore that rule.
> 
> Not keeping them sorted causes merge conflicts and duplicate/missing
> entries.

Edit in vi put cursor on the first line to be sorted and type !}sort
(assuming there is a nice blank line at the end).

	David


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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18 10:15       ` Peter Zijlstra
@ 2013-12-18 10:32         ` Geert Uytterhoeven
  2013-12-18 11:07           ` David Laight
  2013-12-18 17:06         ` David Miller
  1 sibling, 1 reply; 249+ messages in thread
From: Geert Uytterhoeven @ 2013-12-18 10:32 UTC (permalink / raw)
  To: Peter Zijlstra
  Cc: David Miller, Stephen Rothwell, netdev, Linux-Next, linux-kernel,
	ffusco, dborkman, tgraf, Joe Perches

On Wed, Dec 18, 2013 at 11:15 AM, Peter Zijlstra <peterz@infradead.org> wrote:
> On Wed, Dec 18, 2013 at 09:33:47AM +0100, Geert Uytterhoeven wrote:
>> On Wed, Dec 18, 2013 at 3:30 AM, David Miller <davem@davemloft.net> wrote:
>> > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
>> > index f01fb50..a73a8e2 100644
>> > --- a/arch/alpha/include/asm/Kbuild
>> > +++ b/arch/alpha/include/asm/Kbuild
>> > @@ -4,3 +4,4 @@ generic-y += clkdev.h
>> >  generic-y += exec.h
>> >  generic-y += trace_clock.h
>> >  generic-y += preempt.h
>> > +generic-y += hash.h
>>
>> Please keep them sorted.
>>
>> Yes, Peter violated that too, when adding preempt.h.
>
> So what I did was something like:
>
> for i in arch/*/include/asm/Kbuild
> do
>         echo "generic-y += preempt.h" >> $i
> done
>
> Whoever is going to hand edit all gazillion archs for changes like that?

So we need a script for that (adding Joe), that adds the "generic-y += ..."
line to all architectures that don't have it yet, and don't provide their
own version.

> And sort(1) is annoying in that it doesn't do in-place sort; you'll end
> up with empty files if you try the naive thing.
>
> Worse most of those Kbuild files include other random garbage, which
> makes automated sorting harder still.
>
> So unless there's a sane and easy way to keep it sorted; I'm going to
> ignore that rule.

Not keeping them sorted causes merge conflicts and duplicate/missing
entries.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18  8:33     ` Geert Uytterhoeven
@ 2013-12-18 10:15       ` Peter Zijlstra
  2013-12-18 10:32         ` Geert Uytterhoeven
  2013-12-18 17:06         ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Peter Zijlstra @ 2013-12-18 10:15 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: David Miller, Stephen Rothwell, netdev, Linux-Next, linux-kernel,
	ffusco, dborkman, tgraf

On Wed, Dec 18, 2013 at 09:33:47AM +0100, Geert Uytterhoeven wrote:
> On Wed, Dec 18, 2013 at 3:30 AM, David Miller <davem@davemloft.net> wrote:
> > diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> > index f01fb50..a73a8e2 100644
> > --- a/arch/alpha/include/asm/Kbuild
> > +++ b/arch/alpha/include/asm/Kbuild
> > @@ -4,3 +4,4 @@ generic-y += clkdev.h
> >  generic-y += exec.h
> >  generic-y += trace_clock.h
> >  generic-y += preempt.h
> > +generic-y += hash.h
> 
> Please keep them sorted.
> 
> Yes, Peter violated that too, when adding preempt.h.

So what I did was something like:

for i in arch/*/include/asm/Kbuild
do
	echo "generic-y += preempt.h" >> $i
done

Whoever is going to hand edit all gazillion archs for changes like that?
And sort(1) is annoying in that it doesn't do in-place sort; you'll end
up with empty files if you try the naive thing.

Worse most of those Kbuild files include other random garbage, which
makes automated sorting harder still.

So unless there's a sane and easy way to keep it sorted; I'm going to
ignore that rule.

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18  2:30   ` David Miller
@ 2013-12-18  8:33     ` Geert Uytterhoeven
  2013-12-18 10:15       ` Peter Zijlstra
  2013-12-18 15:10     ` Francesco Fusco
  1 sibling, 1 reply; 249+ messages in thread
From: Geert Uytterhoeven @ 2013-12-18  8:33 UTC (permalink / raw)
  To: David Miller, Peter Zijlstra
  Cc: Stephen Rothwell, netdev, Linux-Next, linux-kernel, ffusco,
	dborkman, tgraf

On Wed, Dec 18, 2013 at 3:30 AM, David Miller <davem@davemloft.net> wrote:
> diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> index f01fb50..a73a8e2 100644
> --- a/arch/alpha/include/asm/Kbuild
> +++ b/arch/alpha/include/asm/Kbuild
> @@ -4,3 +4,4 @@ generic-y += clkdev.h
>  generic-y += exec.h
>  generic-y += trace_clock.h
>  generic-y += preempt.h
> +generic-y += hash.h

Please keep them sorted.

Yes, Peter violated that too, when adding preempt.h.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18  2:21 ` David Miller
@ 2013-12-18  2:30   ` David Miller
  2013-12-18  8:33     ` Geert Uytterhoeven
  2013-12-18 15:10     ` Francesco Fusco
  0 siblings, 2 replies; 249+ messages in thread
From: David Miller @ 2013-12-18  2:30 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ffusco, dborkman, tgraf

From: David Miller <davem@davemloft.net>
Date: Tue, 17 Dec 2013 21:21:45 -0500 (EST)

> I'll try to fix this up, thanks for the report.

Here's what I committed, thanks again Stephen:

====================
[PATCH] lib: Add missing arch generic-y entries for asm-generic/hash.h

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 arch/alpha/include/asm/Kbuild      | 1 +
 arch/arc/include/asm/Kbuild        | 1 +
 arch/arm/include/asm/Kbuild        | 1 +
 arch/arm64/include/asm/Kbuild      | 1 +
 arch/avr32/include/asm/Kbuild      | 1 +
 arch/blackfin/include/asm/Kbuild   | 1 +
 arch/c6x/include/asm/Kbuild        | 1 +
 arch/cris/include/asm/Kbuild       | 1 +
 arch/frv/include/asm/Kbuild        | 1 +
 arch/hexagon/include/asm/Kbuild    | 1 +
 arch/ia64/include/asm/Kbuild       | 3 ++-
 arch/m32r/include/asm/Kbuild       | 1 +
 arch/m68k/include/asm/Kbuild       | 1 +
 arch/metag/include/asm/Kbuild      | 1 +
 arch/microblaze/include/asm/Kbuild | 1 +
 arch/mips/include/asm/Kbuild       | 1 +
 arch/mn10300/include/asm/Kbuild    | 1 +
 arch/openrisc/include/asm/Kbuild   | 1 +
 arch/parisc/include/asm/Kbuild     | 1 +
 arch/powerpc/include/asm/Kbuild    | 3 ++-
 arch/s390/include/asm/Kbuild       | 1 +
 arch/score/include/asm/Kbuild      | 2 ++
 arch/sh/include/asm/Kbuild         | 1 +
 arch/sparc/include/asm/Kbuild      | 1 +
 arch/tile/include/asm/Kbuild       | 1 +
 arch/um/include/asm/Kbuild         | 1 +
 arch/unicore32/include/asm/Kbuild  | 1 +
 arch/xtensa/include/asm/Kbuild     | 1 +
 28 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
index f01fb50..a73a8e2 100644
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
@@ -4,3 +4,4 @@ generic-y += clkdev.h
 generic-y += exec.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
index 5943f7f..93e6ca9 100644
--- a/arch/arc/include/asm/Kbuild
+++ b/arch/arc/include/asm/Kbuild
@@ -47,3 +47,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild
index c38b58c..3278afe 100644
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@ -34,3 +34,4 @@ generic-y += timex.h
 generic-y += trace_clock.h
 generic-y += unaligned.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index 519f89f..626d4a9 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -51,3 +51,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/avr32/include/asm/Kbuild b/arch/avr32/include/asm/Kbuild
index 658001b..cfb9fe1 100644
--- a/arch/avr32/include/asm/Kbuild
+++ b/arch/avr32/include/asm/Kbuild
@@ -18,3 +18,4 @@ generic-y       += sections.h
 generic-y       += topology.h
 generic-y	+= trace_clock.h
 generic-y       += xor.h
+generic-y	+= hash.h
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild
index f2b4347..359d36f 100644
--- a/arch/blackfin/include/asm/Kbuild
+++ b/arch/blackfin/include/asm/Kbuild
@@ -45,3 +45,4 @@ generic-y += unaligned.h
 generic-y += user.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
index fc0b3c3..d73bb85 100644
--- a/arch/c6x/include/asm/Kbuild
+++ b/arch/c6x/include/asm/Kbuild
@@ -57,3 +57,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index b06caf6..c5963b3 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -12,3 +12,4 @@ generic-y += trace_clock.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/frv/include/asm/Kbuild b/arch/frv/include/asm/Kbuild
index 74742dc..bc42f14 100644
--- a/arch/frv/include/asm/Kbuild
+++ b/arch/frv/include/asm/Kbuild
@@ -3,3 +3,4 @@ generic-y += clkdev.h
 generic-y += exec.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
index 67c3450..469d223 100644
--- a/arch/hexagon/include/asm/Kbuild
+++ b/arch/hexagon/include/asm/Kbuild
@@ -54,3 +54,4 @@ generic-y += ucontext.h
 generic-y += unaligned.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index f93ee08..283a831 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -4,4 +4,5 @@ generic-y += exec.h
 generic-y += kvm_para.h
 generic-y += trace_clock.h
 generic-y += preempt.h
-generic-y += vtime.h
\ No newline at end of file
+generic-y += vtime.h
+generic-y += hash.h
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index 2b58c5f..932435a 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -4,3 +4,4 @@ generic-y += exec.h
 generic-y += module.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
index a5d27f2..7cc8c36 100644
--- a/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@ -32,3 +32,4 @@ generic-y += types.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/metag/include/asm/Kbuild b/arch/metag/include/asm/Kbuild
index 84d0c1d..b716d80 100644
--- a/arch/metag/include/asm/Kbuild
+++ b/arch/metag/include/asm/Kbuild
@@ -53,3 +53,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index ce0bbf8..43eec33 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -4,3 +4,4 @@ generic-y += exec.h
 generic-y += trace_clock.h
 generic-y += syscalls.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 1acbb8b..2d7f650 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -14,3 +14,4 @@ generic-y += trace_clock.h
 generic-y += preempt.h
 generic-y += ucontext.h
 generic-y += xor.h
+generic-y += hash.h
diff --git a/arch/mn10300/include/asm/Kbuild b/arch/mn10300/include/asm/Kbuild
index 74742dc..bc42f14 100644
--- a/arch/mn10300/include/asm/Kbuild
+++ b/arch/mn10300/include/asm/Kbuild
@@ -3,3 +3,4 @@ generic-y += clkdev.h
 generic-y += exec.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
index da1951a..2e40f1c 100644
--- a/arch/openrisc/include/asm/Kbuild
+++ b/arch/openrisc/include/asm/Kbuild
@@ -69,3 +69,4 @@ generic-y += vga.h
 generic-y += word-at-a-time.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index a603b9e..75edd5f 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -5,3 +5,4 @@ generic-y += word-at-a-time.h auxvec.h user.h cputime.h emergency-restart.h \
 	  poll.h xor.h clkdev.h exec.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index d8f9d2f..6c0a955 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -3,4 +3,5 @@ generic-y += clkdev.h
 generic-y += rwsem.h
 generic-y += trace_clock.h
 generic-y += preempt.h
-generic-y += vtime.h
\ No newline at end of file
+generic-y += vtime.h
+generic-y += hash.h
diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild
index 7a5288f..8386a4a 100644
--- a/arch/s390/include/asm/Kbuild
+++ b/arch/s390/include/asm/Kbuild
@@ -3,3 +3,4 @@
 generic-y += clkdev.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/score/include/asm/Kbuild b/arch/score/include/asm/Kbuild
index f3414ad..099e7ba 100644
--- a/arch/score/include/asm/Kbuild
+++ b/arch/score/include/asm/Kbuild
@@ -5,3 +5,5 @@ generic-y += clkdev.h
 generic-y += trace_clock.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
+
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index 231efbb..0cd7198 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -35,3 +35,4 @@ generic-y += trace_clock.h
 generic-y += ucontext.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
index bf39066..4b60a0c 100644
--- a/arch/sparc/include/asm/Kbuild
+++ b/arch/sparc/include/asm/Kbuild
@@ -17,3 +17,4 @@ generic-y += trace_clock.h
 generic-y += types.h
 generic-y += word-at-a-time.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index 22f3bd1..3793c75 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -39,3 +39,4 @@ generic-y += trace_clock.h
 generic-y += types.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
index fdde187..75de4ab 100644
--- a/arch/um/include/asm/Kbuild
+++ b/arch/um/include/asm/Kbuild
@@ -4,3 +4,4 @@ generic-y += ftrace.h pci.h io.h param.h delay.h mutex.h current.h exec.h
 generic-y += switch_to.h clkdev.h
 generic-y += trace_clock.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
index 00045cb..3ef4f9d 100644
--- a/arch/unicore32/include/asm/Kbuild
+++ b/arch/unicore32/include/asm/Kbuild
@@ -61,3 +61,4 @@ generic-y += user.h
 generic-y += vga.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
index 228d6ae..d7efa15 100644
--- a/arch/xtensa/include/asm/Kbuild
+++ b/arch/xtensa/include/asm/Kbuild
@@ -29,3 +29,4 @@ generic-y += topology.h
 generic-y += trace_clock.h
 generic-y += xor.h
 generic-y += preempt.h
+generic-y += hash.h
-- 
1.7.11.7

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-12-18  1:56 Stephen Rothwell
@ 2013-12-18  2:21 ` David Miller
  2013-12-18  2:30   ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2013-12-18  2:21 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ffusco, dborkman, tgraf

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Dec 2013 12:56:43 +1100

> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> In file included from include/linux/hashtable.h:12:0,
>                  from include/linux/elevator.h:5,
>                  from include/linux/blkdev.h:222,
>                  from init/do_mounts.h:2,
>                  from init/do_mounts_rd.c:21:
> include/linux/hash.h:18:22: fatal error: asm/hash.h: No such file or directory
>  #include <asm/hash.h>
>                       ^
> 
> And many more ...
> 
> Caused by commit 71ae8aac3e19 ("lib: introduce arch optimized hash
> library").  Presumably this would break any architecture other than
> x86 :-(

The author believed that putting a header file in asm-generic/
makes it get used automatically by architectures which lack
that header file.

At the very least we have to add a generic-y entry for it to
arch/${ARCH}/include/asm/Kbuild

I'll try to fix this up, thanks for the report.

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

* linux-next: build failure after merge of the net-next tree
@ 2013-12-18  1:56 Stephen Rothwell
  2013-12-18  2:21 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2013-12-18  1:56 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Francesco Fusco, Daniel Borkmann, Thomas Graf

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

Hi all,

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

In file included from include/linux/hashtable.h:12:0,
                 from include/linux/elevator.h:5,
                 from include/linux/blkdev.h:222,
                 from init/do_mounts.h:2,
                 from init/do_mounts_rd.c:21:
include/linux/hash.h:18:22: fatal error: asm/hash.h: No such file or directory
 #include <asm/hash.h>
                      ^

And many more ...

Caused by commit 71ae8aac3e19 ("lib: introduce arch optimized hash
library").  Presumably this would break any architecture other than
x86 :-(

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
       [not found] ` <CAFkjPTny4TUFu9xrF-90DrJwXsfzBOpb_yYOwe_0r9ohsc2vcQ@mail.gmail.com>
@ 2013-07-30 22:54   ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2013-07-30 22:54 UTC (permalink / raw)
  To: ericvh; +Cc: sfr, netdev, linux-next, linux-kernel, andi

From: Eric Van Hensbergen <ericvh@gmail.com>
Date: Mon, 29 Jul 2013 21:30:20 -0500

> I didn't realize that had trickled in already, I can go ahead and revert
> the commit in my tree.  Neither is perfect, hopefully the folks working on
> it will get something a bit better before the next merge window.

Please revert, thanks.

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

* linux-next: build failure after merge of the net-next tree
@ 2013-07-30  2:16 Stephen Rothwell
       [not found] ` <CAFkjPTny4TUFu9xrF-90DrJwXsfzBOpb_yYOwe_0r9ohsc2vcQ@mail.gmail.com>
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2013-07-30  2:16 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Eric Van Hensbergen, Andi Shyti

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

Hi all,

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

net/9p/trans_rdma.c:724:15: error: 'rdma_cancelled' undeclared here (not in a function)
  .cancelled = rdma_cancelled,
               ^

Caused by commit 59ea52dc461e ("net: trans_rdma: remove unused function")
interacting with commit d538a4ba906a ("net/9p: link rdma_cancelled in
with trans_module") from the v9fs tree.

I just reverted that net-next tree commit for today.

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-04-26  3:48 Stephen Rothwell
@ 2013-04-30  8:03 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2013-04-30  8:03 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, kaber, ajit.khaparde

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Apr 2013 13:48:14 +1000

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_insert_vlan_in_pkt':
> drivers/net/ethernet/emulex/benet/be_main.c:786:3: error: too few arguments to function '__vlan_put_tag'
> include/linux/if_vlan.h:220:31: note: declared here
> drivers/net/ethernet/emulex/benet/be_main.c:796:3: error: too few arguments to function '__vlan_put_tag'
> include/linux/if_vlan.h:220:31: note: declared here
> 
> Caused by comt interaction of commit 86a9bad3ab6b ("net: vlan: add
> protocol argument to packet tagging functions") from the net-next tree
> and commit bc0c3405abbb ("be2net: fix a Tx stall bug caused by a specific
> ipv6 packet") from the net tree.
> 
> I applied the following merge fix patch:

I fixed this in the merge commit when I merged net into net-next, thanks!

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

* linux-next: build failure after merge of the net-next tree
@ 2013-04-26  3:48 Stephen Rothwell
  2013-04-30  8:03 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2013-04-26  3:48 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Patrick McHardy, Ajit Khaparde

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

Hi all,

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

drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_insert_vlan_in_pkt':
drivers/net/ethernet/emulex/benet/be_main.c:786:3: error: too few arguments to function '__vlan_put_tag'
include/linux/if_vlan.h:220:31: note: declared here
drivers/net/ethernet/emulex/benet/be_main.c:796:3: error: too few arguments to function '__vlan_put_tag'
include/linux/if_vlan.h:220:31: note: declared here

Caused by comt interaction of commit 86a9bad3ab6b ("net: vlan: add
protocol argument to packet tagging functions") from the net-next tree
and commit bc0c3405abbb ("be2net: fix a Tx stall bug caused by a specific
ipv6 packet") from the net tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 26 Apr 2013 13:45:23 +1000
Subject: [PATCH] be2net: merge fix for __vlan_put_tag() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/emulex/benet/be_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 768a7d1..d6ab777 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -783,7 +783,7 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
 	}
 
 	if (vlan_tag) {
-		skb = __vlan_put_tag(skb, vlan_tag);
+		skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 		if (unlikely(!skb))
 			return skb;
 
@@ -793,7 +793,7 @@ static struct sk_buff *be_insert_vlan_in_pkt(struct be_adapter *adapter,
 	/* Insert the outer VLAN, if any */
 	if (adapter->qnq_vid) {
 		vlan_tag = adapter->qnq_vid;
-		skb = __vlan_put_tag(skb, vlan_tag);
+		skb = __vlan_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
 		if (unlikely(!skb))
 			return skb;
 		if (skip_hw_vlan)
-- 
1.8.1

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-04-19  3:21 Stephen Rothwell
       [not found] ` <20130419132127.05ea53adec329ca794d62be7-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
@ 2013-04-23  0:39 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2013-04-23  0:39 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, martin, lindner_marek, ordex

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Apr 2013 13:21:27 +1000

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

I also made sure this got fixed in the merge commit.

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

* linux-next: build failure after merge of the net-next tree
@ 2013-04-22  3:27 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2013-04-22  3:27 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Patrick McHardy

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

Hi all,

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

drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'ehea_proc_rwqes':
drivers/net/ethernet/ibm/ehea/ehea_main.c:728:5: error: too few arguments to function '__vlan_hwaccel_put_tag'
include/linux/if_vlan.h:237:31: note: declared here

Caused by commit 86a9bad3ab6b ("net: vlan: add protocol argument to
packet tagging functions").  Grep is your friend.  :-(

drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'ehea_setup_single_port':
drivers/net/ethernet/ibm/ehea/ehea_main.c:3027:9: error: expected expression before '|' token

Caused by commit f646968f8f7c ("net: vlan: rename NETIF_F_HW_VLAN_*
feature flags to NETIF_F_HW_VLAN_CTAG_*").

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-04-19  7:34   ` Antonio Quartulli
@ 2013-04-19  8:13     ` Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2013-04-19  8:13 UTC (permalink / raw)
  To: Antonio Quartulli
  Cc: David Miller, netdev, linux-next, linux-kernel,
	Martin Hundebøll, Marek Lindner, b.a.t.m.a.n

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

Hi Antonio,

On Fri, 19 Apr 2013 09:34:09 +0200 Antonio Quartulli <ordex@autistici.org> wrote:
>
> Your patch looks good, but I'd prefer to send my already prepared pull request.
> 
> Is it ok with you?

Its entirely up to Dave how/if he fixes this up.  He could just leave it
to Linus, though he would usually pull the net tree into the net-next
tree after Linus merges the net tree - in which case, this should be
fixed in that merge.

i.e. ask Dave :-)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
       [not found] ` <20130419132127.05ea53adec329ca794d62be7-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
@ 2013-04-19  7:34   ` Antonio Quartulli
  2013-04-19  8:13     ` Stephen Rothwell
  0 siblings, 1 reply; 249+ messages in thread
From: Antonio Quartulli @ 2013-04-19  7:34 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
	b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-next-u79uwXL29TY76Z2rM5mHXA, Martin Hundebøll,
	Marek Lindner, David Miller

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

Hi Stephen,

On Fri, Apr 19, 2013 at 01:21:27PM +1000, Stephen Rothwell wrote:
> 
> Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save
> overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv:
> network coding - receive coded packets and decode them") from the
> net-next tree interacting with commit fe8a93b95145 ("batman-adv: make
> is_my_mac() check for the current mesh only") from the net tree.
> 
> I added the following merge fix patch and can carry it as necessary:


thank you very much for taking care of this.
However, as I wrote to David in the pull request which generated this noise
(http://patchwork.ozlabs.org/patch/237363/), I am now going to send a second
pull request which fixes this problem properly and adds the related kernel doc.

Your patch looks good, but I'd prefer to send my already prepared pull request.

Is it ok with you?

Cheers,




-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

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

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

* linux-next: build failure after merge of the net-next tree
@ 2013-04-19  3:21 Stephen Rothwell
       [not found] ` <20130419132127.05ea53adec329ca794d62be7-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
  2013-04-23  0:39 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2013-04-19  3:21 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Martin Hundebøll, Marek Lindner,
	Antonio Quartulli

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

Hi all,

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

net/batman-adv/network-coding.c: In function 'batadv_nc_skb_store_sniffed_unicast':
net/batman-adv/network-coding.c:1487:2: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'unsigned char *'
net/batman-adv/network-coding.c:1487:2: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here
net/batman-adv/network-coding.c: In function 'batadv_nc_skb_decode_packet':
net/batman-adv/network-coding.c:1540:2: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'uint8_t *'
net/batman-adv/network-coding.c:1540:2: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here
net/batman-adv/network-coding.c: In function 'batadv_nc_find_decoding_packet':
net/batman-adv/network-coding.c:1611:2: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'uint8_t *'
net/batman-adv/network-coding.c:1611:2: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here
net/batman-adv/network-coding.c: In function 'batadv_nc_recv_coded_packet':
net/batman-adv/network-coding.c:1678:2: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'unsigned char *'
net/batman-adv/network-coding.c:1678:2: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here
net/batman-adv/network-coding.c:1679:6: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'uint8_t *'
net/batman-adv/network-coding.c:1679:6: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here
net/batman-adv/network-coding.c:1683:2: warning: passing argument 1 of 'batadv_is_my_mac' from incompatible pointer type [enabled by default]
net/batman-adv/main.h:168:5: note: expected 'struct batadv_priv *' but argument is of type 'uint8_t *'
net/batman-adv/network-coding.c:1683:2: error: too few arguments to function 'batadv_is_my_mac'
net/batman-adv/main.h:168:5: note: declared here

Caused by commits 612d2b4fe0a1 ("batman-adv: network coding - save
overheard and tx packets for decoding") and 2df5278b0267 ("batman-adv:
network coding - receive coded packets and decode them") from the
net-next tree interacting with commit fe8a93b95145 ("batman-adv: make
is_my_mac() check for the current mesh only") from the net tree.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Apr 2013 13:13:25 +1000
Subject: [PATCH] batman-adv: merge fix for batadv_is_my_mac() API change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/batman-adv/network-coding.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index 6b9a544..382db5e 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -1484,7 +1484,7 @@ void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
 {
 	struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
-	if (batadv_is_my_mac(ethhdr->h_dest))
+	if (batadv_is_my_mac(bat_priv, ethhdr->h_dest))
 		return;
 
 	/* Set data pointer to MAC header to mimic packets from our tx path */
@@ -1496,6 +1496,7 @@ void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
 /**
  * batadv_nc_skb_decode_packet - decode given skb using the decode data stored
  *  in nc_packet
+ * @bat_priv: the bat priv with all the soft interface information
  * @skb: unicast skb to decode
  * @nc_packet: decode data needed to decode the skb
  *
@@ -1503,7 +1504,7 @@ void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
  * in case of an error.
  */
 static struct batadv_unicast_packet *
-batadv_nc_skb_decode_packet(struct sk_buff *skb,
+batadv_nc_skb_decode_packet(struct batadv_priv *bat_priv, struct sk_buff *skb,
 			    struct batadv_nc_packet *nc_packet)
 {
 	const int h_size = sizeof(struct batadv_unicast_packet);
@@ -1537,7 +1538,7 @@ batadv_nc_skb_decode_packet(struct sk_buff *skb,
 	/* Select the correct unicast header information based on the location
 	 * of our mac address in the coded_packet header
 	 */
-	if (batadv_is_my_mac(coded_packet_tmp.second_dest)) {
+	if (batadv_is_my_mac(bat_priv, coded_packet_tmp.second_dest)) {
 		/* If we are the second destination the packet was overheard,
 		 * so the Ethernet address must be copied to h_dest and
 		 * pkt_type changed from PACKET_OTHERHOST to PACKET_HOST
@@ -1608,7 +1609,7 @@ batadv_nc_find_decoding_packet(struct batadv_priv *bat_priv,
 
 	/* Select the correct packet id based on the location of our mac-addr */
 	dest = ethhdr->h_source;
-	if (!batadv_is_my_mac(coded->second_dest)) {
+	if (!batadv_is_my_mac(bat_priv, coded->second_dest)) {
 		source = coded->second_source;
 		packet_id = coded->second_crc;
 	} else {
@@ -1675,12 +1676,12 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb,
 	ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
 	/* Verify frame is destined for us */
-	if (!batadv_is_my_mac(ethhdr->h_dest) &&
-	    !batadv_is_my_mac(coded_packet->second_dest))
+	if (!batadv_is_my_mac(bat_priv, ethhdr->h_dest) &&
+	    !batadv_is_my_mac(bat_priv, coded_packet->second_dest))
 		return NET_RX_DROP;
 
 	/* Update stat counter */
-	if (batadv_is_my_mac(coded_packet->second_dest))
+	if (batadv_is_my_mac(bat_priv, coded_packet->second_dest))
 		batadv_inc_counter(bat_priv, BATADV_CNT_NC_SNIFFED);
 
 	nc_packet = batadv_nc_find_decoding_packet(bat_priv, ethhdr,
@@ -1698,7 +1699,7 @@ static int batadv_nc_recv_coded_packet(struct sk_buff *skb,
 		goto free_nc_packet;
 
 	/* Decode the packet */
-	unicast_packet = batadv_nc_skb_decode_packet(skb, nc_packet);
+	unicast_packet = batadv_nc_skb_decode_packet(bat_priv, skb, nc_packet);
 	if (!unicast_packet) {
 		batadv_inc_counter(bat_priv, BATADV_CNT_NC_DECODE_FAILED);
 		goto free_nc_packet;
-- 
1.8.1

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2013-02-19  1:17 Stephen Rothwell
@ 2013-02-19  1:30 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2013-02-19  1:30 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, yoshfuji, r.kuntz

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Feb 2013 12:17:22 +1100

> I assume that the problem fixed by the net tree commit is fixed some
> other way in the net-next tree, so I reverted the net tree commit.

The net tree commit should be simply reverted, yes.

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

* linux-next: build failure after merge of the net-next tree
@ 2013-02-19  1:17 Stephen Rothwell
  2013-02-19  1:30 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2013-02-19  1:17 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel,
	\"YOSHIFUJI Hideaki / 吉藤英明\,
	Romain KUNTZ

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

Hi all,

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

net/ipv6/xfrm6_policy.c: In function 'xfrm6_dst_destroy':
net/ipv6/xfrm6_policy.c:238:6: error: 'struct rt6_info' has no member named 'n'
net/ipv6/xfrm6_policy.c:239:28: error: 'struct rt6_info' has no member named 'n'

Caused by commit 887c95cc1da5 ("ipv6: Complete neighbour entry removal
from dst_entry") interacting with commit 18cf0d0784b4 ("xfrm: release
neighbor upon dst destruction") from the net tree.

I assume that the problem fixed by the net tree commit is fixed some
other way in the net-next tree, so I reverted the net tree commit.

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

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

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

* linux-next: build failure after merge of the net-next tree
@ 2013-01-11  2:18 Stephen Rothwell
  0 siblings, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2013-01-11  2:18 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Greg KH, Sony Chacko, Sritej Velaga,
	Sucheta Chakraborty, Anirban Chakraborty

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

Hi all,

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

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:1721:1: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'qlcnic_probe'
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c:1912:23: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'qlcnic_remove'

Caused by commits 7e2cf4feba05 ("qlcnic: change driver hardware interface
mechanism") and 13159183ec7a ("qlcnic: 83xx base driver") from the
net-next tree interacting with commit 54b956b90360 ("Remove __dev*
markings from init.h") from the drover-core.current tree.

I have added the following merge fix patch for today which could be added
directly to the scsi tree (please).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Jan 2013 13:15:05 +1100
Subject: [PATCH] qlcnic: remove new __dev* annotations

CONFIG_HOTPLUG is always true now and the __dev* macros have been removed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index d331313..fb7ac8e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1717,7 +1717,7 @@ int qlcnic_alloc_tx_rings(struct qlcnic_adapter *adapter,
 	return 0;
 }
 
-static int __devinit
+static int
 qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct net_device *netdev = NULL;
@@ -1909,7 +1909,7 @@ err_out_disable_pdev:
 	return err;
 }
 
-static void __devexit qlcnic_remove(struct pci_dev *pdev)
+static void qlcnic_remove(struct pci_dev *pdev)
 {
 	struct qlcnic_adapter *adapter;
 	struct net_device *netdev;
-- 
1.7.10.280.gaa39

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-09-28  2:19 ` David Miller
@ 2012-10-01 11:53   ` Ivan Vecera
  0 siblings, 0 replies; 249+ messages in thread
From: Ivan Vecera @ 2012-10-01 11:53 UTC (permalink / raw)
  To: David Miller; +Cc: sfr, netdev, linux-next, linux-kernel

On 09/28/2012 04:19 AM, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 28 Sep 2012 11:43:35 +1000
> 
>> Hi all,
>>
>> After merging the net-next tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_find_vfs':
>> drivers/net/ethernet/emulex/benet/be_main.c:1090:28: error: 'struct pci_dev' has no member named 'physfn'
>>
>> Caused by commit 51af6d7c1f31 ("be2net: fix vfs enumeration").  physfn is
>> only defined if CONFIG_PCI_ATS is set.
>>
>> I have reverted that commit for today.
> 
> I'm reverting it too, thanks for reporting Stephen.
> 
Sorry for that, it will be better to use pci_physfn to access this
member. I'll repost the patch.

Ivan

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-09-28  1:43 Stephen Rothwell
@ 2012-09-28  2:19 ` David Miller
  2012-10-01 11:53   ` Ivan Vecera
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2012-09-28  2:19 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ivecera

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Sep 2012 11:43:35 +1000

> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_find_vfs':
> drivers/net/ethernet/emulex/benet/be_main.c:1090:28: error: 'struct pci_dev' has no member named 'physfn'
> 
> Caused by commit 51af6d7c1f31 ("be2net: fix vfs enumeration").  physfn is
> only defined if CONFIG_PCI_ATS is set.
> 
> I have reverted that commit for today.

I'm reverting it too, thanks for reporting Stephen.

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

* linux-next: build failure after merge of the net-next tree
@ 2012-09-28  1:43 Stephen Rothwell
  2012-09-28  2:19 ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2012-09-28  1:43 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Ivan Vecera

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

Hi all,

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

drivers/net/ethernet/emulex/benet/be_main.c: In function 'be_find_vfs':
drivers/net/ethernet/emulex/benet/be_main.c:1090:28: error: 'struct pci_dev' has no member named 'physfn'

Caused by commit 51af6d7c1f31 ("be2net: fix vfs enumeration").  physfn is
only defined if CONFIG_PCI_ATS is set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-07-20  2:01 Stephen Rothwell
  2012-07-20  2:48 ` Stephen Rothwell
@ 2012-07-20  3:21 ` Christian Riesch
  1 sibling, 0 replies; 249+ messages in thread
From: Christian Riesch @ 2012-07-20  3:21 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, netdev, linux-next, linux-kernel, Michael Neuling

[Sent again due to problems with email client]

Hi,

On 07/20/2012 04:01 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the net-next tree, today's linux-next build (powerpc
> pmac32_defconfig) failed like this:
>
> ERROR: "phy_disconnect" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_stop" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_ethtool_gset" [drivers/net/usb/asix.ko] undefined!
> ERROR: "mdiobus_unregister" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_start_aneg" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_print_status" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_start" [drivers/net/usb/asix.ko] undefined!
> ERROR: "mdiobus_free" [drivers/net/usb/asix.ko] undefined!
> ERROR: "mdiobus_register" [drivers/net/usb/asix.ko] undefined!
> ERROR: "genphy_resume" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_connect" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_mii_ioctl" [drivers/net/usb/asix.ko] undefined!
> ERROR: "phy_ethtool_sset" [drivers/net/usb/asix.ko] undefined!
> ERROR: "mdiobus_alloc_size" [drivers/net/usb/asix.ko] undefined!
>
> Caused by commit 16626b0cc3d5 ("asix: Add a new driver for the AX88172A")
> and reverting that commit fixes the build.

Sorry about that. I missed the dependency of the new driver on phylib. A 
fix for this problem is already in net-next, see commit 215029375c83.

Thanks, Christian

>
> Thanks to Mikey for reporting this porblem.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-07-20  2:01 Stephen Rothwell
@ 2012-07-20  2:48 ` Stephen Rothwell
  2012-07-20  3:21 ` Christian Riesch
  1 sibling, 0 replies; 249+ messages in thread
From: Stephen Rothwell @ 2012-07-20  2:48 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Michael Neuling, Christian Riesch

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

On Fri, 20 Jul 2012 12:01:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the net-next tree, today's linux-next build (powerpc
> pmac32_defconfig) failed like this:

This was actually yesterday's linux-next - I guess it is fixed by commit
215029375c83 ("asix: AX88172A driver depends on phylib") in today's tree.

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

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

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

* linux-next: build failure after merge of the net-next tree
@ 2012-07-20  2:01 Stephen Rothwell
  2012-07-20  2:48 ` Stephen Rothwell
  2012-07-20  3:21 ` Christian Riesch
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2012-07-20  2:01 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Michael Neuling, Christian Riesch

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

Hi all,

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

ERROR: "phy_disconnect" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_stop" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_ethtool_gset" [drivers/net/usb/asix.ko] undefined!
ERROR: "mdiobus_unregister" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_start_aneg" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_print_status" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_start" [drivers/net/usb/asix.ko] undefined!
ERROR: "mdiobus_free" [drivers/net/usb/asix.ko] undefined!
ERROR: "mdiobus_register" [drivers/net/usb/asix.ko] undefined!
ERROR: "genphy_resume" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_connect" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_mii_ioctl" [drivers/net/usb/asix.ko] undefined!
ERROR: "phy_ethtool_sset" [drivers/net/usb/asix.ko] undefined!
ERROR: "mdiobus_alloc_size" [drivers/net/usb/asix.ko] undefined!

Caused by commit 16626b0cc3d5 ("asix: Add a new driver for the AX88172A")
and reverting that commit fixes the build.

Thanks to Mikey for reporting this porblem.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-07-10  3:08 Stephen Rothwell
  2012-07-10  7:25 ` Bjørn Mork
@ 2012-07-11  6:36 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2012-07-11  6:36 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, bjorn

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Jul 2012 13:08:48 +1000

> I added the following merge fix patch:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jul 2012 13:06:01 +1000
> Subject: [PATCH] net: fix for qmi_wwan_unbind_shared changes
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Thanks Stephen, I'll incorporate this when I merge net into net-next.

Thanks again!

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-07-10  3:08 Stephen Rothwell
@ 2012-07-10  7:25 ` Bjørn Mork
  2012-07-11  6:36 ` David Miller
  1 sibling, 0 replies; 249+ messages in thread
From: Bjørn Mork @ 2012-07-10  7:25 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi all,
>
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/net/usb/qmi_wwan.c:381:13: error: 'qmi_wwan_unbind_shared' undeclared here (not in a function)
>
> Caused by a bad automatic merge between commit 6fecd35d4cd7 ("net:
> qmi_wwan: add ZTE MF60") from the net tree and commit 230718bda1be ("net:
> qmi_wwan: bind to both control and data interface") from the net-next
> tree.
>
> I added the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 10 Jul 2012 13:06:01 +1000
> Subject: [PATCH] net: fix for qmi_wwan_unbind_shared changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/net/usb/qmi_wwan.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
> index 06cfcc7..85c983d 100644
> --- a/drivers/net/usb/qmi_wwan.c
> +++ b/drivers/net/usb/qmi_wwan.c
> @@ -378,7 +378,7 @@ static const struct driver_info qmi_wwan_force_int2 = {
>  	.description	= "Qualcomm WWAN/QMI device",
>  	.flags		= FLAG_WWAN,
>  	.bind		= qmi_wwan_bind_shared,
> -	.unbind		= qmi_wwan_unbind_shared,
> +	.unbind		= qmi_wwan_unbind,
>  	.manage_power	= qmi_wwan_manage_power,
>  	.data		= BIT(2), /* interface whitelist bitmap */
>  };


Looks good.  Thanks.


Bjørn

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

* linux-next: build failure after merge of the net-next tree
@ 2012-07-10  3:08 Stephen Rothwell
  2012-07-10  7:25 ` Bjørn Mork
  2012-07-11  6:36 ` David Miller
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2012-07-10  3:08 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, \"Bjørn Mork\

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

Hi all,

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

drivers/net/usb/qmi_wwan.c:381:13: error: 'qmi_wwan_unbind_shared' undeclared here (not in a function)

Caused by a bad automatic merge between commit 6fecd35d4cd7 ("net:
qmi_wwan: add ZTE MF60") from the net tree and commit 230718bda1be ("net:
qmi_wwan: bind to both control and data interface") from the net-next
tree.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Jul 2012 13:06:01 +1000
Subject: [PATCH] net: fix for qmi_wwan_unbind_shared changes

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

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 06cfcc7..85c983d 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -378,7 +378,7 @@ static const struct driver_info qmi_wwan_force_int2 = {
 	.description	= "Qualcomm WWAN/QMI device",
 	.flags		= FLAG_WWAN,
 	.bind		= qmi_wwan_bind_shared,
-	.unbind		= qmi_wwan_unbind_shared,
+	.unbind		= qmi_wwan_unbind,
 	.manage_power	= qmi_wwan_manage_power,
 	.data		= BIT(2), /* interface whitelist bitmap */
 };
-- 
1.7.10.280.gaa39

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:47       ` David Miller
@ 2012-06-20 11:35         ` Mark Brown
  0 siblings, 0 replies; 249+ messages in thread
From: Mark Brown @ 2012-06-20 11:35 UTC (permalink / raw)
  To: David Miller
  Cc: bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	federico.vaga, giancarlo.asnaghi, wg, mkl

On Tue, Jun 19, 2012 at 09:47:59PM -0700, David Miller wrote:
> From: Bhupesh SHARMA <bhupesh.sharma@st.com>

> > So, whether adding a check in Kconfig for HAVE_CLK be a proper
> > solution ?  But that will limit the compilation of this driver for
> > only platforms which are ARM based.

> > One may need to support this driver on x86 like platforms also..

> Then x86 will need to provide clock operations, or there needs to
> be dummy ones for such platforms.

Not directly germane but I've been sending patches for this to the x86
guys for a little while though they're doing a /dev/null impression.

> This isn't rocket science.

The other option is that the clock API stubs itself out when not enabled
which is going into mainline (not sure quite where it is at the minute).

These sort of per-arch APIs should be a legacy thing, hopefully we'll
manage to squash them at some point and we should certainly work to
avoid introducing new ones.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20 10:26       ` Stephen Rothwell
@ 2012-06-20 10:33         ` Marc Kleine-Budde
  0 siblings, 0 replies; 249+ messages in thread
From: Marc Kleine-Budde @ 2012-06-20 10:33 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: David Miller, viresh.kumar2, bhupesh.sharma, netdev, linux-next,
	linux-kernel, federico.vaga, giancarlo.asnaghi, wg, spear-devel,
	Andrew Morton

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

On 06/20/2012 12:26 PM, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 20 Jun 2012 01:20:37 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>>
>> From: viresh kumar <viresh.kumar2@arm.com>
>> Date: Wed, 20 Jun 2012 09:08:34 +0100
>>
>>> Please see following patchset from me, that got applied in linux-next
>>>
>>> https://lkml.org/lkml/2012/4/24/154
>>>
>>> Please check if this patchset is present in your build repo. I believe it should be
>>> there. If it is, then you shouldn't get these errors.
>>
>> Well, then Stephen shouldn't get those errors either.
>>
>> But obviously he did.
>>
>> But all of this talk about changes existing only in linux-next is
>> entirely moot.  Because The damn thing MUST build independently inside
>> of net-next which doesn't have those clock layer changes.
>>
>> Someone send me a clean fix for net-next now.
> 
> I get those errors because those patches are in the akpm tree which is
> merged after everything else ...
> 
> One possibility is to put those changes in another (stable) tree and
> merge that into the net-next tree (and any other tree that needs it).

We're about to remove the offending clk_*() functions from the driver,
as they are untested anyway. The hardware the driver was developed for
uses a hardcoded clock rate in the driver anyway, as it cannot be
retrieved from clock tree. As soon as there is hardware available that
will work with the clock tree, we can add those functions back.

Sorry for the noise,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  8:20     ` David Miller
  2012-06-20  8:45       ` viresh kumar
@ 2012-06-20 10:26       ` Stephen Rothwell
  2012-06-20 10:33         ` Marc Kleine-Budde
  1 sibling, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2012-06-20 10:26 UTC (permalink / raw)
  To: David Miller
  Cc: viresh.kumar2, bhupesh.sharma, netdev, linux-next, linux-kernel,
	federico.vaga, giancarlo.asnaghi, wg, mkl, spear-devel,
	Andrew Morton

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

Hi all,

On Wed, 20 Jun 2012 01:20:37 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> From: viresh kumar <viresh.kumar2@arm.com>
> Date: Wed, 20 Jun 2012 09:08:34 +0100
> 
> > Please see following patchset from me, that got applied in linux-next
> > 
> > https://lkml.org/lkml/2012/4/24/154
> > 
> > Please check if this patchset is present in your build repo. I believe it should be
> > there. If it is, then you shouldn't get these errors.
> 
> Well, then Stephen shouldn't get those errors either.
> 
> But obviously he did.
> 
> But all of this talk about changes existing only in linux-next is
> entirely moot.  Because The damn thing MUST build independently inside
> of net-next which doesn't have those clock layer changes.
> 
> Someone send me a clean fix for net-next now.

I get those errors because those patches are in the akpm tree which is
merged after everything else ...

One possibility is to put those changes in another (stable) tree and
merge that into the net-next tree (and any other tree that needs it).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  9:58               ` David Miller
@ 2012-06-20 10:17                 ` Federico Vaga
  0 siblings, 0 replies; 249+ messages in thread
From: Federico Vaga @ 2012-06-20 10:17 UTC (permalink / raw)
  To: David Miller
  Cc: mkl, bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	giancarlo.asnaghi, wg

> Why would you try to be generic by using an interface currently
> only available on certain platforms?

I know, I was wrong.

> That is how you make drivers non-portable, and not generic.

Now is fixed in my mind; I learn the lesson.

-- 
Federico Vaga

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  9:06           ` David Miller
@ 2012-06-20  9:59             ` Federico Vaga
  2012-06-20  9:58               ` David Miller
  0 siblings, 1 reply; 249+ messages in thread
From: Federico Vaga @ 2012-06-20  9:59 UTC (permalink / raw)
  To: David Miller
  Cc: mkl, bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	giancarlo.asnaghi, wg

> Then the driver should NEVER have been submitted without the
> required infrastructure in place first.

This particular driver don't use the clk framework at the moment. I put 
that lines about clk to try to be generic as possibile, but I see that I 
made a mistake: I'm sorry. An alternative solution to HAVE_CLK 
dependency can be: remove the clk_* lines because actualy nobody use 
them. In the future, if our c_can migrate to clk and our clk framework 
is accepted in the kernel, we can re-add the clk_* lines.


-- 
Federico Vaga

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  9:59             ` Federico Vaga
@ 2012-06-20  9:58               ` David Miller
  2012-06-20 10:17                 ` Federico Vaga
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2012-06-20  9:58 UTC (permalink / raw)
  To: federico.vaga
  Cc: mkl, bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	giancarlo.asnaghi, wg

From: Federico Vaga <federico.vaga@gmail.com>
Date: Wed, 20 Jun 2012 11:59:26 +0200

>> Then the driver should NEVER have been submitted without the
>> required infrastructure in place first.
> 
> This particular driver don't use the clk framework at the moment. I put 
> that lines about clk to try to be generic as possibile, but I see that I 
> made a mistake: I'm sorry.

Why would you try to be generic by using an interface currently
only available on certain platforms?

That is how you make drivers non-portable, and not generic.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  9:03         ` Federico Vaga
@ 2012-06-20  9:06           ` David Miller
  2012-06-20  9:59             ` Federico Vaga
  0 siblings, 1 reply; 249+ messages in thread
From: David Miller @ 2012-06-20  9:06 UTC (permalink / raw)
  To: federico.vaga
  Cc: mkl, bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	giancarlo.asnaghi, wg

From: Federico Vaga <federico.vaga@gmail.com>
Date: Wed, 20 Jun 2012 11:03:08 +0200

>> I think the driver is currently used/tested only on ARM only, so what
>> about adding a HAVE_CLK dependency, until Viresh Kumar's patches are
>> available in net-next. Later we can remove it.
> 
> This driver is tested only on an x86 with AMBA peripherals on PCI. We 
> are developing the clk side for this new platform. 

Then the driver should NEVER have been submitted without the
required infrastructure in place first.

If what you say is true, I'm extremely pissed off about this now.

This submission was a complete cluster fuck, and it means the person
who submitted this to me didn't test the damn build even.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  8:31       ` Marc Kleine-Budde
  2012-06-20  8:41         ` David Miller
@ 2012-06-20  9:03         ` Federico Vaga
  2012-06-20  9:06           ` David Miller
  1 sibling, 1 reply; 249+ messages in thread
From: Federico Vaga @ 2012-06-20  9:03 UTC (permalink / raw)
  To: Marc Kleine-Budde
  Cc: Bhupesh SHARMA, David Miller, sfr, netdev, linux-next,
	linux-kernel, Giancarlo ASNAGHI, wg

> I think the driver is currently used/tested only on ARM only, so what
> about adding a HAVE_CLK dependency, until Viresh Kumar's patches are
> available in net-next. Later we can remove it.

This driver is tested only on an x86 with AMBA peripherals on PCI. We 
are developing the clk side for this new platform. 

-- 
Federico Vaga

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  8:20     ` David Miller
@ 2012-06-20  8:45       ` viresh kumar
  2012-06-20 10:26       ` Stephen Rothwell
  1 sibling, 0 replies; 249+ messages in thread
From: viresh kumar @ 2012-06-20  8:45 UTC (permalink / raw)
  To: David Miller
  Cc: bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	federico.vaga, giancarlo.asnaghi, wg, mkl, spear-devel

On 20/06/12 09:20, David Miller wrote:
> From: viresh kumar <viresh.kumar2@arm.com>
> Date: Wed, 20 Jun 2012 09:08:34 +0100
>
>> > Please see following patchset from me, that got applied in linux-next
>> >
>> > https://lkml.org/lkml/2012/4/24/154
>> >
>> > Please check if this patchset is present in your build repo. I believe it should be
>> > there. If it is, then you shouldn't get these errors.
> Well, then Stephen shouldn't get those errors either.
>
> But obviously he did.

Surprised. I am not able to get why this happen. Because we don't have HAVE_CLK defined
for x86_64, then the inline routines like following should come into play:

static inline unsigned long clk_get_rate(struct clk *clk)
{
        return 0;
}


Is there any tricky part for such routines with drivers compiled as modules?

--
Viresh

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium.  Thank you.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  8:31       ` Marc Kleine-Budde
@ 2012-06-20  8:41         ` David Miller
  2012-06-20  9:03         ` Federico Vaga
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2012-06-20  8:41 UTC (permalink / raw)
  To: mkl
  Cc: bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	federico.vaga, giancarlo.asnaghi, wg

From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 20 Jun 2012 10:31:26 +0200

> I think the driver is currently used/tested only on ARM only, so what
> about adding a HAVE_CLK dependency, until Viresh Kumar's patches are
> available in net-next. Later we can remove it.

Sounds good.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:45     ` Bhupesh SHARMA
  2012-06-20  4:47       ` David Miller
@ 2012-06-20  8:31       ` Marc Kleine-Budde
  2012-06-20  8:41         ` David Miller
  2012-06-20  9:03         ` Federico Vaga
  1 sibling, 2 replies; 249+ messages in thread
From: Marc Kleine-Budde @ 2012-06-20  8:31 UTC (permalink / raw)
  To: Bhupesh SHARMA
  Cc: David Miller, sfr, netdev, linux-next, linux-kernel,
	federico.vaga, Giancarlo ASNAGHI, wg

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

On 06/20/2012 06:45 AM, Bhupesh SHARMA wrote:
> Hi David,
> 
>> -----Original Message-----
>> From: David Miller [mailto:davem@davemloft.net]
>> Sent: Wednesday, June 20, 2012 10:07 AM
>> To: Bhupesh SHARMA
>> Cc: sfr@canb.auug.org.au; netdev@vger.kernel.org; linux-
>> next@vger.kernel.org; linux-kernel@vger.kernel.org;
>> federico.vaga@gmail.com; Giancarlo ASNAGHI; wg@grandegger.com;
>> mkl@pengutronix.de
>> Subject: Re: linux-next: build failure after merge of the net-next tree
>>
>> From: Bhupesh SHARMA <bhupesh.sharma@st.com>
>> Date: Wed, 20 Jun 2012 12:27:11 +0800
>>
>>> clk_get/clk_put* variants are usually used by ARM platforms.
>>> Protecting their calls under macro 'CONFIG_HAVE_CLK' should solve the
>> problem.
>>
>> No, we don't pepper foo.c files with crappy ifdefs.
> 
> So, whether adding a check in Kconfig for HAVE_CLK be a proper solution ?
> But that will limit the compilation of this driver for only platforms which are ARM based.
> 
> One may need to support this driver on x86 like platforms also..

I think the driver is currently used/tested only on ARM only, so what
about adding a HAVE_CLK dependency, until Viresh Kumar's patches are
available in net-next. Later we can remove it.

regards, Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


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

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  8:08   ` viresh kumar
@ 2012-06-20  8:20     ` David Miller
  2012-06-20  8:45       ` viresh kumar
  2012-06-20 10:26       ` Stephen Rothwell
  0 siblings, 2 replies; 249+ messages in thread
From: David Miller @ 2012-06-20  8:20 UTC (permalink / raw)
  To: viresh.kumar2
  Cc: bhupesh.sharma, sfr, netdev, linux-next, linux-kernel,
	federico.vaga, giancarlo.asnaghi, wg, mkl, spear-devel

From: viresh kumar <viresh.kumar2@arm.com>
Date: Wed, 20 Jun 2012 09:08:34 +0100

> Please see following patchset from me, that got applied in linux-next
> 
> https://lkml.org/lkml/2012/4/24/154
> 
> Please check if this patchset is present in your build repo. I believe it should be
> there. If it is, then you shouldn't get these errors.

Well, then Stephen shouldn't get those errors either.

But obviously he did.

But all of this talk about changes existing only in linux-next is
entirely moot.  Because The damn thing MUST build independently inside
of net-next which doesn't have those clock layer changes.

Someone send me a clean fix for net-next now.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:27 ` Bhupesh SHARMA
  2012-06-20  4:37   ` David Miller
@ 2012-06-20  8:08   ` viresh kumar
  2012-06-20  8:20     ` David Miller
  1 sibling, 1 reply; 249+ messages in thread
From: viresh kumar @ 2012-06-20  8:08 UTC (permalink / raw)
  To: Bhupesh SHARMA, Stephen Rothwell, David Miller
  Cc: netdev, linux-next, linux-kernel, Federico Vaga,
	Giancarlo ASNAGHI, Wolfgang Grandegger, Marc Kleine-Budde,
	spear-devel

On 20/06/12 05:27, Bhupesh SHARMA wrote:
>> -----Original Message-----
>> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
>> Sent: Wednesday, June 20, 2012 9:04 AM
>> To: David Miller; netdev@vger.kernel.org
>> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Federico
>> Vaga; Giancarlo ASNAGHI; Wolfgang Grandegger; Bhupesh SHARMA; Marc
>> Kleine-Budde
>> Subject: linux-next: build failure after merge of the net-next tree
>>
>> Hi all,
>>
>> After merging the net-next tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> ERROR: "clk_get_rate" [drivers/net/can/c_can/c_can_pci.ko] undefined!
>> ERROR: "clk_get" [drivers/net/can/c_can/c_can_pci.ko] undefined!
>> ERROR: "clk_put" [drivers/net/can/c_can/c_can_pci.ko] undefined!
>>
>> Caused by commit 5b92da0443c2 ("c_can_pci: generic module for
>> C_CAN/D_CAN on PCI").  Maybe a missing Kconfig dependency/select?
>>
>> I have used the net-next tree from next-20120619 for today.
>> --
>
> clk_get/clk_put* variants are usually used by ARM platforms.
> Protecting their calls under macro 'CONFIG_HAVE_CLK' should solve the problem.
>
> See [1] for how it is done in c_can_platform.c
>
> Could you possibly add these checks and send a patch for the same?
> It should be fairly simple.

Hi Bhupesh,

Please see following patchset from me, that got applied in linux-next

https://lkml.org/lkml/2012/4/24/154

Please check if this patchset is present in your build repo. I believe it should be
there. If it is, then you shouldn't get these errors.

--
viresh

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium.  Thank you.

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:45     ` Bhupesh SHARMA
@ 2012-06-20  4:47       ` David Miller
  2012-06-20 11:35         ` Mark Brown
  2012-06-20  8:31       ` Marc Kleine-Budde
  1 sibling, 1 reply; 249+ messages in thread
From: David Miller @ 2012-06-20  4:47 UTC (permalink / raw)
  To: bhupesh.sharma
  Cc: sfr, netdev, linux-next, linux-kernel, federico.vaga,
	giancarlo.asnaghi, wg, mkl

From: Bhupesh SHARMA <bhupesh.sharma@st.com>
Date: Wed, 20 Jun 2012 12:45:46 +0800

> So, whether adding a check in Kconfig for HAVE_CLK be a proper
> solution ?  But that will limit the compilation of this driver for
> only platforms which are ARM based.
> 
> One may need to support this driver on x86 like platforms also..

Then x86 will need to provide clock operations, or there needs to
be dummy ones for such platforms.

This isn't rocket science.

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

* RE: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:37   ` David Miller
@ 2012-06-20  4:45     ` Bhupesh SHARMA
  2012-06-20  4:47       ` David Miller
  2012-06-20  8:31       ` Marc Kleine-Budde
  0 siblings, 2 replies; 249+ messages in thread
From: Bhupesh SHARMA @ 2012-06-20  4:45 UTC (permalink / raw)
  To: David Miller
  Cc: sfr, netdev, linux-next, linux-kernel, federico.vaga,
	Giancarlo ASNAGHI, wg, mkl

Hi David,

> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Wednesday, June 20, 2012 10:07 AM
> To: Bhupesh SHARMA
> Cc: sfr@canb.auug.org.au; netdev@vger.kernel.org; linux-
> next@vger.kernel.org; linux-kernel@vger.kernel.org;
> federico.vaga@gmail.com; Giancarlo ASNAGHI; wg@grandegger.com;
> mkl@pengutronix.de
> Subject: Re: linux-next: build failure after merge of the net-next tree
> 
> From: Bhupesh SHARMA <bhupesh.sharma@st.com>
> Date: Wed, 20 Jun 2012 12:27:11 +0800
> 
> > clk_get/clk_put* variants are usually used by ARM platforms.
> > Protecting their calls under macro 'CONFIG_HAVE_CLK' should solve the
> problem.
> 
> No, we don't pepper foo.c files with crappy ifdefs.

So, whether adding a check in Kconfig for HAVE_CLK be a proper solution ?
But that will limit the compilation of this driver for only platforms which are ARM based.

One may need to support this driver on x86 like platforms also..

Regards,
Bhupesh

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  4:27 ` Bhupesh SHARMA
@ 2012-06-20  4:37   ` David Miller
  2012-06-20  4:45     ` Bhupesh SHARMA
  2012-06-20  8:08   ` viresh kumar
  1 sibling, 1 reply; 249+ messages in thread
From: David Miller @ 2012-06-20  4:37 UTC (permalink / raw)
  To: bhupesh.sharma
  Cc: sfr, netdev, linux-next, linux-kernel, federico.vaga,
	giancarlo.asnaghi, wg, mkl

From: Bhupesh SHARMA <bhupesh.sharma@st.com>
Date: Wed, 20 Jun 2012 12:27:11 +0800

> clk_get/clk_put* variants are usually used by ARM platforms.
> Protecting their calls under macro 'CONFIG_HAVE_CLK' should solve the problem.

No, we don't pepper foo.c files with crappy ifdefs.

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

* RE: linux-next: build failure after merge of the net-next tree
  2012-06-20  3:33 Stephen Rothwell
  2012-06-20  4:24 ` David Miller
@ 2012-06-20  4:27 ` Bhupesh SHARMA
  2012-06-20  4:37   ` David Miller
  2012-06-20  8:08   ` viresh kumar
  1 sibling, 2 replies; 249+ messages in thread
From: Bhupesh SHARMA @ 2012-06-20  4:27 UTC (permalink / raw)
  To: Stephen Rothwell, David Miller, netdev
  Cc: linux-next, linux-kernel, Federico Vaga, Giancarlo ASNAGHI,
	Wolfgang Grandegger, Marc Kleine-Budde

Hi,

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Wednesday, June 20, 2012 9:04 AM
> To: David Miller; netdev@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Federico
> Vaga; Giancarlo ASNAGHI; Wolfgang Grandegger; Bhupesh SHARMA; Marc
> Kleine-Budde
> Subject: linux-next: build failure after merge of the net-next tree
> 
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "clk_get_rate" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> ERROR: "clk_get" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> ERROR: "clk_put" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> 
> Caused by commit 5b92da0443c2 ("c_can_pci: generic module for
> C_CAN/D_CAN on PCI").  Maybe a missing Kconfig dependency/select?
> 
> I have used the net-next tree from next-20120619 for today.
> --

clk_get/clk_put* variants are usually used by ARM platforms.
Protecting their calls under macro 'CONFIG_HAVE_CLK' should solve the problem.

See [1] for how it is done in c_can_platform.c

Could you possibly add these checks and send a patch for the same?
It should be fairly simple.

[1] http://lxr.linux.no/linux+v3.4.3/drivers/net/can/c_can/c_can_platform.c#L68

Regards,
Bhupesh

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

* Re: linux-next: build failure after merge of the net-next tree
  2012-06-20  3:33 Stephen Rothwell
@ 2012-06-20  4:24 ` David Miller
  2012-06-20  4:27 ` Bhupesh SHARMA
  1 sibling, 0 replies; 249+ messages in thread
From: David Miller @ 2012-06-20  4:24 UTC (permalink / raw)
  To: sfr
  Cc: netdev, linux-next, linux-kernel, federico.vaga,
	giancarlo.asnaghi, wg, bhupesh.sharma, mkl

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Jun 2012 13:33:48 +1000

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "clk_get_rate" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> ERROR: "clk_get" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> ERROR: "clk_put" [drivers/net/can/c_can/c_can_pci.ko] undefined!
> 
> Caused by commit 5b92da0443c2 ("c_can_pci: generic module for C_CAN/D_CAN
> on PCI").  Maybe a missing Kconfig dependency/select?
> 
> I have used the net-next tree from next-20120619 for today.

Known problem:

http://marc.info/?l=linux-netdev&m=134014347620836&w=2

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

* linux-next: build failure after merge of the net-next tree
@ 2012-06-20  3:33 Stephen Rothwell
  2012-06-20  4:24 ` David Miller
  2012-06-20  4:27 ` Bhupesh SHARMA
  0 siblings, 2 replies; 249+ messages in thread
From: Stephen Rothwell @ 2012-06-20  3:33 UTC (permalink / raw)
  To: David Miller, netdev
  Cc: linux-next, linux-kernel, Federico Vaga, Giancarlo Asnaghi,
	Wolfgang Grandegger, Bhupesh Sharma, Marc Kleine-Budde

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

Hi all,

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

ERROR: "clk_get_rate" [drivers/net/can/c_can/c_can_pci.ko] undefined!
ERROR: "clk_get" [drivers/net/can/c_can/c_can_pci.ko] undefined!
ERROR: "clk_put" [drivers/net/can/c_can/c_can_pci.ko] undefined!

Caused by commit 5b92da0443c2 ("c_can_pci: generic module for C_CAN/D_CAN
on PCI").  Maybe a missing Kconfig dependency/select?

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

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

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

* Re: linux-next: build failure after merge of the net-next tree
       [not found] <20120423121451.c88c9bfaaf4d79313f7219f3@canb.auug.org.au>
@ 2012-04-23  4:25 ` David Miller
  0 siblings, 0 replies; 249+ messages in thread
From: David Miller @ 2012-04-23  4:25 UTC (permalink / raw)
  To: sfr; +Cc: netdev, linux-next, linux-kernel, ebiederm

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 23 Apr 2012 12:14:51 +1000

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> net/ax25/af_ax25.c: In function 'ax25_exit':
> net/ax25/af_ax25.c:2015:2: error: implicit declaration of function 'ax25_unregister_sysctl' [-Werror=implicit-function-declaration]
> 
> Caused by a mismerge between commit 3adadc08cc1e ("net ax25: Reorder
> ax25_exit to remove races") from the net tree and commit 0ca7a4c87d27
> ("net ax25: Simplify and cleanup the ax25 sysctl handling") from the
> net-next tree.
> 
> I have applied the following merge fix patch:

Looks correct, and I'll resolve this the next time I pull
net into net-next.

Thanks!

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

* Re: linux-next: build failure after merge of the net-next tree
  2011-10-25 13:55 Stephen Rothwell
@ 2011-10-25 14:16 ` Eric Dumazet
  0 siblings, 0 replies; 249+ messages in thread
From: Eric Dumazet @ 2011-10-25 14:16 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel, Linus

Le mercredi 26 octobre 2011 à 00:55 +1100, Stephen Rothwell a écrit :
> Hi all,
> 
> After merging the net-next tree, today's linux-next build (powerpc
> pseries_defconfig) failed like this:
> 
> drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'write_swqe2_data':
> drivers/net/ethernet/ibm/ehea/ehea_main.c:1692: error: implicit declaration of function 'frag_size'
> 
> Presumably caused by commit 9e903e085262 ("net: add skb frag size
> accessors").  I guess it should have been "skb_frag_size()".

My bad, sorry

[PATCH] ehea: fix skb_frag_size typo

commit 9e903e085262 (net: add skb frag size accessors) introduced a typo
in ehea driver.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
---
 drivers/net/ethernet/ibm/ehea/ehea_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 0d4d4f6..37b70f7 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1689,7 +1689,7 @@ static inline void write_swqe2_data(struct sk_buff *skb, struct net_device *dev,
 			sgentry = &sg_list[i - sg1entry_contains_frag_data];
 
 			sgentry->l_key = lkey;
-			sgentry->len = frag_size(frag);
+			sgentry->len = skb_frag_size(frag);
 			sgentry->vaddr = ehea_map_vaddr(skb_frag_address(frag));
 			swqe->descriptors++;
 		}

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

* linux-next: build failure after merge of the net-next tree
@ 2011-10-25 13:55 Stephen Rothwell
  2011-10-25 14:16 ` Eric Dumazet
  0 siblings, 1 reply; 249+ messages in thread
From: Stephen Rothwell @ 2011-10-25 13:55 UTC (permalink / raw)
  To: David Miller, netdev; +Cc: linux-next, linux-kernel, Eric Dumazet, Linus

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

Hi all,

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

drivers/net/ethernet/ibm/ehea/ehea_main.c: In function 'write_swqe2_data':
drivers/net/ethernet/ibm/ehea/ehea_main.c:1692: error: implicit declaration of function 'frag_size'

Presumably caused by commit 9e903e085262 ("net: add skb frag size
accessors").  I guess it should have been "skb_frag_size()".
-- 
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] 249+ messages in thread

end of thread, back to index

Thread overview: 249+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-09  3:56 linux-next: build failure after merge of the net-next tree Stephen Rothwell
2019-07-09  6:43 ` Leon Romanovsky
2019-07-10  4:31   ` Stephen Rothwell
2019-07-10  5:20     ` Leon Romanovsky
2019-07-10 17:52   ` Jason Gunthorpe
2019-07-11  1:50     ` Stephen Rothwell
2019-07-11  2:26       ` Jason Gunthorpe
2019-07-11  3:13         ` Stephen Rothwell
2019-07-11  3:16           ` Stephen Rothwell
2019-07-11  3:27             ` Stephen Rothwell
2019-07-11  5:40             ` Leon Romanovsky
2019-07-11  8:00   ` Bernard Metzler
2019-07-11 11:52     ` Jason Gunthorpe
2019-07-11 12:29     ` Bernard Metzler
2019-07-11 14:33       ` Jason Gunthorpe
2019-07-12  1:45         ` Stephen Rothwell
2019-07-12 15:21           ` Jason Gunthorpe
2019-07-09  9:00 ` Bernard Metzler
  -- strict thread matches above, loose matches on Subject: below --
2019-11-05  8:53 Stephen Rothwell
2019-11-05 13:50 ` Andrew Lunn
2019-11-05 14:22   ` Stephen Rothwell
2019-09-04  6:00 Stephen Rothwell
2019-09-04  6:18 ` Masahiro Yamada
2019-09-05 19:26   ` Andrii Nakryiko
2019-09-06  2:52     ` Masahiro Yamada
2019-09-06  9:02       ` Andrii Nakryiko
2019-09-04  8:18 ` Andrii Nakryiko
2019-08-29 10:05 Stephen Rothwell
2019-08-30 21:35 ` David Miller
2019-07-25  9:37 Stephen Rothwell
2019-06-20  9:13 Stephen Rothwell
2019-06-24  3:12 ` Stephen Rothwell
2019-06-24  3:59   ` Palmer Dabbelt
2019-06-19  3:23 Stephen Rothwell
2019-06-19  4:02 ` Masahiro Yamada
2019-06-19  4:14   ` Masahiro Yamada
2019-06-19  8:50     ` Kevin 'ldir' Darbyshire-Bryant
2019-06-19 13:46     ` David Miller
2019-06-19 14:13 ` David Miller
2019-06-19 15:09   ` Kevin 'ldir' Darbyshire-Bryant
2019-06-19 16:11     ` Kevin 'ldir' Darbyshire-Bryant
2019-06-11  8:26 Stephen Rothwell
2019-05-31  0:35 Stephen Rothwell
2019-04-23  7:25 Stephen Rothwell
2019-04-24  1:36 ` David Miller
2019-02-04  4:34 Stephen Rothwell
2019-02-04  4:36 ` David Miller
2019-01-29  5:17 Stephen Rothwell
2019-01-29  6:43 ` David Miller
2018-12-20  2:28 Stephen Rothwell
2018-12-20 10:43 ` Petr Machata
2018-12-17  1:36 Stephen Rothwell
2018-12-17 15:54 ` Paolo Abeni
2018-10-19  0:18 Stephen Rothwell
2018-10-19  5:48 ` Or Gerlitz
2018-09-02 23:47 Stephen Rothwell
2018-09-07  0:20 ` Stephen Rothwell
2018-09-07 15:30   ` Keller, Jacob E
2018-09-07 17:31     ` David Miller
2018-09-07 22:03       ` Keller, Jacob E
2018-08-06  2:10 Stephen Rothwell
2018-08-06  4:43 ` Y.b. Lu
2018-08-03  2:14 Stephen Rothwell
2018-08-03  2:34 ` Jakub Kicinski
2018-08-03  2:44 ` David Miller
2018-07-27 10:32 Stephen Rothwell
2018-07-27 12:18 ` YueHaibing
2018-07-03  0:47 Stephen Rothwell
2018-07-03  7:34 ` Sabrina Dubroca
2018-05-29  3:42 Stephen Rothwell
2018-05-29  5:41 ` Christoph Hellwig
2018-05-29  3:25 Stephen Rothwell
2018-05-30 21:38 ` Stephen Rothwell
2018-06-01  3:59   ` Stephen Rothwell
2018-06-01  8:52     ` Alexei Starovoitov
2018-06-06  4:49       ` Stephen Rothwell
2018-02-28 23:30 Stephen Rothwell
2018-01-29  1:50 Stephen Rothwell
2018-01-29  2:09 ` David Miller
2018-01-11  0:53 Stephen Rothwell
2018-01-11  1:58 ` Alexei Starovoitov
2018-01-12  3:11   ` David Miller
2018-01-12  4:21     ` Alexei Starovoitov
2018-01-12 10:45       ` Daniel Borkmann
2018-01-12 15:56         ` Alexei Starovoitov
2018-01-12 16:21           ` Daniel Borkmann
2018-01-12 16:43             ` Alexei Starovoitov
2018-01-10  4:06 Stephen Rothwell
2018-01-10  5:53 ` Jason Wang
2018-01-10 20:53 ` David Miller
2017-12-22  0:45 Stephen Rothwell
2017-12-22  7:51 ` Ido Schimmel
2017-12-20 23:43 Stephen Rothwell
2017-12-20 23:59 ` Jakub Kicinski
2017-09-29  1:36 Stephen Rothwell
2017-09-29  2:07 ` Florian Fainelli
2017-09-22  1:03 Stephen Rothwell
2017-09-22  1:37 ` David Miller
2017-09-22  7:10   ` Paolo Abeni
2017-08-15  2:28 Stephen Rothwell
2017-07-18  1:09 Stephen Rothwell
2017-07-18  4:59 ` John Fastabend
2017-05-22  1:16 Stephen Rothwell
2017-05-22  3:14 ` David Miller
2017-05-22  3:43   ` Stephen Rothwell
2017-05-22 14:17     ` David Miller
2017-05-22  3:42 ` Willem de Bruijn
2017-01-09 23:59 Stephen Rothwell
2017-01-10 15:14 ` Ursula Braun
2017-02-22 23:34 ` Stephen Rothwell
2016-05-10  1:29 Stephen Rothwell
2016-05-10  1:32 ` David Miller
2016-05-10  1:29 Stephen Rothwell
2016-05-10  1:52 ` Andy Gross
2016-05-10 18:39 ` Bjorn Andersson
2016-05-13 21:01   ` Arnd Bergmann
2016-04-13  7:50 Stephen Rothwell
2016-04-13 15:15 ` David Miller
2016-04-17  9:47   ` Arnd Bergmann
2016-04-22  9:20   ` Mark Brown
2016-04-22 23:20     ` Jeff Kirsher
2016-04-24 22:59       ` Mark Brown
2016-02-18  1:28 Stephen Rothwell
2016-02-18 20:28 ` David Miller
2016-02-18 22:14   ` Yuval Mintz
2016-01-11  2:46 Stephen Rothwell
2016-01-11  3:02 ` David Miller
2015-10-06  5:34 Stephen Rothwell
2015-08-24  3:21 Stephen Rothwell
2015-08-24  3:33 ` David Miller
2015-08-24  4:20   ` Stephen Rothwell
2015-08-20  2:57 Stephen Rothwell
2015-08-20  5:16 ` David Miller
2015-08-18  8:39 Stephen Rothwell
2015-08-18 21:25 ` David Miller
2015-07-23  1:58 Stephen Rothwell
2015-06-24  7:37 Stephen Rothwell
2015-06-24  8:01 ` David Miller
2015-06-01  3:44 Stephen Rothwell
2015-06-01  4:35 ` David Miller
2015-03-30  4:05 Stephen Rothwell
2015-03-31 18:13 ` David Miller
2015-03-24  2:45 Stephen Rothwell
2015-03-24  3:00 ` David Miller
2015-03-24 10:43   ` Christoph Hellwig
2015-03-24 15:59     ` David Miller
2015-03-05  2:42 Stephen Rothwell
2015-03-05  5:01 ` David Miller
2015-03-05 23:26   ` Stephen Rothwell
2015-03-06  2:01     ` David Miller
2015-03-06  2:42       ` Stephen Rothwell
2015-02-10 11:02 Stephen Rothwell
2015-02-11  4:51 ` Jeff Kirsher
2015-02-09  3:07 Stephen Rothwell
2015-02-09  5:52 ` David Miller
2015-01-19  3:06 Stephen Rothwell
2015-01-19  3:13 ` Marcel Holtmann
2015-01-19  3:30   ` Stephen Rothwell
2015-01-12  3:05 Stephen Rothwell
2015-01-12  3:08 ` David Miller
2015-01-12  3:12   ` Stephen Rothwell
2015-01-02 22:11 Stephen Rothwell
2015-01-02 22:21 ` Sedat Dilek
2015-01-02 23:32   ` Stephen Rothwell
2015-01-03  3:01 ` Stephen Rothwell
2015-01-03 19:45 ` David Miller
2015-01-05  3:36   ` Stephen Rothwell
2014-12-10  8:54 Stephen Rothwell
2014-12-10 10:14 ` Hariprasad S
2014-12-10 20:52 ` David Miller
2014-11-17  2:34 Stephen Rothwell
2014-11-22  3:30 ` David Miller
2014-10-01  7:04 Stephen Rothwell
2014-10-01  7:29 ` Jeff Kirsher
2014-10-01 17:42 ` David Miller
2014-09-30  3:13 Stephen Rothwell
2014-09-30  3:22 ` Stephen Rothwell
2014-07-18  4:35 Anish Bhatt
2014-07-18  3:21 Stephen Rothwell
2014-07-09  3:26 Stephen Rothwell
2014-07-09  3:47 ` David Miller
2014-07-09  3:53   ` Stephen Rothwell
2014-06-30  2:47 Stephen Rothwell
2014-06-30  6:47 ` David Miller
2014-06-12  2:14 Stephen Rothwell
2014-06-06  6:45 Stephen Rothwell
2014-06-06 13:21 ` Tom Lendacky
2014-06-06  4:06 Stephen Rothwell
2014-06-06  4:12 ` Alexei Starovoitov
2014-06-02  8:36 Stephen Rothwell
2014-05-19  3:38 Stephen Rothwell
2014-01-06  4:54 Stephen Rothwell
2014-01-06  5:10 ` Hannes Frederic Sowa
2013-12-19  0:57 Stephen Rothwell
2013-12-19 19:09 ` David Miller
2013-12-18  1:56 Stephen Rothwell
2013-12-18  2:21 ` David Miller
2013-12-18  2:30   ` David Miller
2013-12-18  8:33     ` Geert Uytterhoeven
2013-12-18 10:15       ` Peter Zijlstra
2013-12-18 10:32         ` Geert Uytterhoeven
2013-12-18 11:07           ` David Laight
2013-12-18 11:33             ` Peter Zijlstra
2013-12-18 11:36               ` Peter Zijlstra
2013-12-18 17:06         ` David Miller
2013-12-18 15:10     ` Francesco Fusco
2013-07-30  2:16 Stephen Rothwell
     [not found] ` <CAFkjPTny4TUFu9xrF-90DrJwXsfzBOpb_yYOwe_0r9ohsc2vcQ@mail.gmail.com>
2013-07-30 22:54   ` David Miller
2013-04-26  3:48 Stephen Rothwell
2013-04-30  8:03 ` David Miller
2013-04-22  3:27 Stephen Rothwell
2013-04-19  3:21 Stephen Rothwell
     [not found] ` <20130419132127.05ea53adec329ca794d62be7-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2013-04-19  7:34   ` Antonio Quartulli
2013-04-19  8:13     ` Stephen Rothwell
2013-04-23  0:39 ` David Miller
2013-02-19  1:17 Stephen Rothwell
2013-02-19  1:30 ` David Miller
2013-01-11  2:18 Stephen Rothwell
2012-09-28  1:43 Stephen Rothwell
2012-09-28  2:19 ` David Miller
2012-10-01 11:53   ` Ivan Vecera
2012-07-20  2:01 Stephen Rothwell
2012-07-20  2:48 ` Stephen Rothwell
2012-07-20  3:21 ` Christian Riesch
2012-07-10  3:08 Stephen Rothwell
2012-07-10  7:25 ` Bjørn Mork
2012-07-11  6:36 ` David Miller
2012-06-20  3:33 Stephen Rothwell
2012-06-20  4:24 ` David Miller
2012-06-20  4:27 ` Bhupesh SHARMA
2012-06-20  4:37   ` David Miller
2012-06-20  4:45     ` Bhupesh SHARMA
2012-06-20  4:47       ` David Miller
2012-06-20 11:35         ` Mark Brown
2012-06-20  8:31       ` Marc Kleine-Budde
2012-06-20  8:41         ` David Miller
2012-06-20  9:03         ` Federico Vaga
2012-06-20  9:06           ` David Miller
2012-06-20  9:59             ` Federico Vaga
2012-06-20  9:58               ` David Miller
2012-06-20 10:17                 ` Federico Vaga
2012-06-20  8:08   ` viresh kumar
2012-06-20  8:20     ` David Miller
2012-06-20  8:45       ` viresh kumar
2012-06-20 10:26       ` Stephen Rothwell
2012-06-20 10:33         ` Marc Kleine-Budde
     [not found] <20120423121451.c88c9bfaaf4d79313f7219f3@canb.auug.org.au>
2012-04-23  4:25 ` David Miller
2011-10-25 13:55 Stephen Rothwell
2011-10-25 14:16 ` Eric Dumazet

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