mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
296c10639a33941d0090afa17b7535fcbf81d97a
linux/net
History
David S. Miller 296c10639a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next 
Conflicts:
	net/xfrm/xfrm_policy.c

Minor merge conflict in xfrm_policy.c, consisting of overlapping
changes which were trivial to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-11-02 02:13:48 -04:00
..
9p
Merge tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
2013-09-11 12:34:13 -07:00
802
mrp: add periodictimer to allow retries when packets get lost
2013-09-23 16:53:52 -04:00
8021q
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
appletalk
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
atm
net: always pass struct netdev_notifier_info to netdevice notifiers
2013-05-28 21:58:54 -07:00
ax25
ax25: cleanup a range test
2013-10-18 13:56:07 -04:00
batman-adv
batman-adv: generalize batman-adv icmp packet handling
2013-10-23 17:03:47 +02:00
bluetooth
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
caif
caif: Add missing braces to multiline if in cfctrl_linkup_request
2013-09-05 14:31:02 -04:00
can
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
ceph
net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
core
net, mc: fix the incorrect comments in two mc-related functions
2013-10-29 00:19:05 -04:00
dcb
…
dccp
net: dccp: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
decnet
netfilter: pass hook ops to hookfn
2013-10-14 11:29:31 +02:00
dns_resolver
net: strict_strtoul is obsolete, use kstrtoul instead
2013-07-12 16:09:14 -07:00
dsa
net: dsa: inherit addr_assign_type along with dev_addr
2013-09-03 20:57:49 -04:00
ethernet
ethernet: use likely() for common Ethernet encap
2013-09-30 21:52:53 -07:00
ieee802154
6lowpan: cleanup skb copy data
2013-10-30 17:18:46 -04:00
ipv4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-11-02 02:13:48 -04:00
ipv6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-11-02 02:13:48 -04:00
ipx
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
irda
net: misc: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
iucv
net: delete __cpuinit usage from all net files
2013-07-14 19:36:58 -04:00
key
xfrm: Guard IPsec anti replay window against replay bitmap
2013-09-17 12:17:10 +02:00
l2tp
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
lapb
net/lapb: re-send packets on timeout
2013-09-23 16:52:45 -04:00
llc
llc: Use normal etherdevice.h tests
2013-09-03 22:34:47 -04:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
mac802154
6lowpan: set and use mac_len for mac header length
2013-10-30 17:18:46 -04:00
mpls
ipip: add GSO/TSO support
2013-10-19 19:36:19 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
netlabel
inet: includes a sock_common in request_sock
2013-10-10 00:08:07 -04:00
netlink
net: netlink: filter particular protocols from analyzers
2013-09-06 14:43:48 -04:00
netrom
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
nfc
NFC: Update secure element state
2013-08-14 01:13:40 +02:00
openvswitch
net ipv4: Convert ipv4.ip_local_port_range to be per netns v3
2013-09-30 21:59:38 -07:00
packet
net: packet: use reciprocal_divide in fanout_demux_hash
2013-08-29 16:43:29 -04:00
phonet
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
rds
inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once
2013-10-19 19:45:35 -04:00
rfkill
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
rose
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
rxrpc
net: misc: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
sched
net: sched: cls_bpf: add BPF-based classifier
2013-10-29 17:33:17 -04:00
sctp
sctp: merge two if statements to one
2013-10-28 01:02:34 -04:00
sunrpc
net: fix build errors if ipv6 is disabled
2013-10-09 13:04:03 -04:00
tipc
tipc: remove two indentation levels in tipc_recv_msg routine
2013-10-30 16:54:54 -04:00
unix
net: unix: inherit SOCK_PASS{CRED, SEC} flags from socket to fix race
2013-10-19 18:50:15 -04:00
vmw_vsock
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-08-16 15:37:26 -07:00
wimax
net: misc: Remove extern from function prototypes
2013-10-19 19:12:11 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-10-23 16:49:34 -04:00
x25
x25: add a sanity check parsing X.25 facilities
2013-09-04 00:27:27 -04:00
xfrm
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
2013-11-02 02:13:48 -04:00
compat.c
net: heap overflow in __audit_sockaddr()
2013-10-03 16:05:14 -04:00
Kconfig
Remove GENERIC_HARDIRQ config option
2013-09-13 15:09:52 +02:00
Makefile
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
nonet.c
…
socket.c
net: heap overflow in __audit_sockaddr()
2013-10-03 16:05:14 -04:00
sysctl_net.c
net: Update the sysctl permissions handler to test effective uid/gid
2013-10-07 15:57:56 -04:00