Merge branch 'for_linus' into for_linus_merged (ff9cb1c4) · Commits · CodeLinaro / la / kernel / msm-3.14 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

msm-3.14
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

ff9cb1c4

Commit ff9cb1c4 authored 13 years ago by Theodore Ts'o

Downloads
- Plain Diff

Merge branch 'for_linus' into for_linus_merged

Conflicts:
	fs/ext4/ioctl.c

parents e4e11180 d50f2ab6

No related branches found

Tags v6.0-rc5

Loading

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Documentation/filesystems/ext4.txt 7 additions, 0 deletions

Documentation/filesystems/ext4.txt
fs/ext4/balloc.c 3 additions, 1 deletion

fs/ext4/balloc.c
fs/ext4/ext4.h 17 additions, 12 deletions

fs/ext4/ext4.h
fs/ext4/extents.c 6 additions, 4 deletions

fs/ext4/extents.c
fs/ext4/ialloc.c 11 additions, 7 deletions

fs/ext4/ialloc.c
fs/ext4/inode.c 19 additions, 124 deletions

fs/ext4/inode.c
fs/ext4/ioctl.c 74 additions, 12 deletions

fs/ext4/ioctl.c
fs/ext4/mballoc.c 1 addition, 1 deletion

fs/ext4/mballoc.c
fs/ext4/resize.c 886 additions, 289 deletions

fs/ext4/resize.c
fs/ext4/super.c 5 additions, 6 deletions

fs/ext4/super.c
fs/ext4/xattr_security.c 3 additions, 2 deletions

fs/ext4/xattr_security.c
fs/jbd2/commit.c 6 additions, 0 deletions

fs/jbd2/commit.c
fs/jbd2/revoke.c 34 additions, 0 deletions

fs/jbd2/revoke.c
fs/jbd2/transaction.c 3 additions, 2 deletions

fs/jbd2/transaction.c
include/linux/jbd2.h 1 addition, 0 deletions

include/linux/jbd2.h
include/trace/events/ext4.h 3 additions, 3 deletions

include/trace/events/ext4.h

with 1079 additions and 463 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment