iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net
History
Ingo Molnar fb10d5b7ef Merge branch 'linus' into sched/core 
Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2013-11-01 08:24:41 +01:00
..
9p
for-linus-3.12-merge minor 9p fixes and tweaks for 3.12 merge window
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: vlan: fix nlmsg size calculation in vlan_get_size()
2013-10-08 16:32:41 -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
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07:00
batman-adv
batman-adv: set up network coding packet handlers during module init
2013-10-02 13:46:19 +02:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-09-27 13:11:17 -04:00
bridge
Revert "bridge: only expire the mdb entry when query is received"
2013-10-22 14:41:02 -04:00
caif
caif: Add missing braces to multiline if in cfctrl_linkup_request
2013-09-05 14:31:02 -04:00
can
can: gw: add a per rule limitation of frame hops
2013-08-29 22:58:24 +02:00
ceph
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-09-19 12:50:37 -05:00
core
net: secure_seq: Fix warning when CONFIG_IPV6 and CONFIG_INET are not selected
2013-10-09 12:59:57 -04:00
dcb
rtnetlink: Remove passing of attributes into rtnl_doit functions
2013-03-22 10:31:16 -04:00
dccp
net:dccp: do not report ICMP redirects to user space
2013-09-18 12:33:44 -04:00
decnet
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07: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
net: Fix sysfs_format_mac() code duplication.
2013-07-16 17:09:22 -07:00
ieee802154
6lowpan: Sync default hardware address of lowpan links to their wpan
2013-10-08 15:28:37 -04:00
ipv4
tcp: initialize passive-side sk_pacing_rate after 3WHS
2013-10-21 18:56:23 -04:00
ipv6
ipv6: probe routes asynchronous in rt6_probe
2013-10-21 18:56:22 -04:00
ipx
net: proc_fs: trivial: print UIDs as unsigned int
2013-08-15 14:37:46 -07:00
irda
sched/wait: Make the __wait_event*() interface more friendly
2013-10-04 10:16:25 +02: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
l2tp: must disable bh before calling l2tp_xmit_skb()
2013-10-11 16:51:37 -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
mac80211: fix crash if bitrate calculation goes wrong
2013-10-14 09:47:08 +02:00
mac802154
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-04-30 03:55:20 -04:00
mpls
MPLS: Add limited GSO support
2013-05-27 22:50:59 -07:00
netfilter
Merge branch 'linus' into sched/core
2013-11-01 08:24:41 +01:00
netlabel
netlabel: use domain based selectors when address based selectors are not available
2013-08-02 16:57:01 -07: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: ovs: flow: fix potential illegal memory access in __parse_flow_nlattrs
2013-09-11 16:09:58 -04: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
net: Convert uses of typedef ctl_table to struct ctl_table
2013-06-13 02:36:09 -07: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
Driver core patches for 3.9-rc1
2013-02-21 12:05:51 -08:00
sched
netem: free skb's in tree on reset
2013-10-11 17:30:38 -04:00
sctp
sctp: Perform software checksum if packet has to be fragmented.
2013-10-17 15:24:44 -04:00
sunrpc
RPCSEC_GSS: fix crash on destroying gss auth
2013-09-18 10:18:44 -05:00
tipc
tipc: set sk_err correctly when connection fails
2013-08-30 16:06:57 -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
…
wireless
wireless: radiotap: fix parsing buffer overrun
2013-10-14 09:47:00 +02:00
x25
x25: add a sanity check parsing X.25 facilities
2013-09-04 00:27:27 -04:00
xfrm
xfrm: check for a vaild skb in xfrm_policy_queue_process
2013-10-08 10:49:51 +02: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