Ingo Molnar 737f24bda7 Merge branch 'perf/urgent' into perf/core ...

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2012-03-05 09:20:08 +01:00

..

netfilter

Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

2012-01-14 18:36:33 -08:00

af_inet.c

per-netns ipv4 sysctl_tcp_mem

2011-12-12 19:04:11 -05:00

ah4.c

ah: Don't return NET_XMIT_DROP on input.

2011-11-12 18:13:32 -05:00

arp.c

net: Don't proxy arp respond if iif == rt->dst.dev if private VLAN is disabled

2012-02-10 15:13:36 -05:00

cipso_ipv4.c

cipso: remove an unneeded NULL check in cipso_v4_doi_add()

2011-10-11 18:43:53 -04:00

datagram.c

…

devinet.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

esp4.c

…

fib_frontend.c

rtnetlink: Compute and store minimum ifinfo dump size

2011-06-09 20:38:07 -07:00

fib_lookup.h

…

fib_rules.c

net: ipv4: export fib_lookup and fib_table_lookup

2011-12-04 22:43:33 +01:00

fib_semantics.c

ipv4: Fix fib_info->fib_metrics leak

2011-09-16 17:42:26 -04:00

fib_trie.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

gre.c

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02 04:29:23 -07:00

icmp.c

net: more accurate skb truesize

2011-10-13 16:05:07 -04:00

igmp.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

inet_connection_sock.c

tcp: bind() optimize port allocation

2012-01-25 21:50:43 -05:00

inet_diag.c

inet_diag: Rename inet_diag_req_compat into inet_diag_req

2012-01-11 12:56:06 -08:00

inet_fragment.c

…

inet_hashtables.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-06 18:33:19 -07:00

inet_lro.c

net: add skb frag size accessors

2011-10-19 03:10:46 -04:00

inet_timewait_sock.c

net: Fix files explicitly needing to include module.h

2011-10-31 19:30:28 -04:00

inetpeer.c

inetpeer: initialize ->redirect_genid in inet_getpeer()

2012-01-17 15:52:12 -05:00

ip_forward.c

ipv4: Save nexthop address of LSRR/SSRR option to IPCB.

2011-11-23 19:19:32 -05:00

ip_fragment.c

treewide: Fix typos in various parts of the kernel, and fix some comments.

2011-12-02 14:57:31 +01:00

ip_gre.c

gre: fix spelling in comments

2012-02-24 17:41:11 -05:00

ip_input.c

ip: introduce ip_is_fragment helper inline function

2011-06-21 20:33:34 -07:00

ip_options.c

ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.

2012-02-10 15:12:12 -05:00

ip_output.c

net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.

2011-12-05 15:20:19 -05:00

ip_sockglue.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

ipcomp.c

…

ipconfig.c

net: fix some sparse errors

2012-01-17 10:31:12 -05:00

ipip.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

ipmr.c

net: reintroduce missing rcu_assign_pointer() calls

2012-01-12 12:26:56 -08:00

Kconfig

net: Fix build regression when INET_UDP_DIAG=y and IPV6=m

2012-02-07 13:35:28 -05:00

Makefile

tcp memory pressure controls

2011-12-12 19:04:10 -05:00

netfilter.c

netfilter: possible unaligned packet header in ip_route_me_harder

2011-11-21 18:46:18 +01:00

ping.c

ipv4: ping: Fix recvmsg MSG_OOB error handling.

2012-02-21 17:59:19 -05:00

proc.c

tcp: detect loss above high_seq in recovery

2012-01-22 15:08:44 -05:00

protocol.c

…

raw.c

ipv4: Remove all uses of LL_ALLOCATED_SPACE

2011-11-18 14:37:08 -05:00

route.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

syncookies.c

tcp: Replace constants with #define macros

2011-12-21 01:03:23 -05:00

sysctl_net_ipv4.c

tcp: properly initialize tcp memory limits

2012-02-02 14:34:41 -05:00

tcp_bic.c

tcp: fix undo after RTO for BIC

2012-01-20 14:17:26 -05:00

tcp_cong.c

tcp: do not scale TSO segment size with reordering degree

2011-11-29 00:29:41 -05:00

tcp_cubic.c

tcp: fix undo after RTO for CUBIC

2012-01-20 14:17:26 -05:00

tcp_diag.c

inet_diag: Rename inet_diag_req into inet_diag_req_v2

2012-01-11 12:56:06 -08:00

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

…

tcp_input.c

tcp: fix tcp_shifted_skb() adjustment of lost_cnt_hint for FACK

2012-02-14 14:38:57 -05:00

tcp_ipv4.c

tcp_v4_send_reset: binding oif to iif in no sock case

2012-02-04 18:20:05 -05:00

tcp_lp.c

…

tcp_memcontrol.c

static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()

2012-02-24 10:05:59 +01:00

tcp_minisocks.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

tcp_output.c

tcp: fix tcp_trim_head() to adjust segment count with skb MSS

2012-01-30 12:42:58 -05:00

tcp_probe.c

…

tcp_scalable.c

…

tcp_timer.c

net: Disambiguate kernel message

2012-02-01 14:41:50 -05:00

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

vfs: fix panic in __d_lookup() with high dentry hashtable counts

2012-02-13 20:45:38 -05:00

tunnel4.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

udp_diag.c

net: kill duplicate included header

2012-01-17 10:31:12 -05:00

udp_impl.h

…

udp.c

udp: Export code sk lookup routines

2011-12-09 14:14:08 -05:00

udplite.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

xfrm4_input.c

…

xfrm4_mode_beet.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm4_output.c

xfrm4: Don't call icmp_send on local error

2011-07-01 17:33:19 -07:00

xfrm4_policy.c

ipv4: fix ipsec forward performance regression

2011-10-24 03:01:22 -04:00

xfrm4_state.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm4_tunnel.c

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00