diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 10:52:40 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 10:52:40 -0800 |
| commit | e49198c6adf03a0083c53fe8d215e2306f5b9b16 (patch) | |
| tree | ac4d1cb8c873ed112b06e7234bfb11978e38338b | |
| parent | 6320aa71bb246e245f9e4e0bd04e509fe8521681 (diff) | |
| download | patches-e49198c6adf03a0083c53fe8d215e2306f5b9b16.tar.gz | |
2.6.24-git18 resync
| -rw-r--r-- | driver/warn-when-statically-allocated-kobjects-are-used.patch | 2 | ||||
| -rw-r--r-- | gregkh/sysfs-test.patch | 2 | ||||
| -rw-r--r-- | series | 3 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index d598e7b4013738..10c716bea1ca99 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -767,12 +767,21 @@ static void run_init_process(char *init_ +@@ -774,12 +774,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } diff --git a/gregkh/sysfs-test.patch b/gregkh/sysfs-test.patch index f152c52d760816..58179d7fc684c3 100644 --- a/gregkh/sysfs-test.patch +++ b/gregkh/sysfs-test.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -91,3 +91,5 @@ obj-$(CONFIG_PPC_PS3) += ps3/ +@@ -92,3 +92,5 @@ obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_VIRTIO) += virtio/ @@ -7,9 +7,6 @@ gregkh/detect-atomic-counter-underflows.patch gregkh/gcc43-workaround.diff # driver patches queued for 2.6.25 -driver/block-fix-whole_disk-attribute-bug.patch -driver/driver-core-revert-fix-firmware-class-name-collision.patch -driver/sysfs-remove-bug_on-from-sysfs_remove_group.patch # driver patches for after 2.6.25 is out driver/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch @@ -1 +1 @@ -2.6.24-git16 +2.6.24-git18 |