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: ip6t_eui: fix read outside array bounds	2009-08-31 15:30:31 +02:00
addrconf_core.c
addrconf.c	ipv6: Add IFA_F_DADFAILED flag	2009-09-11 12:54:58 -07:00
addrlabel.c
af_inet6.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
ah6.c
anycast.c
datagram.c
esp6.c
exthdrs_core.c
exthdrs.c
fib6_rules.c
icmp.c	inet6: Conversion from u8 to int	2009-08-13 16:43:31 -07:00
inet6_connection_sock.c
inet6_hashtables.c
ip6_fib.c	xfrm: select sane defaults for xfrm[4|6] gc_thresh	2009-07-30 18:52:15 -07:00
ip6_flowlabel.c
ip6_input.c	ipv6: correct return on ipv6_rcv() packet drop	2009-07-06 18:07:55 -07:00
ip6_output.c	ip: Report qdisc packet drops	2009-09-02 18:05:33 -07:00
ip6_tunnel.c	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
ip6mr.c	net: file_operations should be const	2009-09-02 01:03:53 -07:00
ipcomp6.c
ipv6_sockglue.c	inet6: Set default traffic class	2009-08-13 16:43:32 -07:00
Kconfig
Makefile
mcast.c	mcastv6: Local variable shadows function argument	2009-07-21 11:13:25 -07:00
mip6.c
ndisc.c	net: make neigh_ops constant	2009-09-01 17:40:57 -07:00
netfilter.c
proc.c	net: mark read-only arrays as const	2009-08-05 10:42:58 -07:00
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
reassembly.c
route.c	netns: embed ip6_dst_ops directly	2009-09-01 17:40:31 -07:00
sit.c	netdev: convert pseudo-devices to netdev_tx_t	2009-09-01 01:13:07 -07:00
syncookies.c	percpu: clean up percpu variable definitions	2009-06-24 15:13:48 +09:00
sysctl_net_ipv6.c	inet6: functions shadow global variable	2009-08-02 12:54:30 -07:00
tcp_ipv6.c	ipv6: Fix tcp_v6_send_response(): it didn't set skb transport header	2009-09-03 20:44:38 -07:00
tunnel6.c
udp_impl.h
udp.c	ip: Report qdisc packet drops	2009-09-02 18:05:33 -07:00
udplite.c
xfrm6_input.c
xfrm6_mode_beet.c
xfrm6_mode_ro.c
xfrm6_mode_transport.c
xfrm6_mode_tunnel.c
xfrm6_output.c
xfrm6_policy.c	xfrm6: Fix xfrm6_policy.c build when SYSCTL disabled.	2009-08-04 20:32:16 -07:00
xfrm6_state.c
xfrm6_tunnel.c