projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f421436 be408cd)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 4 Nov 2013 18:48:30 +0000 (13:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 4 Nov 2013 18:48:30 +0000 (13:48 -0500)
commit394efd19d5fcae936261bd48e5b33b21897aacf8
treec48cf3ddbb07fd87309f1abdf31a27c71330e587tree | snapshot
parentf421436a591d34fa5279b54a96ac07d70250cc8dcommit | diff
parentbe408cd3e1fef73e9408b196a79b9934697fe3b1commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/emulex/benet/be.h
drivers/net/netconsole.c
net/bridge/br_private.h

Three mostly trivial conflicts.

The net/bridge/br_private.h conflict was a function signature (argument
addition) change overlapping with the extern removals from Joe Perches.

In drivers/net/netconsole.c we had one change adjusting a printk message
whilst another changed "printk(KERN_INFO" into "pr_info(".

Lastly, the emulex change was a new inline function addition overlapping
with Joe Perches's extern removals.

Signed-off-by: David S. Miller <davem@davemloft.net>
25 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bgmac.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/cmd.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c diff1 | diff2 | blob | history
drivers/net/netconsole.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
drivers/net/xen-netback/common.h diff1 | diff2 | blob | history
drivers/net/xen-netback/interface.c diff1 | diff2 | blob | history
drivers/net/xen-netback/netback.c diff1 | diff2 | blob | history
include/net/ip6_fib.h diff1 | diff2 | blob | history
mm/memcontrol.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/bridge/br_private.h diff1 | diff2 | blob | history
net/core/flow_dissector.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_offload.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/sctp/ipv6.c diff1 | diff2 | blob | history
net/xfrm/xfrm_ipcomp.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;