lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 30 Apr 2013 04:03:46 -0400 (EDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, kaber@...sh.net, ajit.khaparde@...lex.com Subject: Re: linux-next: build failure after merge of the net-next tree From: Stephen Rothwell <sfr@...b.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! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists