Hello community,
here is the log from the commit of package kernel-source
checked in at Sun Mar 30 12:25:15 CEST 2008.
--------
--- kernel-source/kernel-debug.changes 2008-03-22 08:41:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-03-28 19:29:11.000000000 +0100
@@ -1,0 +2,33 @@
+Thu Mar 27 20:31:48 CET 2008 - jeffm@suse.de
+
+- Fixed up the rest of the reiserfs patch queue.
+
+-------------------------------------------------------------------
+Thu Mar 27 19:21:32 CET 2008 - jeffm@suse.de
+
+- Updated reiserfs xattr patches.
+
+-------------------------------------------------------------------
+Thu Mar 27 18:53:17 CET 2008 - gregkh@suse.de
+
+- fix merge error in patches.suse/supported-flag caused by me...
+
+-------------------------------------------------------------------
+Thu Mar 27 18:14:18 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc7-git2
+
+-------------------------------------------------------------------
+Thu Mar 27 18:09:56 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc7
+ - note that reiserfs xattr patches are now disabled due to merge
+ issues...
+
+-------------------------------------------------------------------
+Sun Mar 23 13:29:25 CET 2008 - teheo@suse.de
+
+- patches.drivers/libata-improve-hpa-error-handling: libata:
+ improve HPA error handling (365534).
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:47.000000000 +0200
+++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:47.000000000 +0200
@@ -44,7 +44,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.25
-Release: 9
+Release: 10
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -180,7 +180,7 @@
-Source Timestamp: 2008-03-20 22:57:18 +0100
+Source Timestamp: 2008-03-27 21:12:25 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -259,7 +259,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
-Source Timestamp: 2008-03-20 22:57:18 +0100
+Source Timestamp: 2008-03-27 21:12:25 +0100
%install
rm -rf %buildroot
@@ -40,6 +40,21 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Thu Mar 27 2008 jeffm@suse.de
+- Fixed up the rest of the reiserfs patch queue.
+* Thu Mar 27 2008 jeffm@suse.de
+- Updated reiserfs xattr patches.
+* Thu Mar 27 2008 gregkh@suse.de
+- fix merge error in patches.suse/supported-flag caused by me...
+* Thu Mar 27 2008 gregkh@suse.de
+- update to 2.6.25-rc7-git2
+* Thu Mar 27 2008 gregkh@suse.de
+- update to 2.6.25-rc7
+ - note that reiserfs xattr patches are now disabled due to merge
+ issues...
+* Sun Mar 23 2008 teheo@suse.de
+- patches.drivers/libata-improve-hpa-error-handling: libata:
+ improve HPA error handling (365534).
* Thu Mar 20 2008 gregkh@suse.de
- fix up some EXPORT_SYMBOL() markings to be EXPORT_SYMBOL_GPL() as the
code is not upstream and we aren't allowed to add non-GPL exports to
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.g17012/_old 2008-03-30 12:05:48.000000000 +0200
+++ /var/tmp/diff_new_pack.g17012/_new 2008-03-30 12:05:48.000000000 +0200
@@ -44,7 +44,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.25
-Release: 9
+Release: 10
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -179,7 +179,7 @@
-Source Timestamp: 2008-03-20 22:57:18 +0100
+Source Timestamp: 2008-03-27 21:12:25 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -258,7 +258,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008-03-20 22:57:18 +0100
+Source Timestamp: 2008-03-27 21:12:25 +0100
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -270,7 +270,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs < %_builddir/%{name}-%{version}/.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <d_inode)
goto out;
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb, 0);
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1999,7 +1999,8 @@ asmlinkage long sys_mknod(const char __u
+Index: b/fs/namei.c
+===================================================================
+--- a/fs/namei.c 2008-03-27 14:01:01.000000000 -0400
++++ b/fs/namei.c 2008-03-27 14:01:01.000000000 -0400
+@@ -2000,7 +2000,8 @@ asmlinkage long sys_mknod(const char __u
return sys_mknodat(AT_FDCWD, filename, mode, dev);
}
@@ -48,7 +51,7 @@
{
int error = may_create(dir, dentry, NULL);
-@@ -2043,7 +2044,7 @@ asmlinkage long sys_mkdirat(int dfd, con
+@@ -2044,7 +2045,7 @@ asmlinkage long sys_mkdirat(int dfd, con
if (!IS_POSIXACL(nd.path.dentry->d_inode))
mode &= ~current->fs->umask;
@@ -57,8 +60,10 @@
dput(dentry);
out_unlock:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
---- a/fs/nfsd/nfs4recover.c
-+++ b/fs/nfsd/nfs4recover.c
+Index: b/fs/nfsd/nfs4recover.c
+===================================================================
+--- a/fs/nfsd/nfs4recover.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:01:01.000000000 -0400
@@ -154,7 +154,8 @@ nfsd4_create_clid_dir(struct nfs4_client
dprintk("NFSD: nfsd4_create_clid_dir: DIRECTORY EXISTS\n");
goto out_put;
@@ -69,8 +74,10 @@
out_put:
dput(dentry);
out_unlock:
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
+Index: b/fs/nfsd/vfs.c
+===================================================================
+--- a/fs/nfsd/vfs.c 2008-03-27 14:01:01.000000000 -0400
++++ b/fs/nfsd/vfs.c 2008-03-27 14:01:01.000000000 -0400
@@ -1186,6 +1186,7 @@ nfsd_create(struct svc_rqst *rqstp, stru
int type, dev_t rdev, struct svc_fh *resfhp)
{
@@ -114,19 +121,10 @@
err = nfserrno(nfsd_sync_dir(dentry));
write_inode_now(dchild->d_inode, 1);
}
---- a/fs/reiserfs/xattr.c
-+++ b/fs/reiserfs/xattr.c
-@@ -116,7 +116,7 @@ static struct dentry *lookup_or_create_d
- int err = -ENODATA;
-
- if (xattr_may_create(flags))
-- err = vfs_mkdir(parent->d_inode, dentry, 0700);
-+ err = vfs_mkdir(parent->d_inode, dentry, NULL, 0700);
-
- if (err) {
- dput(dentry);
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
+Index: b/include/linux/fs.h
+===================================================================
+--- a/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400
++++ b/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400
@@ -1076,7 +1076,7 @@ extern void unlock_super(struct super_bl
*/
extern int vfs_permission(struct nameidata *, int);
@@ -136,8 +134,10 @@
extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
extern int vfs_symlink(struct inode *, struct dentry *, const char *, int);
extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
+Index: b/kernel/cgroup.c
+===================================================================
+--- a/kernel/cgroup.c 2008-03-27 13:58:27.000000000 -0400
++++ b/kernel/cgroup.c 2008-03-27 14:01:01.000000000 -0400
@@ -2819,7 +2819,7 @@ int cgroup_clone(struct task_struct *tsk
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-notify_change.diff new/patches.apparmor/vfs-notify_change.diff
--- old/patches.apparmor/vfs-notify_change.diff 2008-03-21 22:53:41.000000000 +0100
+++ new/patches.apparmor/vfs-notify_change.diff 2008-03-28 15:59:05.000000000 +0100
@@ -18,17 +18,19 @@
fs/namei.c | 2 +-
fs/nfsd/vfs.c | 8 ++++----
fs/open.c | 28 +++++++++++++++-------------
- fs/reiserfs/xattr.c | 4 ++--
+ fs/reiserfs/xattr.c | 12 ++++++------
fs/sysfs/file.c | 2 +-
fs/utimes.c | 11 ++++++-----
include/linux/fs.h | 6 +++---
mm/filemap.c | 2 +-
mm/tiny-shmem.c | 2 +-
- 14 files changed, 43 insertions(+), 36 deletions(-)
+ 14 files changed, 47 insertions(+), 40 deletions(-)
---- a/fs/attr.c
-+++ b/fs/attr.c
-@@ -100,7 +100,8 @@
+Index: b/fs/attr.c
+===================================================================
+--- a/fs/attr.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/attr.c 2008-03-27 14:21:16.000000000 -0400
+@@ -100,7 +100,8 @@ int inode_setattr(struct inode * inode,
}
EXPORT_SYMBOL(inode_setattr);
@@ -38,9 +40,11 @@
{
struct inode *inode = dentry->d_inode;
mode_t mode = inode->i_mode;
---- a/fs/ecryptfs/inode.c
-+++ b/fs/ecryptfs/inode.c
-@@ -848,6 +848,7 @@
+Index: b/fs/ecryptfs/inode.c
+===================================================================
+--- a/fs/ecryptfs/inode.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/ecryptfs/inode.c 2008-03-27 14:21:16.000000000 -0400
+@@ -848,6 +848,7 @@ static int ecryptfs_setattr(struct dentr
{
int rc = 0;
struct dentry *lower_dentry;
@@ -48,7 +52,7 @@
struct inode *inode;
struct inode *lower_inode;
struct ecryptfs_crypt_stat *crypt_stat;
-@@ -858,6 +859,7 @@
+@@ -858,6 +859,7 @@ static int ecryptfs_setattr(struct dentr
inode = dentry->d_inode;
lower_inode = ecryptfs_inode_to_lower(inode);
lower_dentry = ecryptfs_dentry_to_lower(dentry);
@@ -56,7 +60,7 @@
mutex_lock(&crypt_stat->cs_mutex);
if (S_ISDIR(dentry->d_inode->i_mode))
crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-@@ -908,7 +910,7 @@
+@@ -908,7 +910,7 @@ static int ecryptfs_setattr(struct dentr
if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
ia->ia_valid &= ~ATTR_MODE;
@@ -65,9 +69,11 @@
out:
fsstack_copy_attr_all(inode, lower_inode, NULL);
return rc;
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1777,7 +1777,8 @@
+Index: b/fs/exec.c
+===================================================================
+--- a/fs/exec.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/exec.c 2008-03-27 14:01:01.000000000 -0400
+@@ -1777,7 +1777,8 @@ int do_coredump(long signr, int exit_cod
goto close_fail;
if (!file->f_op->write)
goto close_fail;
@@ -77,9 +83,11 @@
goto close_fail;
retval = binfmt->core_dump(signr, regs, file, core_limit);
---- a/fs/fat/file.c
-+++ b/fs/fat/file.c
-@@ -92,7 +92,7 @@
+Index: b/fs/fat/file.c
+===================================================================
+--- a/fs/fat/file.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/fat/file.c 2008-03-27 14:01:01.000000000 -0400
+@@ -92,7 +92,7 @@ int fat_generic_ioctl(struct inode *inod
}
/* This MUST be done before doing anything irreversible... */
@@ -88,9 +96,11 @@
if (err)
goto up;
---- a/fs/hpfs/namei.c
-+++ b/fs/hpfs/namei.c
-@@ -426,7 +426,7 @@
+Index: b/fs/hpfs/namei.c
+===================================================================
+--- a/fs/hpfs/namei.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/hpfs/namei.c 2008-03-27 14:01:01.000000000 -0400
+@@ -426,7 +426,7 @@ again:
/*printk("HPFS: truncating file before delete.\n");*/
newattrs.ia_size = 0;
newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
@@ -99,9 +109,11 @@
put_write_access(inode);
if (!err)
goto again;
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1662,7 +1662,7 @@
+Index: b/fs/namei.c
+===================================================================
+--- a/fs/namei.c 2008-03-27 14:01:01.000000000 -0400
++++ b/fs/namei.c 2008-03-27 14:21:16.000000000 -0400
+@@ -1663,7 +1663,7 @@ int may_open(struct nameidata *nd, int a
if (!error) {
DQUOT_INIT(inode);
@@ -110,9 +122,11 @@
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
NULL);
}
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -388,7 +388,7 @@
+Index: b/fs/nfsd/vfs.c
+===================================================================
+--- a/fs/nfsd/vfs.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/nfsd/vfs.c 2008-03-27 14:21:16.000000000 -0400
+@@ -388,7 +388,7 @@ nfsd_setattr(struct svc_rqst *rqstp, str
err = nfserr_notsync;
if (!check_guard || guardtime == inode->i_ctime.tv_sec) {
fh_lock(fhp);
@@ -121,7 +135,7 @@
err = nfserrno(host_err);
fh_unlock(fhp);
}
-@@ -944,13 +944,13 @@
+@@ -944,13 +944,13 @@ out:
return err;
}
@@ -137,7 +151,7 @@
mutex_unlock(&dentry->d_inode->i_mutex);
}
-@@ -1009,7 +1009,7 @@
+@@ -1009,7 +1009,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
/* clear setuid/setgid flag after write */
if (host_err >= 0 && (inode->i_mode & (S_ISUID | S_ISGID)))
@@ -146,9 +160,11 @@
if (host_err >= 0 && stable) {
static ino_t last_ino;
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -194,8 +194,8 @@
+Index: b/fs/open.c
+===================================================================
+--- a/fs/open.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/open.c 2008-03-27 14:21:14.000000000 -0400
+@@ -194,8 +194,8 @@ out:
return error;
}
@@ -159,7 +175,7 @@
{
int err;
struct iattr newattrs;
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ int do_truncate(struct dentry *dentry, l
newattrs.ia_valid |= should_remove_suid(dentry);
mutex_lock(&dentry->d_inode->i_mutex);
@@ -168,7 +184,7 @@
mutex_unlock(&dentry->d_inode->i_mutex);
return err;
}
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ static long do_sys_truncate(const char _
error = locks_verify_truncate(inode, NULL, length);
if (!error) {
DQUOT_INIT(inode);
@@ -177,7 +193,7 @@
}
put_write_and_out:
-@@ -324,7 +324,8 @@
+@@ -324,7 +324,8 @@ static long do_sys_ftruncate(unsigned in
error = locks_verify_truncate(inode, file, length);
if (!error)
@@ -187,7 +203,7 @@
out_putf:
fput(file);
out:
-@@ -578,7 +579,7 @@
+@@ -578,7 +579,7 @@ asmlinkage long sys_fchmod(unsigned int
mode = inode->i_mode;
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
@@ -196,7 +212,7 @@
mutex_unlock(&inode->i_mutex);
out_putf:
-@@ -613,7 +614,7 @@
+@@ -613,7 +614,7 @@ asmlinkage long sys_fchmodat(int dfd, co
mode = inode->i_mode;
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
@@ -205,7 +221,7 @@
mutex_unlock(&inode->i_mutex);
dput_and_out:
-@@ -627,7 +628,8 @@
+@@ -627,7 +628,8 @@ asmlinkage long sys_chmod(const char __u
return sys_fchmodat(AT_FDCWD, filename, mode);
}
@@ -215,7 +231,7 @@
{
struct inode * inode;
int error;
-@@ -657,7 +659,7 @@
+@@ -657,7 +659,7 @@ static int chown_common(struct dentry *
newattrs.ia_valid |=
ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_KILL_PRIV;
mutex_lock(&inode->i_mutex);
@@ -224,7 +240,7 @@
mutex_unlock(&inode->i_mutex);
out:
return error;
-@@ -671,7 +673,7 @@
+@@ -671,7 +673,7 @@ asmlinkage long sys_chown(const char __u
error = user_path_walk(filename, &nd);
if (error)
goto out;
@@ -233,7 +249,7 @@
path_put(&nd.path);
out:
return error;
-@@ -691,7 +693,7 @@
+@@ -691,7 +693,7 @@ asmlinkage long sys_fchownat(int dfd, co
error = __user_walk_fd(dfd, filename, follow, &nd);
if (error)
goto out;
@@ -242,7 +258,7 @@
path_put(&nd.path);
out:
return error;
-@@ -705,7 +707,7 @@
+@@ -705,7 +707,7 @@ asmlinkage long sys_lchown(const char __
error = user_path_walk_link(filename, &nd);
if (error)
goto out;
@@ -251,7 +267,7 @@
path_put(&nd.path);
out:
return error;
-@@ -724,7 +726,7 @@
+@@ -724,7 +726,7 @@ asmlinkage long sys_fchown(unsigned int
dentry = file->f_path.dentry;
audit_inode(NULL, dentry);
@@ -260,18 +276,49 @@
fput(file);
out:
return error;
---- a/fs/reiserfs/xattr.c
-+++ b/fs/reiserfs/xattr.c
-@@ -297,7 +297,7 @@
+Index: b/fs/reiserfs/xattr.c
+===================================================================
+--- a/fs/reiserfs/xattr.c 2008-03-27 13:59:46.000000000 -0400
++++ b/fs/reiserfs/xattr.c 2008-03-27 14:06:20.000000000 -0400
+@@ -117,7 +117,7 @@ static struct dentry *lookup_or_create_d
+ int err = -ENODATA;
+
+ if (xattr_may_create(flags))
+- err = vfs_mkdir(parent->d_inode, dentry, 0700);
++ err = vfs_mkdir(parent->d_inode, dentry, NULL, 0700);
+
+ if (err) {
+ dput(dentry);
+@@ -308,7 +308,7 @@ reiserfs_xattr_set_handle(struct reiserf
+ goto out_dput;
+ }
+
+- err = vfs_unlink(xadir->d_inode, dentry);
++ err = vfs_unlink(xadir->d_inode, dentry, NULL);
+ if (!err && !timespec_equal(&inode->i_ctime, &now)) {
+ inode->i_ctime = CURRENT_TIME_SEC;
+ mark_inode_dirty(inode);
+@@ -332,7 +332,7 @@ out_unlock:
+ /* Resize it so we're ok to write there */
newattrs.ia_size = buffer_size;
newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
- mutex_lock_nested(&xinode->i_mutex, I_MUTEX_XATTR);
-- err = notify_change(fp->f_path.dentry, &newattrs);
-+ err = notify_change(fp->f_path.dentry, NULL, &newattrs);
+- err = notify_change(dentry, &newattrs);
++ err = notify_change(dentry, NULL, &newattrs);
if (err)
goto out_filp;
-@@ -692,7 +692,7 @@
+@@ -664,16 +664,16 @@ static int delete_one_xattr(struct dentr
+
+ /* This is the xattr dir, handle specially. */
+ if (S_ISDIR(dentry->d_inode->i_mode))
+- return vfs_rmdir(dir, dentry);
++ return vfs_rmdir(dir, dentry, NULL);
+
+- return vfs_unlink(dir, dentry);
++ return vfs_unlink(dir, dentry, NULL);
+ }
+
+ /* dir->i_mutex is locked */
static int chown_one_xattr(struct dentry *dentry, void *data)
{
struct iattr *attrs = data;
@@ -280,9 +327,11 @@
}
int reiserfs_delete_xattrs(struct inode *inode)
---- a/fs/sysfs/file.c
-+++ b/fs/sysfs/file.c
-@@ -587,7 +587,7 @@
+Index: b/fs/sysfs/file.c
+===================================================================
+--- a/fs/sysfs/file.c 2008-03-27 14:01:01.000000000 -0400
++++ b/fs/sysfs/file.c 2008-03-27 14:01:01.000000000 -0400
+@@ -593,7 +593,7 @@ int sysfs_chmod_file(struct kobject *kob
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
@@ -291,9 +340,11 @@
if (rc == 0) {
mutex_lock(&sysfs_mutex);
---- a/fs/utimes.c
-+++ b/fs/utimes.c
-@@ -55,7 +55,7 @@
+Index: b/fs/utimes.c
+===================================================================
+--- a/fs/utimes.c 2008-03-27 13:58:27.000000000 -0400
++++ b/fs/utimes.c 2008-03-27 14:01:01.000000000 -0400
+@@ -55,7 +55,7 @@ long do_utimes(int dfd, char __user *fil
{
int error;
struct nameidata nd;
@@ -302,7 +353,7 @@
struct inode *inode;
struct iattr newattrs;
struct file *f = NULL;
-@@ -78,16 +78,17 @@
+@@ -78,16 +78,17 @@ long do_utimes(int dfd, char __user *fil
f = fget(dfd);
if (!f)
goto out;
@@ -323,7 +374,7 @@
error = -EROFS;
if (IS_RDONLY(inode))
-@@ -132,7 +133,7 @@
+@@ -132,7 +133,7 @@ long do_utimes(int dfd, char __user *fil
}
}
mutex_lock(&inode->i_mutex);
@@ -332,9 +383,11 @@
mutex_unlock(&inode->i_mutex);
dput_and_out:
if (f)
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -1561,8 +1561,8 @@
+Index: b/include/linux/fs.h
+===================================================================
+--- a/include/linux/fs.h 2008-03-27 14:01:01.000000000 -0400
++++ b/include/linux/fs.h 2008-03-27 14:21:16.000000000 -0400
+@@ -1561,8 +1561,8 @@ static inline int break_lease(struct ino
/* fs/open.c */
@@ -345,7 +398,7 @@
extern long do_sys_open(int dfd, const char __user *filename, int flags,
int mode);
extern struct file *filp_open(const char *, int, int);
-@@ -1717,7 +1717,7 @@
+@@ -1717,7 +1717,7 @@ extern int do_remount_sb(struct super_bl
#ifdef CONFIG_BLOCK
extern sector_t bmap(struct inode *, sector_t);
#endif
@@ -354,9 +407,11 @@
extern int permission(struct inode *, int, struct nameidata *);
extern int generic_permission(struct inode *, int,
int (*check_acl)(struct inode *, int));
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -1662,7 +1662,7 @@
+Index: b/mm/filemap.c
+===================================================================
+--- a/mm/filemap.c 2008-03-27 14:01:01.000000000 -0400
++++ b/mm/filemap.c 2008-03-27 14:01:01.000000000 -0400
+@@ -1662,7 +1662,7 @@ int __remove_suid(struct path *path, int
struct iattr newattrs;
newattrs.ia_valid = ATTR_FORCE | kill;
@@ -365,9 +420,11 @@
}
int remove_suid(struct path *path)
---- a/mm/tiny-shmem.c
-+++ b/mm/tiny-shmem.c
-@@ -80,7 +80,7 @@
+Index: b/mm/tiny-shmem.c
+===================================================================
+--- a/mm/tiny-shmem.c 2008-03-27 13:58:27.000000000 -0400
++++ b/mm/tiny-shmem.c 2008-03-27 14:01:01.000000000 -0400
+@@ -80,7 +80,7 @@ struct file *shmem_file_setup(char *name
inode->i_nlink = 0; /* It is unlinked */
/* notify everyone as to the change of file size */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-rmdir.diff new/patches.apparmor/vfs-rmdir.diff
--- old/patches.apparmor/vfs-rmdir.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/vfs-rmdir.diff 2008-03-28 15:59:05.000000000 +0100
@@ -13,12 +13,13 @@
fs/namei.c | 4 ++--
fs/nfsd/nfs4recover.c | 2 +-
fs/nfsd/vfs.c | 8 +++++---
- fs/reiserfs/xattr.c | 6 +++---
include/linux/fs.h | 2 +-
- 6 files changed, 15 insertions(+), 11 deletions(-)
+ 5 files changed, 12 insertions(+), 8 deletions(-)
---- a/fs/ecryptfs/inode.c
-+++ b/fs/ecryptfs/inode.c
+Index: b/fs/ecryptfs/inode.c
+===================================================================
+--- a/fs/ecryptfs/inode.c 2008-03-27 14:04:47.000000000 -0400
++++ b/fs/ecryptfs/inode.c 2008-03-27 14:04:48.000000000 -0400
@@ -520,14 +520,16 @@ out:
static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
{
@@ -37,9 +38,11 @@
dput(lower_dentry);
if (!rc)
d_delete(lower_dentry);
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -2089,7 +2089,7 @@ void dentry_unhash(struct dentry *dentry
+Index: b/fs/namei.c
+===================================================================
+--- a/fs/namei.c 2008-03-27 14:04:47.000000000 -0400
++++ b/fs/namei.c 2008-03-27 14:04:48.000000000 -0400
+@@ -2090,7 +2090,7 @@ void dentry_unhash(struct dentry *dentry
spin_unlock(&dcache_lock);
}
@@ -48,7 +51,7 @@
{
int error = may_delete(dir, dentry, 1);
-@@ -2153,7 +2153,7 @@ static long do_rmdir(int dfd, const char
+@@ -2154,7 +2154,7 @@ static long do_rmdir(int dfd, const char
error = PTR_ERR(dentry);
if (IS_ERR(dentry))
goto exit2;
@@ -57,8 +60,10 @@
dput(dentry);
exit2:
mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
---- a/fs/nfsd/nfs4recover.c
-+++ b/fs/nfsd/nfs4recover.c
+Index: b/fs/nfsd/nfs4recover.c
+===================================================================
+--- a/fs/nfsd/nfs4recover.c 2008-03-27 14:01:01.000000000 -0400
++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:04:48.000000000 -0400
@@ -274,7 +274,7 @@ nfsd4_clear_clid_dir(struct dentry *dir,
* a kernel from the future.... */
nfsd4_list_rec_dir(dentry, nfsd4_remove_clid_file);
@@ -68,8 +73,10 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
+Index: b/fs/nfsd/vfs.c
+===================================================================
+--- a/fs/nfsd/vfs.c 2008-03-27 14:04:47.000000000 -0400
++++ b/fs/nfsd/vfs.c 2008-03-27 14:04:48.000000000 -0400
@@ -1729,6 +1729,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
char *fname, int flen)
{
@@ -111,37 +118,10 @@
host_err = nfsd_sync_dir(dentry);
out_nfserr:
---- a/fs/reiserfs/xattr.c
-+++ b/fs/reiserfs/xattr.c
-@@ -275,7 +275,7 @@ reiserfs_xattr_set_handle(struct reiserf
- return err;
- }
-
-- err = vfs_unlink(dentry->d_parent->d_inode, dentry);
-+ err = vfs_unlink(dentry->d_parent->d_inode, dentry, NULL);
- if (!err) {
- inode->i_ctime = CURRENT_TIME_SEC;
- mark_inode_dirty(inode);
-@@ -677,7 +677,7 @@ static int delete_one_xattr(struct dentr
- if (err == 0) {
- int err2;
- mutex_lock_nested(&dir->i_mutex, I_MUTEX_XATTR);
-- err = vfs_rmdir(dir, dentry);
-+ err = vfs_rmdir(dir, dentry, NULL);
- err2 = journal_end(&th, dir->i_sb, nblocks);
- mutex_unlock(&dir->i_mutex);
- if (err2)
-@@ -686,7 +686,7 @@ static int delete_one_xattr(struct dentr
- return err;
- }
-
-- return vfs_unlink(dir, dentry);
-+ return vfs_unlink(dir, dentry, NULL);
- }
-
- static int chown_one_xattr(struct dentry *dentry, void *data)
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
+Index: b/include/linux/fs.h
+===================================================================
+--- a/include/linux/fs.h 2008-03-27 14:04:47.000000000 -0400
++++ b/include/linux/fs.h 2008-03-27 14:04:48.000000000 -0400
@@ -1080,7 +1080,7 @@ extern int vfs_mkdir(struct inode *, str
extern int vfs_mknod(struct inode *, struct dentry *, struct vfsmount *, int, dev_t);
extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *, int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-unlink.diff new/patches.apparmor/vfs-unlink.diff
--- old/patches.apparmor/vfs-unlink.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/vfs-unlink.diff 2008-03-28 15:59:05.000000000 +0100
@@ -17,9 +17,11 @@
ipc/mqueue.c | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
---- a/fs/ecryptfs/inode.c
-+++ b/fs/ecryptfs/inode.c
-@@ -430,10 +430,11 @@ static int ecryptfs_unlink(struct inode
+Index: b/fs/ecryptfs/inode.c
+===================================================================
+--- a/fs/ecryptfs/inode.c 2008-03-27 14:04:48.000000000 -0400
++++ b/fs/ecryptfs/inode.c 2008-03-27 14:06:02.000000000 -0400
+@@ -430,10 +430,11 @@ static int ecryptfs_unlink(struct inode
{
int rc = 0;
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
@@ -32,9 +34,11 @@
if (rc) {
printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
goto out_unlock;
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -2170,7 +2170,7 @@ asmlinkage long sys_rmdir(const char __u
+Index: b/fs/namei.c
+===================================================================
+--- a/fs/namei.c 2008-03-27 14:05:55.000000000 -0400
++++ b/fs/namei.c 2008-03-27 14:06:02.000000000 -0400
+@@ -2171,7 +2171,7 @@ asmlinkage long sys_rmdir(const char __u
return do_rmdir(AT_FDCWD, pathname);
}
@@ -43,7 +47,7 @@
{
int error = may_delete(dir, dentry, 0);
-@@ -2235,7 +2235,7 @@ static long do_unlinkat(int dfd, const c
+@@ -2236,7 +2236,7 @@ static long do_unlinkat(int dfd, const c
inode = dentry->d_inode;
if (inode)
atomic_inc(&inode->i_count);
@@ -52,8 +56,10 @@
exit2:
dput(dentry);
}
---- a/fs/nfsd/nfs4recover.c
-+++ b/fs/nfsd/nfs4recover.c
+Index: b/fs/nfsd/nfs4recover.c
+===================================================================
+--- a/fs/nfsd/nfs4recover.c 2008-03-27 14:04:48.000000000 -0400
++++ b/fs/nfsd/nfs4recover.c 2008-03-27 14:06:02.000000000 -0400
@@ -259,7 +259,7 @@ nfsd4_remove_clid_file(struct dentry *di
return -EINVAL;
}
@@ -63,8 +69,10 @@
mutex_unlock(&dir->d_inode->i_mutex);
return status;
}
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
+Index: b/fs/nfsd/vfs.c
+===================================================================
+--- a/fs/nfsd/vfs.c 2008-03-27 14:04:48.000000000 -0400
++++ b/fs/nfsd/vfs.c 2008-03-27 14:06:02.000000000 -0400
@@ -1767,7 +1767,7 @@ nfsd_unlink(struct svc_rqst *rqstp, stru
host_err = -EPERM;
} else
@@ -74,8 +82,10 @@
} else { /* It's RMDIR */
host_err = vfs_rmdir(dirp, rdentry, exp->ex_path.mnt);
}
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
+Index: b/include/linux/fs.h
+===================================================================
+--- a/include/linux/fs.h 2008-03-27 14:04:48.000000000 -0400
++++ b/include/linux/fs.h 2008-03-27 14:06:02.000000000 -0400
@@ -1081,7 +1081,7 @@ extern int vfs_mknod(struct inode *, str
extern int vfs_symlink(struct inode *, struct dentry *, struct vfsmount *, const char *, int);
extern int vfs_link(struct dentry *, struct vfsmount *, struct inode *, struct dentry *, struct vfsmount *);
@@ -85,8 +95,10 @@
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
/*
---- a/ipc/mqueue.c
-+++ b/ipc/mqueue.c
+Index: b/ipc/mqueue.c
+===================================================================
+--- a/ipc/mqueue.c 2008-03-27 13:58:26.000000000 -0400
++++ b/ipc/mqueue.c 2008-03-27 14:06:02.000000000 -0400
@@ -743,7 +743,7 @@ asmlinkage long sys_mq_unlink(const char
if (inode)
atomic_inc(&inode->i_count);
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3-rename-wireless-interface.patch new/patches.arch/ppc-ps3-rename-wireless-interface.patch
--- old/patches.arch/ppc-ps3-rename-wireless-interface.patch 2008-03-12 13:31:52.000000000 +0100
+++ new/patches.arch/ppc-ps3-rename-wireless-interface.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-Subject: rename wireless iface from eth to wlan
-The gelic driver uses two net interfaces, one for ethernet and the
-other for wireless. They share same MAC address and use 'eth' prefix
-for the name.
-As udev uses the MAC address to check uniqueness, this is
-somewhat problematic. So change the prefix of the network interface
-name for the wireless so that udev can have an easy way to distinguish
-interfaces.
-
-From: Masakazu Mokuno
-Signed-off-by: Stefan Assmann
-
----
- drivers/net/ps3_gelic_wireless.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/ps3_gelic_wireless.c
-+++ b/drivers/net/ps3_gelic_wireless.c
-@@ -2389,6 +2389,8 @@ static struct net_device *gelic_wl_alloc
- if (!netdev)
- return NULL;
-
-+ strcpy(netdev->name, "wlan%d");
-+
- port = netdev_priv(netdev);
- port->netdev = netdev;
- port->card = card;
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1
++++++ patches.suse.tar.bz2 ++++++
++++ 5966 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-03-22 08:40:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-03-28 19:28:57.000000000 +0100
@@ -27,8 +27,8 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
########################################################
- patches.kernel.org/patch-2.6.25-rc6
- patches.kernel.org/patch-2.6.25-rc6-git5
+ patches.kernel.org/patch-2.6.25-rc7
+ patches.kernel.org/patch-2.6.25-rc7-git2
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -131,8 +131,6 @@
# PS3
########################################################
- patches.arch/ppc-ps3-rename-wireless-interface.patch
-
########################################################
# S/390
########################################################
@@ -233,7 +231,6 @@
patches.suse/reiserfs-remove-i_has_xattr_dir.diff
patches.suse/reiserfs-remove-link-detection.diff
patches.suse/reiserfs-use-generic-xattr-handlers.diff
- patches.suse/reiserfs-xattrs-noatime.diff
patches.suse/reiserfs-add-per-file-data-ordered-mode.diff
patches.suse/reiserfs-journaled-xattrs.diff
patches.suse/reiserfs-kill-xattr-readdir.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org