3.7.1-5.fc18.gnu

4 files changed, 165 insertions, 2 deletions

diff --git a/freed-ora/current/f18/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch b/freed-ora/current/f18/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
new file mode 100644
index 000000000..f6e997c41
--- /dev/null
+++ b/freed-ora/current/f18/ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
@@ -0,0 +1,46 @@
+From b7e383046c2c7c13ad928cd7407eafff758ddd4b Mon Sep 17 00:00:00 2001
+From: Zhang Rui <rui.zhang@intel.com>
+Date: Tue, 4 Dec 2012 23:23:16 +0100
+Subject: [PATCH] ACPI : do not use Lid and Sleep button for S5 wakeup
+
+When system enters power off, the _PSW of Lid device is enabled.
+But this may cause the system to reboot instead of power off.
+
+A proper way to fix this is to always disable lid wakeup capability for S5.
+
+References: https://bugzilla.kernel.org/show_bug.cgi?id=35262
+Signed-off-by: Zhang Rui <rui.zhang@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+---
+ drivers/acpi/scan.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index d0b38ab..bd523bf 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -917,8 +917,8 @@ acpi_bus_extract_wakeup_device_power_package(acpi_handle handle,
+ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ {
+ 	struct acpi_device_id button_device_ids[] = {
+-		{"PNP0C0D", 0},
+ 		{"PNP0C0C", 0},
++		{"PNP0C0D", 0},
+ 		{"PNP0C0E", 0},
+ 		{"", 0},
+ 	};
+@@ -930,6 +930,11 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
+ 	/* Power button, Lid switch always enable wakeup */
+ 	if (!acpi_match_device_ids(device, button_device_ids)) {
+ 		device->wakeup.flags.run_wake = 1;
++		if (!acpi_match_device_ids(device, &button_device_ids[1])) {
++			/* Do not use Lid/sleep button for S5 wakeup */
++			if (device->wakeup.sleep_state == ACPI_STATE_S5)
++				device->wakeup.sleep_state = ACPI_STATE_S4;
++		}
+ 		device_set_wakeup_capable(&device->dev, true);
+ 		return;
+ 	}
+-- 
+1.8.0.1
+
diff --git a/freed-ora/current/f18/aoe-remove-vestigial-request-queue-allocation.patch b/freed-ora/current/f18/aoe-remove-vestigial-request-queue-allocation.patch
new file mode 100644
index 000000000..fa4ad1ac8
--- /dev/null
+++ b/freed-ora/current/f18/aoe-remove-vestigial-request-queue-allocation.patch
@@ -0,0 +1,69 @@
+From 0a41409c518083133e79015092585d68915865be Mon Sep 17 00:00:00 2001
+From: Ed Cashin <ecashin@coraid.com>
+Date: Mon, 17 Dec 2012 16:03:58 -0800
+Subject: [PATCH] aoe: remove vestigial request queue allocation
+
+Before the aoe driver was an I/O request handler, it was a
+make_request-style block driver.  Even so, there was a problem where
+sysfs expected a request queue to exist, so one was provided in commit
+7135a71b19be ("aoe: allocate unused request_queue for sysfs").
+
+During the transition to the request-handler style, a patch was merged
+that was based on a driver without the noop queue, and the noop queue
+remained in place after the patch was merged, even though a new
+functional queue was introduced by the patch, allocated through
+blk_init_queue.
+
+The user impact is a memory leak proportional to the number of AoE
+targets discovered.  This patch removes the memory leak and cleans up
+vestiges of the old do-nothing queue from the aoeblk_gdalloc function.
+
+Signed-off-by: Ed Cashin <ecashin@coraid.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ drivers/block/aoe/aoeblk.c | 17 ++++-------------
+ 1 file changed, 4 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
+index 7ba0fcf..57ac72c 100644
+--- a/drivers/block/aoe/aoeblk.c
++++ b/drivers/block/aoe/aoeblk.c
+@@ -278,18 +278,12 @@ aoeblk_gdalloc(void *vp)
+ 	if (q == NULL) {
+ 		pr_err("aoe: cannot allocate block queue for %ld.%d\n",
+ 			d->aoemajor, d->aoeminor);
+-		mempool_destroy(mp);
+-		goto err_disk;
++		goto err_mempool;
+ 	}
+ 
+-	d->blkq = blk_alloc_queue(GFP_KERNEL);
+-	if (!d->blkq)
+-		goto err_mempool;
+-	d->blkq->backing_dev_info.name = "aoe";
+-	if (bdi_init(&d->blkq->backing_dev_info))
+-		goto err_blkq;
+ 	spin_lock_irqsave(&d->lock, flags);
+-	blk_queue_max_hw_sectors(d->blkq, BLK_DEF_MAX_SECTORS);
++	blk_queue_max_hw_sectors(q, BLK_DEF_MAX_SECTORS);
++	q->backing_dev_info.name = "aoe";
+ 	q->backing_dev_info.ra_pages = READ_AHEAD / PAGE_CACHE_SIZE;
+ 	d->bufpool = mp;
+ 	d->blkq = gd->queue = q;
+@@ -314,11 +308,8 @@ aoeblk_gdalloc(void *vp)
+ 	aoedisk_add_sysfs(d);
+ 	return;
+ 
+-err_blkq:
+-	blk_cleanup_queue(d->blkq);
+-	d->blkq = NULL;
+ err_mempool:
+-	mempool_destroy(d->bufpool);
++	mempool_destroy(mp);
+ err_disk:
+ 	put_disk(gd);
+ err:
+-- 
+1.8.0.1
+
diff --git a/freed-ora/current/f18/efivarfs-3.7.patch b/freed-ora/current/f18/efivarfs-3.7.patch
index 300910716..662406405 100644
--- a/freed-ora/current/f18/efivarfs-3.7.patch
+++ b/freed-ora/current/f18/efivarfs-3.7.patch
@@ -1628,3 +1628,27 @@ index 58cec62..9ac9340 100644
 -- 
 1.7.12.1
 
+efivarfs_unlink() should drop the file's link count, not the directory's.
+
+Tested-by: Lee, Chun-Yi <jlee@suse.com>
+Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
+---
+ drivers/firmware/efivars.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
+index d6b8d2f..60f5324 100644
+--- a/drivers/firmware/efivars.c
++++ b/drivers/firmware/efivars.c
+@@ -995,7 +995,7 @@ static int efivarfs_unlink(struct inode *dir, struct dentry *dentry)
+ 		list_del(&var->list);
+ 		spin_unlock(&efivars->lock);
+ 		efivar_unregister(var);
+-		drop_nlink(dir);
++		drop_nlink(dentry->d_inode);
+ 		dput(dentry);
+ 		return 0;
+ 	}
+-- 
+1.7.7.6
+
diff --git a/freed-ora/current/f18/kernel.spec b/freed-ora/current/f18/kernel.spec
index 3e0678fc8..081c4f1b8 100644
--- a/freed-ora/current/f18/kernel.spec
+++ b/freed-ora/current/f18/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 5
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -848,6 +848,12 @@ Patch21234: mac80211-fix-ibss-scanning.patch
 #rhbz 873107
 Patch21237: 0001-ACPI-sony-laptop-do-proper-memcpy-for-ACPI_TYPE_INTE.patch
 
+#rhbz 853064
+Patch21239: aoe-remove-vestigial-request-queue-allocation.patch
+
+#rhbz 890547
+Patch21240: ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1641,6 +1647,12 @@ ApplyPatch mac80211-fix-ibss-scanning.patch
 #rhbz 873107
 ApplyPatch 0001-ACPI-sony-laptop-do-proper-memcpy-for-ACPI_TYPE_INTE.patch
 
+#rhbz 853064
+ApplyPatch aoe-remove-vestigial-request-queue-allocation.patch
+
+#rhbz 890547
+ApplyPatch ACPI-do-not-use-Lid-and-Sleep-button-for-S5-wakeup.patch
+
 
 # END OF PATCH APPLICATIONS
 
@@ -1877,7 +1889,7 @@ BuildKernel() {
 
     # Make sure the Makefile and version.h have a matching timestamp so that
     # external modules can be built
-    touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h
+    touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h
 
     # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
     cp $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/config/auto.conf
@@ -2525,6 +2537,18 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Jan 08 2013 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix shutdown on some machines (rhbz 890547)
+
+* Mon Jan 07 2013 Josh Boyer <jwboyer@redhat.com>
+- Patch to fix efivarfs underflow from Lingzhu Xiang (rhbz 888163)
+
+* Sun Jan 06 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix version.h include due to UAPI change in 3.7 (rhbz 892373)
+
+* Fri Jan 04 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix oops on aoe module removal (rhbz 853064)
+
 * Fri Jan  4 2013 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 3.7.1