android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_kernel_samsung_sm8650/net
History
Pablo Neira Ayuso 81bf1c64e7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 
Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-08-21 06:09:05 +02:00
..
6lowpan
6lowpan: move module_init into core functionality
2015-08-11 22:05:36 +02:00
9p
virtio/vhost: fixes for 4.2
2015-07-23 13:07:04 -07:00
802
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
8021q
net: 8021q: convert to using IFF_NO_QUEUE
2015-08-18 11:55:06 -07:00
appletalk
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
atm
br2684: Remove unnecessary formatting macros b1 and bs
2015-07-31 15:25:52 -07:00
ax25
NET: AX.25: Stop heartbeat timer on disconnect.
2015-07-15 15:59:58 -07:00
batman-adv
net: batman-adv: convert to using IFF_NO_QUEUE
2015-08-18 11:55:07 -07:00
bluetooth
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-08-17 15:41:21 -07:00
bridge
bridge: fix netlink max attr size
2015-08-20 14:36:25 -07:00
caif
net: caif: convert to using IFF_NO_QUEUE
2015-08-18 11:55:07 -07:00
can
can: replace timestamp as unique skb attribute
2015-07-12 21:13:22 +02:00
ceph
libceph: treat sockaddr_storage with uninitialized family as blank
2015-07-09 20:30:34 +03:00
core
net: warn if drivers set tx_queue_len = 0
2015-08-18 11:55:08 -07:00
dcb
net/dcb: Add IEEE QCN attribute
2015-03-06 21:50:02 -05:00
dccp
tcp: fix recv with flags MSG_WAITALL | MSG_PEEK
2015-07-27 01:06:53 -07:00
decnet
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
dns_resolver
Merge commit 'v3.16' into next
2014-10-01 00:44:04 +10:00
dsa
net: dsa: Allow multi hop routes to be expressed
2015-08-18 14:17:21 -07:00
ethernet
net: ethernet: Fix double word "the the" in eth.c
2015-08-09 22:53:00 -07:00
hsr
net: hsr: convert to using IFF_NO_QUEUE
2015-08-18 11:55:07 -07:00
ieee802154
net: 6lowpan: convert to using IFF_NO_QUEUE
2015-08-18 11:55:06 -07:00
ipv4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-08-21 06:09:05 +02:00
ipv6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-08-21 06:09:05 +02:00
ipx
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
irda
irda: use msecs_to_jiffies for conversion to jiffies
2015-05-25 17:46:21 -04:00
iucv
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
key
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
l2tp
net: Modify sk_alloc to not reference count the netns of kernel sockets.
2015-05-11 10:50:18 -04:00
lapb
lapb: move EXPORT_SYMBOL after functions.
2014-10-24 15:51:42 -04:00
llc
tcp: fix recv with flags MSG_WAITALL | MSG_PEEK
2015-07-27 01:06:53 -07:00
mac80211
mac80211: use DECLARE_EWMA
2015-08-14 17:49:53 +02:00
mac802154
ieee802154: add ack request default handling
2015-08-10 20:43:06 +02:00
mpls
mpls: Enforce payload type of traffic sent using explicit NULL
2015-08-09 22:51:42 -07:00
netfilter
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-08-21 06:09:05 +02:00
netlabel
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
netlink
netlink: make sure -EBUSY won't escape from netlink_insert
2015-08-10 10:59:10 -07:00
netrom
netfilter: Remove spurios included of netfilter.h
2015-06-18 21:14:32 +02:00
nfc
NFC: nci: fix mistake in uart generic driver
2015-06-15 18:10:37 +02:00
openvswitch
net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool
2015-08-17 21:33:06 -07:00
packet
packet: add extended BPF fanout mode
2015-08-17 14:22:48 -07:00
phonet
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
rds
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-08-13 16:23:11 -07:00
rfkill
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2015-08-17 15:41:21 -07:00
rose
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-24 02:58:51 -07:00
rxrpc
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
sched
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-08-21 06:09:05 +02:00
sctp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-07-31 23:52:20 -07:00
sunrpc
NFS client bugfixes for Linux 4.2
2015-07-28 09:37:44 -07:00
switchdev
net: switchdev: support static FDB addresses
2015-08-11 12:03:19 -07:00
tipc
tipc: don't sanity check non-existing TLV (NL compat)
2015-08-17 10:39:54 -07:00
unix
net/unix: support SCM_SECURITY for stream sockets
2015-06-10 22:49:20 -07:00
vmw_vsock
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
wimax
net:wimax: Fix doucble word "the the" in networking.xml
2015-08-09 22:43:52 -07:00
wireless
nl80211: Allow setting multicast rate on OCB interfaces
2015-08-14 17:49:48 +02:00
x25
net: Pass kern from net_proto_family.create to sk_alloc
2015-05-11 10:50:17 -04:00
xfrm
xfrm: Add oif to dst lookups
2015-08-11 12:41:35 +02:00
compat.c
net: switch importing msghdr from userland to {compat_,}import_iovec()
2015-04-09 00:02:26 -04:00
Kconfig
lwtunnel: infrastructure for handling light weight tunnels like mpls
2015-07-21 10:39:03 -07:00
Makefile
mpls: Refactor how the mpls module is built
2015-03-04 00:26:06 -05:00
socket.c
net: Add a struct net parameter to sock_create_kern
2015-05-11 10:50:17 -04:00
sysctl_net.c
…