From 700f9d642a138d1dbcf249a6846f794e1e5f2b7f Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Aug 07 2012 23:01:39 +0000 Subject: Update to 3.5.1-rc1 --- diff --git a/.gitignore b/.gitignore index a23ef2d..729bf7c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog *.rpm *.orig kernel-[23].*/ +/patch-3.5.1-rc1.gz diff --git a/ACPI-AC-check-the-return-value-of-power_supply_register.patch b/ACPI-AC-check-the-return-value-of-power_supply_register.patch deleted file mode 100644 index c9eb1a1..0000000 --- a/ACPI-AC-check-the-return-value-of-power_supply_register.patch +++ /dev/null @@ -1,37 +0,0 @@ -In the ac.c, lack check return value of power_supply_register(). -This may casue that acpi driver's add() ops was called successful -while the device may be failed to be initalized. For example, some -ugly bios may describe two ACADs in the same dsdt. They use the same -name which will cause the second ACAD device can no be registered. -And then power_supply_register() failed. But acpi driver's add() ops -is called sucessfully. The acpi device also will receive acpi notification -and cause oops. - https://bugzilla.redhat.com/show_bug.cgi?id=772730 - -Signed-off-by: Lan Tianyu ---- - drivers/acpi/ac.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c -index 6512b20..d1fcbc0 100644 ---- a/drivers/acpi/ac.c -+++ b/drivers/acpi/ac.c -@@ -292,7 +292,9 @@ static int acpi_ac_add(struct acpi_device *device) - ac->charger.properties = ac_props; - ac->charger.num_properties = ARRAY_SIZE(ac_props); - ac->charger.get_property = get_ac_property; -- power_supply_register(&ac->device->dev, &ac->charger); -+ result = power_supply_register(&ac->device->dev, &ac->charger); -+ if (result) -+ goto end; - - printk(KERN_INFO PREFIX "%s [%s] (%s)\n", - acpi_device_name(device), acpi_device_bid(device), --- -1.7.6.rc2.8.g28eb - --- -To unsubscribe from this list: send the line "unsubscribe linux-acpi" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html \ No newline at end of file diff --git a/kernel.spec b/kernel.spec index fed6ff0..304d0f6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -755,9 +755,6 @@ Patch22014: efifb-skip-DMI-checks-if-bootloader-knows.patch Patch22055: crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch Patch22056: crypto-aesni-intel-fix-wrong-kfree-pointer.patch -#rhbz 772730 -Patch22058: ACPI-AC-check-the-return-value-of-power_supply_register.patch - #rhbz 836742 Patch22059: uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch @@ -773,7 +770,7 @@ Patch22071: sfc-Fix-maximum-number-of-TSO-segments-and-minimum-TX-queue-size.pat Patch22072: tcp-Apply-device-TSO-segment-limit-earlier.patch # 3.5 stable patches -Patch23000: 3.5-git-stable.patch +Patch23000: patch-3.5.1-rc1.gz # END OF PATCH DEFINITIONS @@ -1470,9 +1467,6 @@ ApplyPatch efifb-skip-DMI-checks-if-bootloader-knows.patch ApplyPatch crypto-testmgr-allow-aesni-intel-and-ghash_clmulni-intel.patch ApplyPatch crypto-aesni-intel-fix-wrong-kfree-pointer.patch -#rhbz 772730 -ApplyPatch ACPI-AC-check-the-return-value-of-power_supply_register.patch - #rhbz 836742 ApplyPatch uvcvideo-Reset-bytesused-field-when-recycling-erroneous-buffer.patch @@ -1482,7 +1476,7 @@ ApplyPatch CPU-hotplug-cpusets-suspend-Dont-modify-cpusets-during.patch #rhbz 820039 843554 ApplyPatch rds-set-correct-msg_namelen.patch -ApplyPatch 3.5-git-stable.patch +ApplyPatch patch-3.5.1-rc1.gz #rhbz 845558 844714 ApplyPatch net-Allow-driver-to-limit-number-of-GSO-segments-per-skb.patch @@ -2350,6 +2344,9 @@ fi # '-' | | # '-' %changelog +* Tue Aug 07 2012 Dave Jones 3.5.0-4 +- Update to 3.5.1-rc1 + * Tue Aug 07 2012 Dave Jones - Update the uprobes backport. (Anton Arapov) diff --git a/sources b/sources index d239339..793d34b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 24153eaaa81dedc9481ada8cd9c3b83d linux-3.5.tar.xz +d1c41bbc56284cc9148f37e7e991bf19 patch-3.5.1-rc1.gz