Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

6a63ef06

Commit 6a63ef06 authored 10 years ago by Dave Chinner

Downloads
- Plain Diff

Merge branch 'xfs-misc-fixes-for-4.1-3' into for-next

Conflicts:
	fs/xfs/xfs_iops.c

parents a448f8f1 21c3ea18

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

fs/xfs/libxfs/xfs_attr_leaf.c 114 additions, 36 deletions

fs/xfs/libxfs/xfs_attr_leaf.c
fs/xfs/libxfs/xfs_attr_leaf.h 4 additions, 2 deletions

fs/xfs/libxfs/xfs_attr_leaf.h
fs/xfs/libxfs/xfs_da_format.h 13 additions, 1 deletion

fs/xfs/libxfs/xfs_da_format.h
fs/xfs/xfs_attr_inactive.c 2 additions, 1 deletion

fs/xfs/xfs_attr_inactive.c
fs/xfs/xfs_attr_list.c 6 additions, 3 deletions

fs/xfs/xfs_attr_list.c
fs/xfs/xfs_bmap_util.c 1 addition, 1 deletion

fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_file.c 2 additions, 2 deletions

fs/xfs/xfs_file.c
fs/xfs/xfs_ioctl.c 1 addition, 1 deletion

fs/xfs/xfs_ioctl.c
fs/xfs/xfs_iops.c 1 addition, 1 deletion

fs/xfs/xfs_iops.c
fs/xfs/xfs_pnfs.c 6 additions, 1 deletion

fs/xfs/xfs_pnfs.c
fs/xfs/xfs_pnfs.h 3 additions, 2 deletions

fs/xfs/xfs_pnfs.h
fs/xfs/xfs_super.c 6 additions, 0 deletions

fs/xfs/xfs_super.c

with 159 additions and 51 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