Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.de>2011-01-21 18:32:08 -0500
committerJeff Mahoney <jeffm@suse.de>2011-01-21 18:32:08 -0500
commit9122bf0f8ad32f8bcd3767346d191c3813b4d434 (patch)
tree709c1982f1f531345e25da1a466ba1615400baac
parentb308effffda915e6e725d13140eb960ef485ba39 (diff)
- Updated some Patch-mainline headers.
-rw-r--r--patches.arch/acpi_fix_global_lock_acquisition.patch3
-rw-r--r--patches.arch/acpi_init_global_lock.patch2
-rw-r--r--patches.arch/cpuidle_event_fix_export.patch2
-rw-r--r--patches.arch/cpuidle_fix_double_events.patch2
-rw-r--r--patches.arch/cpuidle_introduce_cpuidle_events.patch2
-rw-r--r--patches.arch/cpuidle_rename_c0_to_poll_state.patch2
-rw-r--r--patches.arch/perf_adjust_timechart_to_new_cpuidle_events.patch2
-rw-r--r--patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch3
-rw-r--r--patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices5
-rw-r--r--patches.fixes/taskstats-better-ifdef3
-rw-r--r--patches.rpmify/easycap-fixes2
-rw-r--r--patches.suse/sched-automated-per-session-task-groups3
12 files changed, 19 insertions, 12 deletions
diff --git a/patches.arch/acpi_fix_global_lock_acquisition.patch b/patches.arch/acpi_fix_global_lock_acquisition.patch
index a79378fe04..0d54446680 100644
--- a/patches.arch/acpi_fix_global_lock_acquisition.patch
+++ b/patches.arch/acpi_fix_global_lock_acquisition.patch
@@ -1,9 +1,8 @@
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: ACPI / ACPICA: Fix global lock acquisition
References: bnc#637377
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 9cd031441a4fd09273b7c2beb337d0b2683d104c
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Signed-off-by: Thomas Renninger <trenn@suse.de>
diff --git a/patches.arch/acpi_init_global_lock.patch b/patches.arch/acpi_init_global_lock.patch
index 5278eeb07a..362217e5a1 100644
--- a/patches.arch/acpi_init_global_lock.patch
+++ b/patches.arch/acpi_init_global_lock.patch
@@ -1,7 +1,7 @@
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: ACPI / ACPICA: Initialize the global lock spinlock as appropriate
References: bnc#637377
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 9a1fe2f27f71dd275caf2be5be2fa59bd2a3f8d4
diff --git a/patches.arch/cpuidle_event_fix_export.patch b/patches.arch/cpuidle_event_fix_export.patch
index 24e6905d47..eb648fc3a8 100644
--- a/patches.arch/cpuidle_event_fix_export.patch
+++ b/patches.arch/cpuidle_event_fix_export.patch
@@ -1,7 +1,7 @@
From: Thomas Renninger <trenn@suse.de>
Subject: perf: Do not export power_frequency, but power_start event
References: bnc#665153
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f
diff --git a/patches.arch/cpuidle_fix_double_events.patch b/patches.arch/cpuidle_fix_double_events.patch
index fe967551be..2b857344cb 100644
--- a/patches.arch/cpuidle_fix_double_events.patch
+++ b/patches.arch/cpuidle_fix_double_events.patch
@@ -1,7 +1,7 @@
From: Thomas Renninger <trenn@suse.de>
Subject: cpuidle/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer
References: bnc#665153
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: f77cfe4ea21760268c0277fa3e4b02dfd2a2c2f4
diff --git a/patches.arch/cpuidle_introduce_cpuidle_events.patch b/patches.arch/cpuidle_introduce_cpuidle_events.patch
index db38954f71..d5781f90b1 100644
--- a/patches.arch/cpuidle_introduce_cpuidle_events.patch
+++ b/patches.arch/cpuidle_introduce_cpuidle_events.patch
@@ -1,7 +1,7 @@
From: Thomas Renninger <trenn@suse.de>
Subject: perf: Clean up power events by introducing new, more generic ones
References: bnc#665153
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 25e41933b58777f2d020c3b0186b430ea004ec28
diff --git a/patches.arch/cpuidle_rename_c0_to_poll_state.patch b/patches.arch/cpuidle_rename_c0_to_poll_state.patch
index f8a95c4ff4..eadc22ecbc 100644
--- a/patches.arch/cpuidle_rename_c0_to_poll_state.patch
+++ b/patches.arch/cpuidle_rename_c0_to_poll_state.patch
@@ -1,7 +1,7 @@
From: Thomas Renninger <trenn@suse.de>
Subject: cpuidle: Rename X86 specific idle poll state[0] from C0 to POLL
References: bnc#665153
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 720f1c3010db6a411358b962a2007969117840bc
diff --git a/patches.arch/perf_adjust_timechart_to_new_cpuidle_events.patch b/patches.arch/perf_adjust_timechart_to_new_cpuidle_events.patch
index 4a238ae844..1dfb9e4d7b 100644
--- a/patches.arch/perf_adjust_timechart_to_new_cpuidle_events.patch
+++ b/patches.arch/perf_adjust_timechart_to_new_cpuidle_events.patch
@@ -1,7 +1,7 @@
From: Thomas Renninger <trenn@suse.de>
Subject: perf timechart: Adjust perf timechart to the new power events
References: bnc#665153
-Patch-Mainline: yes
+Patch-Mainline: 2.6.38-rc1
Git-commit: 20c457b8587bee4644d998331d9e13be82e05b4c
diff --git a/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch b/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
index 03d1d9197a..c10f6bc43f 100644
--- a/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
+++ b/patches.fixes/input-introduce-notimeout-blacklist-for-Dell-Vostro-.patch
@@ -1,7 +1,8 @@
From: Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] Input: introduce 'notimeout' blacklist for Dell Vostro V13
References: bnc#641105
-Patch-mainline: f8313ef1f448006207f12c107123522c8bc00f15
+Patch-mainline: 2.6.38-rc1
+Git-commit: f8313ef1f448006207f12c107123522c8bc00f15
i8042 controller present in Dell Vostro V13 errorneously signals spurious
timeouts.
diff --git a/patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices b/patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices
index 6a3f19f29e..36ad6e2a17 100644
--- a/patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices
+++ b/patches.fixes/iwlwifi-fix-tx-power-configuration-on-3945-and-4965-devices
@@ -16,6 +16,11 @@ that modify the staging RXON we loose the new information provided by mac80211.
Fix this by servicing the TX power change request after the RXON has been committed
to the device and active RXON thus contains accurate information.
+
+21 Jan 2011 jeffm:
+This patch may have been superced by 2295c66b68ae160dde2e6e2dc4f3061105153bfc
+but needs review.
+
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Acked-by: Jeff Mahoney <jeffm@suse.com>
---
diff --git a/patches.fixes/taskstats-better-ifdef b/patches.fixes/taskstats-better-ifdef
index 293fa08504..1e5938e10e 100644
--- a/patches.fixes/taskstats-better-ifdef
+++ b/patches.fixes/taskstats-better-ifdef
@@ -1,7 +1,8 @@
From: Jeff Mahoney <jeffm@suse.com>
Subject: taskstats: Use better ifdef for alignment
References: bko#24272
-Patch-mainline: Submitted 29 Dec 2010
+Patch-mainline: 2.6.38-rc1
+Git-commit: 9ab020cf07e457a8b425bf5af17e704f90f86d8b
Commit 4be2c95d added a null field to align the taskstats structure but
the discussion centered around ia64. The issue exists on other platforms
diff --git a/patches.rpmify/easycap-fixes b/patches.rpmify/easycap-fixes
index b144e32502..4a28bf0a0c 100644
--- a/patches.rpmify/easycap-fixes
+++ b/patches.rpmify/easycap-fixes
@@ -1,6 +1,6 @@
From: Jeff Mahoney <jeffm@suse.com>
Subject: easycap: include linux/smp_lock.h for BKL
-Patch-mainline: Submitted Nov 22, 2010
+Patch-mainline: 2.6.38-rc1, fixed differently
Commit 451a3c24b013 removed smp_lock.h from easycap.h because the BKL wasn't
used in that file. This patch re-adds it to easycap_main.c, where the BKL
diff --git a/patches.suse/sched-automated-per-session-task-groups b/patches.suse/sched-automated-per-session-task-groups
index 8f02c26a29..380aa299f0 100644
--- a/patches.suse/sched-automated-per-session-task-groups
+++ b/patches.suse/sched-automated-per-session-task-groups
@@ -1,7 +1,8 @@
From: Mike Galbraith <efault@gmx.de>
Date: Tue Nov 30 14:18:03 2010 +0100
Subject: sched: Add 'autogroup' scheduling feature: automated per session task groups
-Patch-mainline: tip commit 5091faa449ee0b7d73bc296a93bca9540fc51d0a
+Patch-mainline: 2.6.38-rc1
+Git-commit: 5091faa449ee0b7d73bc296a93bca9540fc51d0a
References: bnc#657613
sched: Add 'autogroup' scheduling feature: automated per session task groups