Linus Torvalds ada3fa1505 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits) powerpc64: convert to dynamic percpu allocator sparc64: use embedding percpu first chunk allocator percpu: kill lpage first chunk allocator x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA percpu: update embedding first chunk allocator to handle sparse units percpu: use group information to allocate vmap areas sparsely vmalloc: implement pcpu_get_vm_areas() vmalloc: separate out insert_vmalloc_vm() percpu: add chunk->base_addr percpu: add pcpu_unit_offsets[] percpu: introduce pcpu_alloc_info and pcpu_group_info percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward percpu: add @align to pcpu_fc_alloc_fn_t percpu: make @dyn_size mandatory for pcpu_setup_first_chunk() percpu: drop @static_size from first chunk allocators percpu: generalize first chunk allocator selection percpu: build first chunk allocators selectively percpu: rename 4k first chunk allocator to page percpu: improve boot messages percpu: fix pcpu_reclaim() locking ... Fix trivial conflict as by Tejun Heo in kernel/sched.c		2009-09-15 09:39:44 -07:00
..
netfilter	netfilter: nfnetlink: constify message attributes and headers	2009-08-25 16:07:58 +02:00
af_inet.c	ipv4: af_inet.c cleanups	2009-08-28 23:45:21 -07:00
ah4.c
arp.c	net: make neigh_ops constant	2009-09-01 17:40:57 -07:00
cipso_ipv4.c
datagram.c
devinet.c
esp4.c
fib_frontend.c
fib_hash.c
fib_lookup.h
fib_rules.c
fib_semantics.c
fib_trie.c	fib_trie: resize rework	2009-08-28 23:57:15 -07:00
icmp.c
igmp.c
inet_connection_sock.c
inet_diag.c	net: correct off-by-one write allocations reports	2009-06-18 00:29:12 -07:00
inet_fragment.c
inet_hashtables.c
inet_lro.c
inet_timewait_sock.c	tcp: fix premature termination of FIN_WAIT2 time-wait sockets	2009-08-29 00:00:35 -07:00
inetpeer.c
ip_forward.c
ip_fragment.c
ip_gre.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-09-02 00:32:56 -07:00
ip_input.c	inet: Call skb_orphan before tproxy activates	2009-06-26 19:22:37 -07:00
ip_options.c
ip_output.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
ip_sockglue.c
ipcomp.c
ipconfig.c
ipip.c	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
ipmr.c	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
Kconfig	ipv4: update ARPD help text	2009-06-13 23:36:32 -07:00
Makefile
netfilter.c
proc.c
protocol.c	headers: net/ipv[46]/protocol.c header trim	2009-09-09 03:43:50 -07:00
raw.c	ip: Report qdisc packet drops	2009-09-02 18:05:33 -07:00
route.c	net: ip_rt_send_redirect() optimization	2009-08-28 23:52:01 -07:00
syncookies.c	percpu: clean up percpu variable definitions	2009-06-24 15:13:48 +09:00
sysctl_net_ipv4.c
tcp_bic.c
tcp_cong.c	Networking: use CAP_NET_ADMIN when deciding to call request_module	2009-08-14 11:18:34 +10:00
tcp_cubic.c
tcp_diag.c
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c
tcp_input.c	Revert Backoff [v3]: Revert RTO on ICMP destination unreachable	2009-09-01 02:45:42 -07:00
tcp_ipv4.c	tcp: replace hard coded GFP_KERNEL with sk_allocation	2009-09-02 23:45:45 -07:00
tcp_lp.c
tcp_minisocks.c	tcp: replace hard coded GFP_KERNEL with sk_allocation	2009-09-02 23:45:45 -07:00
tcp_output.c	tcp: replace hard coded GFP_KERNEL with sk_allocation	2009-09-02 23:45:45 -07:00
tcp_probe.c
tcp_scalable.c
tcp_timer.c	Revert Backoff [v3]: Calculate TCP's connection close threshold as a time value.	2009-09-01 02:45:47 -07:00
tcp_vegas.c
tcp_vegas.h
tcp_veno.c
tcp_westwood.c
tcp_yeah.c
tcp.c	tcp: replace hard coded GFP_KERNEL with sk_allocation	2009-09-02 23:45:45 -07:00
tunnel4.c
udp_impl.h
udp.c	ip: Report qdisc packet drops	2009-09-02 18:05:33 -07:00
udplite.c
xfrm4_input.c
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c
xfrm4_output.c
xfrm4_policy.c	xfrm4: fix build when SYSCTLs are disabled	2009-08-04 20:18:33 -07:00
xfrm4_state.c
xfrm4_tunnel.c