From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Already up-to-date.
commit e5c832d5558826cc6e9a24746cfdec8e7780063a Author: Linus Torvalds <firstname.lastname@example.org> Date: Sun Sep 8 18:13:49 2013 -0700 vfs: fix dentry RCU to refcounting possibly sleeping dput() This is the fix that the last two commits indirectly led up to - making sure that we don't call dput() in a bad context on the dentries we've looked up in RCU mode after the sequence count validation fails. This basically expands d_rcu_to_refcount() into the callers, and then fixes the callers to delay the dput() in the failure case until _after_ we've dropped all locks and are no longer in an RCU-locked region. The case of 'complete_walk()' was trivial, since its failure case did the unlock_rcu_walk() directly after the call to d_rcu_to_refcount(), and as such that is just a pure expansion of the function with a trivial movement of the resulting dput() to after 'unlock_rcu_walk()'. In contrast, the unlazy_walk() case was much more complicated, because not only does convert two different dentries from RCU to be reference counted, but it used to not call unlock_rcu_walk() at all, and instead just returned an error and let the caller clean everything up in "terminate_walk()". Happily, one of the dentries in question (called "parent" inside unlazy_walk()) is the dentry of "nd->path", which terminate_walk() wants a refcount to anyway for the non-RCU case. So what the new and improved unlazy_walk() does is to first turn that dentry into a refcounted one, and once that is set up, the error cases can continue to use the terminate_walk() helper for cleanup, but for the non-RCU case. Which makes it possible to drop out of RCU mode if we actually hit the sequence number failure case. Acked-by: Al Viro <email@example.com> Signed-off-by: Linus Torvalds <firstname.lastname@example.org>
CLEAN . CLEAN arch/microblaze/kernel CLEAN kernel CLEAN usr CLEAN .tmp_versions CLEAN scripts/basic CLEAN scripts/dtc CLEAN scripts/kconfig CLEAN scripts/mod CLEAN scripts CLEAN include/config include/generated arch/microblaze/include/generated CLEAN .config .version include/generated/uapi/linux/version.h
Switched to branch 'master' Deleted branch next (was 98926a8). From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Already up-to-date. From ../linux-2.6 * branch HEAD -> FETCH_HEAD Already up-to-date. Fetching origin Fetching linux-next Switched to a new branch 'next' Branch next set up to track remote branch master from linux-next.
commit 98926a8004b453089368fda456b8c869240e9953 Author: Stephen Rothwell <email@example.com> Date: Mon Sep 9 16:05:53 2013 +1000 Add linux-next specific files for 20130909 Signed-off-by: Stephen Rothwell <firstname.lastname@example.org>
CLEAN scripts/basic CLEAN scripts/kconfig CLEAN include/config CLEAN .config
HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf scripts/kconfig/conf --silentoldconfig Kconfig kernel/time/Kconfig:162:warning: range is invalid *** *** Configuration file ".config" not found! *** *** Please run some configurator (e.g. "make oldconfig" or *** "make menuconfig" or "make xconfig"). *** make: *** [silentoldconfig] Error 1 make: *** [silentoldconfig] Error 2 make: *** No rule to make target `include/config/auto.conf', needed by `include/config/kernel.release'. Stop.