- Update to 3.0-rc3.
authorJeff Mahoney <jeffm@suse.com>
Wed, 15 Jun 2011 06:05:05 +0000 (02:05 -0400)
committerJeff Mahoney <jeffm@suse.com>
Wed, 15 Jun 2011 06:05:05 +0000 (02:05 -0400)
  - Eliminated 2 patches.

suse-commit: a1fe99917959ef5ce9168b3e926aad23ecb61fd4

1  2 
Documentation/kernel-parameters.txt
Makefile
arch/s390/Kconfig
fs/namei.c
fs/super.c
include/linux/fs.h
kernel/sysctl.c
net/netfilter/nf_conntrack_ftp.c
security/apparmor/lsm.c

Simple merge
diff --cc Makefile
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/super.c
Simple merge
@@@ -208,7 -208,7 +208,8 @@@ struct inodes_stat_t 
  #define MS_KERNMOUNT  (1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION  (1<<23) /* Update inode I_version field */
  #define MS_STRICTATIME        (1<<24) /* Always perform atime updates */
 +#define MS_RICHACL    (1<<25) /* Supports richacls */
+ #define MS_NOSEC      (1<<28)
  #define MS_BORN               (1<<29)
  #define MS_ACTIVE     (1<<30)
  #define MS_NOUSER     (1<<31)
diff --cc kernel/sysctl.c
Simple merge
Simple merge
Simple merge