malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
msm-4.14/net
History
David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
	net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-05 20:32:02 -05:00
..
9p
9p/trans_virtio.c: Fix broken zero-copy on vmalloc() buffers
2014-02-10 17:48:54 -08:00
802
neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.
2014-01-16 11:31:58 -08:00
8021q
net: introduce netdev_alloc_pcpu_stats() for drivers
2014-02-14 15:49:55 -05:00
appletalk
appletalk: fix checkpatch error with indent
2014-02-14 16:18:32 -05:00
atm
net: Fix some fallout from the etner_addr_copy() changes.
2014-01-21 18:57:26 -08:00
ax25
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-02-19 01:24:22 -05:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2014-02-18 16:29:46 -08:00
bridge
bridge: netfilter: Use ether_addr_copy
2014-02-24 19:16:44 -05:00
caif
net: Include appropriate header file in caif/cfsrvl.c
2014-02-09 17:32:49 -08:00
can
can: remove CAN FD compatibility for CAN 2.0 sockets
2014-03-03 14:29:52 +01:00
ceph
net: remove unnecessary return's
2014-02-13 18:33:38 -05:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
dcb
dcb: use __dev_get_by_name instead of dev_get_by_name to find interface
2014-01-14 18:50:46 -08:00
dccp
dccp: re-enable debug macro
2014-02-16 23:45:00 -05:00
decnet
net: Move prototype declaration to header file include/net/dn.h from net/decnet/af_decnet.c
2014-02-09 17:32:49 -08:00
dns_resolver
…
dsa
dsa: Use ether_addr_copy
2014-01-21 18:13:05 -08:00
ethernet
net: eth_type_trans() should use skb_header_pointer()
2014-01-16 15:30:31 -08:00
hsr
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
ieee802154
ieee802154: fix whitespace issues in Kconfig
2014-03-04 20:12:44 -05:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
ipx
ipx: implement shutdown()
2014-02-12 19:26:32 -05:00
irda
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
iucv
…
key
pfkey: fix SADB_X_EXT_FILTER length check
2014-02-21 06:40:54 +01:00
l2tp
net: remove unnecessary return's
2014-02-13 18:33:38 -05:00
lapb
…
llc
llc: remove noisy WARN from llc_mac_hdr_init
2014-01-28 18:01:32 -08:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
mac802154
ieee802154: add netlink APIs for smartMAC configuration
2014-02-17 16:42:39 -05:00
mpls
…
netfilter
netfilter: ctnetlink: force null nat binding on insert
2014-02-18 00:13:51 +01:00
netlabel
…
netlink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
netrom
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
nfc
NFC: NCI: Fix NULL pointer dereference
2014-02-23 23:14:45 +01:00
openvswitch
openvswitch: rename ->sync to ->syncp
2014-02-15 02:06:23 -05:00
packet
packet: allow to transmit +4 byte in TX_RING slot for VLAN case
2014-02-28 16:52:02 -05:00
phonet
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rds
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rfkill
net: rfkill: move poll work to power efficient workqueue
2014-02-04 21:58:16 +01:00
rose
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rxrpc
RxRPC fixes
2014-01-28 18:04:18 -08:00
sched
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
sunrpc
NFS client bugfixes for Linux 3.14
2014-02-19 12:13:02 -08:00
tipc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
unix
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
vmw_vsock
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
wimax
…
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
x25
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-03-05 20:32:02 -05:00
compat.c
x86, x32: Correct invalid use of user timespec in the kernel
2014-01-30 18:44:13 -08:00
Kconfig
net: netprio: rename config to be more consistent with cgroup configs
2014-01-03 23:41:42 +01:00
Makefile
net: move 6lowpan compression code to separate module
2014-01-15 15:36:38 -08:00
nonet.c
…
socket.c
socket: replace some printk with pr_*
2014-02-13 18:15:10 -05:00
sysctl_net.c
…