diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-02-13 07:37:11 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-02-13 07:37:19 -0500 |
| commit | c47696a795d9442e6c66740c8f2a0729c4406c7f (patch) | |
| tree | e9bcfd86ca426697a062a171e32c4a064b4a6797 | |
| parent | ed66563428e9b6430ad686f6d97b598abd37e9c7 (diff) | |
| download | kernel-c47696a795d9442e6c66740c8f2a0729c4406c7f.tar.gz kernel-c47696a795d9442e6c66740c8f2a0729c4406c7f.tar.xz kernel-c47696a795d9442e6c66740c8f2a0729c4406c7f.zip | |
Linux 3.3-rc3-git4 (upstream 3ec1e88b33a3bdd852ce8e014052acec7a9da8b5)
| -rw-r--r-- | bsg-fix-sysfs-link-remove-warning.patch | 16 | ||||
| -rw-r--r-- | kernel.spec | 9 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 22 deletions
diff --git a/bsg-fix-sysfs-link-remove-warning.patch b/bsg-fix-sysfs-link-remove-warning.patch deleted file mode 100644 index 6e7625327..000000000 --- a/bsg-fix-sysfs-link-remove-warning.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/block/bsg.c b/block/bsg.c -index 4cf703f..ff64ae3 100644 ---- a/block/bsg.c -+++ b/block/bsg.c -@@ -983,7 +983,8 @@ void bsg_unregister_queue(struct request_queue *q) - - mutex_lock(&bsg_mutex); - idr_remove(&bsg_minor_idr, bcd->minor); -- sysfs_remove_link(&q->kobj, "bsg"); -+ if (q->kobj.sd) -+ sysfs_remove_link(&q->kobj, "bsg"); - device_unregister(bcd->class_dev); - bcd->class_dev = NULL; - kref_put(&bcd->ref, bsg_kref_release_function); --- -1.7.4.4 diff --git a/kernel.spec b/kernel.spec index 60c45bfba..a9b18dfb1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 3 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -729,8 +729,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch Patch13003: efi-dont-map-boot-services-on-32bit.patch -Patch14000: bsg-fix-sysfs-link-remove-warning.patch - Patch20000: utrace.patch # Flattened devicetree support @@ -1436,8 +1434,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch ApplyPatch efi-dont-map-boot-services-on-32bit.patch -ApplyPatch bsg-fix-sysfs-link-remove-warning.patch - # utrace. ApplyPatch utrace.patch @@ -2332,6 +2328,9 @@ fi # ||----w | # || || %changelog +* Mon Feb 13 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc3.git4.1 +- Linux 3.3-rc3-git4 (upstream 3ec1e88b33a3bdd852ce8e014052acec7a9da8b5) + * Sat Feb 11 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc3.git3.1 - Linux 3.3-rc3-git3 (upstream 8df54d622a120058ee8bec38743c9b8f091c8e58) @@ -1,4 +1,4 @@ 364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz c216adcc2ba08bac9382d5833adfd18f patch-3.3-rc3.xz 02c210a8fd24acca8c1ac93f6f1d3913 compat-wireless-2012-02-05.tar.bz2 -26ac4a50e9bfa12afe9fc0750fd5e252 patch-3.3-rc3-git3.xz +e544f0ac8cd0b4970f7e530487643900 patch-3.3-rc3-git4.xz |