Merge branch 'x86/urgent' into x86/pat

Merge branch 'topic/hwdep-cleanup' into topic/hdsp

Merge branch 'linus' into timers/hpet

Merge branch 'linus' into core/softlockup

Merge commit 'v2.6.29-rc4' into x86/cleanups

Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
arch/x86/kernel/setup_percpu.c
arch/x86/mm/fault.c
drivers/acpi/processor_idle.c
kernel/irq/handle.c

Merge branch 'topic/quirk-cleanup' into topic/misc

Merge branch 'topic/quirk-cleanup' into topic/hda

Merge branches 'sched/rt' and 'sched/urgent' into sched/core

Merge branch 'linus' into core/locking

Conflicts:
fs/btrfs/locking.c

Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release

Merge branch 'linus' into x86/mm

Conflicts:
arch/x86/mm/fault.c

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ stat

Merge branch 'master' into next

Conflicts:
fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
nd->flags |= LOOKUP_CONTINUE;
err = exec_permission_lite(inode);
if (err == -EAGAIN)
- err = vfs_permission(nd, MAY_EXEC);
+ err = inode_permission(nd->path.dentry->d_inode,
+ MAY_EXEC);
+ if (!err)
+ err = ima_path_check(&nd->path, MAY_EXEC);
if (err)
break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
flag &= ~O_TRUNC;
}

- error = vfs_permission(nd, acc_mode);
+ error = inode_permission(inode, acc_mode);
if (error)
return error;
+
- error = ima_path_check(&nd->path,
++ error = ima_path_check(path,
+ acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
+ if (error)
+ return error;
/*
* An append-only file must be opened in append mode for writing.
*/

Signed-off-by: James Morris <jmorris@namei.org>

show more ...

Merge branch 'core/xen' into x86/urgent

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/Kconfig

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

Merge branch 'master' of /home/shaggy/git/linus-clean/

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

Merge branch 'core/percpu' into x86/paravirt

Merge branch 'linus' into core/percpu

Conflicts:
kernel/irq/handle.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Merge branch 'sh/stable-updates'