fs/xfs/linux-2.6/xfs_iops.c · 5a2f3a02aea164f4f59c0c3497772090a411b462 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next · 5a2f3a02
James Morris authored Aug 09, 2011
```
Conflicts:
	fs/attr.c

Resolve conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
```
5a2f3a02

xfs_iops.c 29.2 KB