From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 04:54:31 +0000 (-0700)
Subject: Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v5.15~27620
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81280572ca6f54009edfa4deee563e8678784218;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'upstream-merge' of git://git./linux/kernel/git/tytso/ext4

* 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (50 commits)
  ext4,jbd2: convert tracepoints to use major/minor numbers
  ext4: optimize orphan_list handling for ext4_setattr
  ext4: fix unbalanced mutex unlock in error path of ext4_li_request_new
  ext4: fix compile error in ext4_fallocate()
  ext4: move ext4_mb_{get,put}_buddy_cache_lock and make them static
  ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end()
  ext4: move flush_completed_IO to fs/ext4/fsync.c and make it static
  ext4: rename {ext,idx}_pblock and inline small extent functions
  ext4: make various ext4 functions be static
  ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()
  ext4: fix kernel oops if the journal superblock has a non-zero j_errno
  ext4: update writeback_index based on last page scanned
  ext4: implement writeback livelock avoidance using page tagging
  ext4: tidy up a void argument in inode.c
  ext4: add batched_discard into ext4 feature list
  ext4: Add batched discard support for ext4
  fs: Add FITRIM ioctl
  ext4: Use return value from sb_issue_discard()
  ext4: Check return value of sb_getblk() and friends
  ext4: use bio layer instead of buffer layer in mpage_da_submit_io
  ...
---

81280572ca6f54009edfa4deee563e8678784218