projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dde7f55 58f88ca)
Merge branch 'xfs-setxattr-promotion' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 18 Jan 2016 21:16:08 +0000 (08:16 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 18 Jan 2016 21:16:08 +0000 (08:16 +1100)
1  2 
fs/xfs/libxfs/xfs_format.h patch | diff1 | diff2 | blob | history
fs/xfs/xfs_inode.c patch | diff1 | diff2 | blob | history

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