projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 371f1c7 1099f86)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 20 Oct 2015 13:08:27 +0000 (06:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Oct 2015 13:08:27 +0000 (06:08 -0700)
commit26440c835f8b1a491e2704118ac55bf87334366c
tree3c2d23b59fd49b252fdbf6c09efc41b354933fc6tree | snapshot (tar.gz zip)
parent371f1c7e0d854796adc622cc3bacfcc5fc638db1commit | diff
parent1099f86044111e9a7807f09523e42d4c9d0fb781commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/usb/asix_common.c
net/ipv4/inet_connection_sock.c
net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
47 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/arm/net/bpf_jit_32.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/genet/bcmgenet.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_adminq.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40evf/i40e_adminq.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/port.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/core.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/item.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/pci.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/switchx2.c diff1 | diff2 | blob | history
drivers/net/phy/Kconfig diff1 | diff2 | blob | history
drivers/net/usb/Kconfig diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath10k/hw.h diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/init.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-7000.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/d3.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/fw.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mac80211.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/mvm.h diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/mvm/ops.c diff1 | diff2 | blob | history
include/net/inet_timewait_sock.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
include/uapi/linux/openvswitch.h diff1 | diff2 | blob | history
include/uapi/linux/rtnetlink.h diff1 | diff2 | blob | history
net/bluetooth/hci_core.c diff1 | diff2 | blob | history
net/bluetooth/hci_event.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/dsa/dsa.c diff1 | diff2 | blob | history
net/ipv4/arp.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mac80211/debugfs.c diff1 | diff2 | blob | history
net/mac80211/status.c diff1 | diff2 | blob | history
net/mac80211/tx.c diff1 | diff2 | blob | history
net/openvswitch/actions.c diff1 | diff2 | blob | history
net/openvswitch/conntrack.c diff1 | diff2 | blob | history
net/openvswitch/flow.h diff1 | diff2 | blob | history
net/openvswitch/flow_netlink.c diff1 | diff2 | blob | history
net/openvswitch/flow_table.c diff1 | diff2 | blob | history
net/switchdev/switchdev.c diff1 | diff2 | blob | history
net/tipc/msg.h diff1 | diff2 | blob | history
net/tipc/node.c diff1 | diff2 | blob | history
Motorola kernel-slsi