2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
linux-next/fs/hfs
Linus Torvalds 6c51038900 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
2011-03-24 10:16:26 -07:00
..
attr.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bfind.c hfs: Convert tree_lock to mutex 2010-10-12 17:36:11 +02:00
bitmap.c hfs: convert bitmap_lock in a mutex 2008-07-25 10:53:33 -07:00
bnode.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
brec.c hfs_bnode_find() can fail, resulting in hfs_bnode_split() breakage 2008-03-17 09:46:55 -07:00
btree.c hfs: Convert tree_lock to mutex 2010-10-12 17:36:11 +02:00
btree.h hfs: Convert tree_lock to mutex 2010-10-12 17:36:11 +02:00
catalog.c hfs: fix a potential buffer overflow 2009-12-15 08:53:10 -08:00
dir.c hfs: fix rename() over non-empty directory 2011-03-03 01:28:40 -05:00
extent.c hfs: convert extents_lock in a mutex 2008-07-25 10:53:33 -07:00
hfs_fs.h fs: change d_hash for rcu-walk 2011-01-07 17:50:20 +11:00
hfs.h address hfs on-disk corruption robustness review comments 2008-02-06 10:41:05 -08:00
inode.c block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
Kconfig fs/Kconfig: move hfs, hfsplus out 2009-01-22 13:15:57 +03:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
mdb.c hfs: use sync_dirty_buffer 2010-10-25 21:18:21 -04:00
part_tbl.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
string.c fs: change d_hash for rcu-walk 2011-01-07 17:50:20 +11:00
super.c switch hfs 2011-01-12 20:02:45 -05:00
sysdep.c fs: rcu-walk aware d_revalidate method 2011-01-07 17:50:29 +11:00
trans.c [PATCH] hfs: NLS support 2005-09-07 16:57:50 -07:00