2014-01-06 04:54:18

by Stephen Rothwell

[permalink] [raw]

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 (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 [email protected]

---

Attachments:

(No filename) (580.00 B)
(No filename) (836.00 B)
Download all attachments

2014-01-06 05:10:46

by Hannes Frederic Sowa

[permalink] [raw]

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

---

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