David S. Miller
d247b6ab3c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/Makefile
net/ipv6/sysctl_net_ipv6.c
Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.
In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-05 18:46:26 -07:00
bonding: remove pr_fmt from bond_3ad.c
2014-07-15 23:15:58 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-02-19 01:24:22 -05:00
bonding: make it possible to have unlimited nested upper vlans
2014-07-20 20:35:00 -07:00
bonding: Do not try to send packets over dead link in TLB mode.
2014-07-16 23:35:35 -07:00
bonding: convert bond_debugfs.c to use netdev_printk instead of pr_
2014-07-15 23:15:58 -07:00
bonding: fix a memory leak in bond_arp_send_all()
2014-07-28 17:27:47 -07:00
bonding: bonding: remove pr_fmt from bond_netlink.c
2014-07-15 23:15:59 -07:00
bonding: remove pr_fmt from bond_options.c
2014-07-15 23:16:06 -07:00
bonding: make a generic sysfs option store and fix comments
2014-05-09 16:12:51 -04:00
bonding: convert bond_procfs.c to use netdev_printk instead of pr_
2014-07-15 23:15:59 -07:00
bonding: use rcu_access_pointer() in bonding_show_mii_status()
2014-07-15 17:49:41 -07:00
bonding: use kobject_put instead of _del after kobject_add
2014-07-31 11:16:09 -07:00
bonding: make it possible to have unlimited nested upper vlans
2014-07-20 20:35:00 -07:00
bonding: add sysfs /slave dir for bond slave devices.
2014-01-17 18:51:58 -08:00
d247b6ab3c