]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd1a643 ebcb904)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 May 2011 17:22:10 +0000 (10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 May 2011 17:22:10 +0000 (10:22 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix FS_IOC_SETFLAGS ioctl
  Btrfs: fix FS_IOC_GETFLAGS ioctl
  fs: remove FS_COW_FL
  Btrfs: fix easily get into ENOSPC in mixed case
  Prevent oopsing in posix_acl_valid()

1  2 
fs/btrfs/acl.c patch | diff1 | diff2 | blob | history
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history
include/linux/fs.h patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/acl.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc include/linux/fs.h
Simple merge
Linux kernel for KaRo TX COM modules