Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
Attach a file by drag & drop or click to upload
