Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1634064 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-05-02 03:10 +0200 |
| Last post | 2017-05-02 03:50 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
Re: linux-next: build failure after merge of the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-02 03:10 +0200
Re: linux-next: build failure after merge of the block tree Jens Axboe <axboe@kernel.dk> - 2017-05-02 03:20 +0200
Re: linux-next: build failure after merge of the block tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-05-02 03:40 +0200
Re: linux-next: build failure after merge of the block tree Jens Axboe <axboe@kernel.dk> - 2017-05-02 03:50 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-05-02 03:10 +0200 |
| Subject | Re: linux-next: build failure after merge of the block tree |
| Message-ID | <tCuud-81c-9@gated-at.bofh.it> |
Hi all,
On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/block/nbd.c: In function 'nbd_genl_connect':
> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> ^
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/sch_generic.h:12,
> from include/linux/filter.h:20,
> from include/net/sock.h:64,
> from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
> ^
> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> ^
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/sch_generic.h:12,
> from include/linux/filter.h:20,
> from include/net/sock.h:64,
> from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
> ^
>
> Caused by commits
>
> e46c7287b1c2 ("nbd: add a basic netlink interface")
> b7aa3d39385d ("nbd: add a reconfigure netlink command")
>
> interacting with commit
>
> fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
>
> from the net-next tree.
>
> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 18 Apr 2017 12:59:05 +1000
> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/block/nbd.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index b78f23ce2395..5049d19f3940 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
> goto out;
> }
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> - nbd_sock_policy);
> + nbd_sock_policy, NULL);
> if (ret != 0) {
> printk(KERN_ERR "nbd: error processing sock list\n");
> ret = -EINVAL;
> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
> goto out;
> }
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> - nbd_sock_policy);
> + nbd_sock_policy, NULL);
> if (ret != 0) {
> printk(KERN_ERR "nbd: error processing sock list\n");
> ret = -EINVAL;
> --
> 2.11.0
So, this merge fix is now needed when the net-next tree is merged (as
Linus has merged the block tree).
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Jens Axboe <axboe@kernel.dk> |
|---|---|
| Date | 2017-05-02 03:20 +0200 |
| Message-ID | <tCuDT-84i-7@gated-at.bofh.it> |
| In reply to | #1634064 |
> On May 1, 2017, at 7:07 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
>> On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/block/nbd.c: In function 'nbd_genl_connect':
>> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> ^
>> In file included from include/net/rtnetlink.h:5:0,
>> from include/net/sch_generic.h:12,
>> from include/linux/filter.h:20,
>> from include/net/sock.h:64,
>> from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>> ^
>> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
>> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> ^
>> In file included from include/net/rtnetlink.h:5:0,
>> from include/net/sch_generic.h:12,
>> from include/linux/filter.h:20,
>> from include/net/sock.h:64,
>> from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>> ^
>>
>> Caused by commits
>>
>> e46c7287b1c2 ("nbd: add a basic netlink interface")
>> b7aa3d39385d ("nbd: add a reconfigure netlink command")
>>
>> interacting with commit
>>
>> fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
>>
>> from the net-next tree.
>>
>> I have applied the following merge fix patch:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 18 Apr 2017 12:59:05 +1000
>> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/block/nbd.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> index b78f23ce2395..5049d19f3940 100644
>> --- a/drivers/block/nbd.c
>> +++ b/drivers/block/nbd.c
>> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
>> goto out;
>> }
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> - nbd_sock_policy);
>> + nbd_sock_policy, NULL);
>> if (ret != 0) {
>> printk(KERN_ERR "nbd: error processing sock list\n");
>> ret = -EINVAL;
>> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
>> goto out;
>> }
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> - nbd_sock_policy);
>> + nbd_sock_policy, NULL);
>> if (ret != 0) {
>> printk(KERN_ERR "nbd: error processing sock list\n");
>> ret = -EINVAL;
>> --
>> 2.11.0
>
> So, this merge fix is now needed when the net-next tree is merged (as
> Linus has merged the block tree).
Indeed, I have warned Linus about it. Thanks Stephen.
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-05-02 03:40 +0200 |
| Message-ID | <tCuXf-8a7-5@gated-at.bofh.it> |
| In reply to | #1634070 |
Hi Jens, On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote: > > Indeed, I have warned Linus about it. Thanks Stephen. Thanks. BTW, (unusually) I did not see your pull request(s) ... -- Cheers, Stephen Rothwell
[toc] | [prev] | [next] | [standalone]
| From | Jens Axboe <axboe@kernel.dk> |
|---|---|
| Date | 2017-05-02 03:50 +0200 |
| Message-ID | <tCv6V-8da-1@gated-at.bofh.it> |
| In reply to | #1634074 |
On May 1, 2017, at 7:37 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi Jens, > >> On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote: >> >> Indeed, I have warned Linus about it. Thanks Stephen. > > Thanks. > > BTW, (unusually) I did not see your pull request(s) ... I CC'ed linux-block, so they showed up there at least.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web