linux/net/rds
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
..
Kconfig RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
Makefile RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
af_rds.c RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
bind.c RDS: Add a debug message suggesting to load transport modules 2009-08-23 19:13:14 -07:00
cong.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
connection.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
ib.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
ib.h RDS/IB: Always use PAGE_SIZE for FMR page size 2009-07-20 08:03:13 -07:00
ib_cm.c RDS/IB: Drop connection when a fatal QP event is received 2009-07-20 08:03:11 -07:00
ib_rdma.c RDS/IB: Always use PAGE_SIZE for FMR page size 2009-07-20 08:03:13 -07:00
ib_recv.c RDS/IB: Rename byte_len to data_len to enhance readability 2009-07-20 08:03:07 -07:00
ib_ring.c RDS/IW+IB: Set recv ring low water mark to 1/2 full. 2009-04-09 17:21:14 -07:00
ib_send.c RDS/IW+IB: Allow max credit advertise window. 2009-04-09 17:21:17 -07:00
ib_stats.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
ib_sysctl.c RDS/IB: Disable flow control in sysctl and explain why 2009-07-20 08:03:10 -07:00
info.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
info.h RDS: Info and stats 2009-02-26 23:39:25 -08:00
iw.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
iw.h RDS/IW: Remove page_shift variable from iwarp transport 2009-07-20 08:03:14 -07:00
iw_cm.c RDS: Use spinlock to protect 64b value update on 32b archs 2009-04-02 00:52:22 -07:00
iw_rdma.c RDS/IW: Remove page_shift variable from iwarp transport 2009-07-20 08:03:14 -07:00
iw_recv.c RDS/IW+IB: Allow max credit advertise window. 2009-04-09 17:21:17 -07:00
iw_ring.c RDS/IW+IB: Set recv ring low water mark to 1/2 full. 2009-04-09 17:21:14 -07:00
iw_send.c RDS/IW: Remove page_shift variable from iwarp transport 2009-07-20 08:03:14 -07:00
iw_stats.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
iw_sysctl.c RDS: Add iWARP support 2009-02-26 23:39:33 -08:00
loop.c RDS: loopback 2009-02-26 23:39:26 -08:00
loop.h RDS: loopback 2009-02-26 23:39:26 -08:00
message.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
page.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2009-09-15 09:39:44 -07:00
rdma.c RDS: use get_user_pages_fast() 2009-04-09 17:21:20 -07:00
rdma.h RDS: RDMA support 2009-02-26 23:39:29 -08:00
rdma_transport.c RDS: Modularize RDMA and TCP transports 2009-08-23 19:13:09 -07:00
rdma_transport.h RDS: Common RDMA transport code 2009-02-26 23:39:33 -08:00
rds.h RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
recv.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
send.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
stats.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
sysctl.c RDS: sysctls 2009-02-26 23:39:26 -08:00
tcp.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00
tcp.h RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_connect.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_listen.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_recv.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_send.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
tcp_stats.c RDS: Add TCP transport to RDS 2009-08-23 19:13:02 -07:00
threads.c RDS: Export symbols from core RDS 2009-08-23 19:13:07 -07:00
transport.c RDS: Track transports via an array, not a list 2009-08-23 19:13:12 -07:00