projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88e8fda 7dcf5c3)
Merge branch 'xfs-rename-whiteout' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 03:29:13 +0000 (14:29 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 25 Mar 2015 03:29:13 +0000 (14:29 +1100)
Conflicts:
fs/xfs/xfs_inode.c

1  2 
fs/xfs/xfs_inode.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_iops.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_inode.c
Simple merge
diff --cc fs/xfs/xfs_iops.c
Simple merge
Domain: System / Kernel;