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

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 50 insertions, 0 deletions

diff --git a/lib/kobject.c b/lib/kobject.c
index 7dd5c0e9d996..744a4b102c7f 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -311,6 +311,56 @@ int kobject_rename(struct kobject * kobj, const char *new_name)
 }
 
 /**
+ *      kobject_move - move object to another parent
+ *      @kobj:  object in question.
+ *      @new_parent: object's new parent
+ */
+
+int kobject_move(struct kobject *kobj, struct kobject *new_parent)
+{
+        int error;
+        struct kobject *old_parent;
+        const char *devpath = NULL;
+        char *devpath_string = NULL;
+        char *envp[2];
+
+        kobj = kobject_get(kobj);
+        if (!kobj)
+                return -EINVAL;
+        new_parent = kobject_get(new_parent);
+        if (!new_parent) {
+                error = -EINVAL;
+                goto out;
+        }
+        /* old object path */
+        devpath = kobject_get_path(kobj, GFP_KERNEL);
+        if (!devpath) {
+                error = -ENOMEM;
+                goto out;
+        }
+        devpath_string = kmalloc(strlen(devpath) + 15, GFP_KERNEL);
+        if (!devpath_string) {
+                error = -ENOMEM;
+                goto out;
+        }
+        sprintf(devpath_string, "DEVPATH_OLD=%s", devpath);
+        envp[0] = devpath_string;
+        envp[1] = NULL;
+        error = sysfs_move_dir(kobj, new_parent);
+        if (error)
+                goto out;
+        old_parent = kobj->parent;
+        kobj->parent = new_parent;
+        kobject_put(old_parent);
+        kobject_uevent_env(kobj, KOBJ_MOVE, envp);
+out:
+        kobject_put(kobj);
+        kfree(devpath_string);
+        kfree(devpath);
+        return error;
+}
+
+/**
  *      kobject_del - unlink kobject from hierarchy.
  *      @kobj:  object.
  */