Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-01-12 12:31:10 +0100
committerMichal Marek <mmarek@suse.cz>2010-01-12 12:31:10 +0100
commite55dc2b73dc1e1eabb3de0744f77fd728ec520a3 (patch)
tree971dea13c44004b5973fd877c4df344e4ba52c28
parent4e69294d3c11745e6f7f7b149fe2241a3959845f (diff)
parent24771bc63ce95006a67ba802996e518bc180d76b (diff)
Merge branch 'master' into SLE11-SP1
-rw-r--r--kernel-source.changes12
-rw-r--r--needs_update25
-rw-r--r--patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch6
3 files changed, 16 insertions, 27 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 74065c8fa9..8ac6fbec45 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Jan 12 09:21:52 CET 2010 - tonyj@suse.de
+
+- needs_update: remove LTT/trace patches (assigned to jbl), all had
+ already been taken care of by my fwd port to 2.6.32
+
+-------------------------------------------------------------------
+Tue Jan 12 08:09:38 CET 2010 - hare@suse.de
+
+- patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch:
+ Fixup compilation error.
+
+-------------------------------------------------------------------
Tue Jan 12 00:52:29 CET 2010 - rjw@suse.de
- patches.fixes/PCI-Always-set-prefetchable-base-limit-upper32-registers.patch:
diff --git a/needs_update b/needs_update
index 6b7bd2a334..467c42b1aa 100644
--- a/needs_update
+++ b/needs_update
@@ -1,18 +1,6 @@
List of patches to forward-port or drop.
+agruen patches.suse/file-capabilities-add-file_caps-switch.diff
-+jblunck patches.trace/ftrace-port-to-tracepoints.patch
-+jblunck patches.trace/lttng-instrumentation-scheduler.patch
-+jblunck patches.trace/lttng-instrumentation-timer.patch
-+jblunck patches.trace/markers-use-rcu-read-lock-sched.patch
-+jblunck patches.trace/rcu-read-sched.patch
-+jblunck patches.trace/tracepoints-documentation-fix-teardown.patch
-+jblunck patches.trace/tracepoints-documentation.patch
-+jblunck patches.trace/tracepoints-samples-fix-teardown.patch
-+jblunck patches.trace/tracepoints-samples.patch
-+jblunck patches.trace/tracepoints-tracepoint-synchronize-unregister.patch
-+jblunck patches.trace/tracepoints-use-table-size-macro.patch
-+jblunck patches.trace/tracepoints.patch
+jjolly patches.arch/ppc-axon-missing-msi-workaround-5.diff
+jjolly patches.arch/s390-01-02-dcss-64-v2.patch
+jjolly patches.arch/s390-01-04-fcpperf-1.patch
@@ -181,7 +169,6 @@ List of patches to forward-port or drop.
+rjw patches.fixes/bug-502026_fix_apicid_panic.patch
+rjw patches.suse/bug-504646-acpi-enable-root-bridge-to-wakeup.patch
+rjw patches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
-+rw patches.drivers/sgi-ioc4-request-submodules
+sfent patches.arch/compat-sys-swapcontext
+sfent patches.arch/ppc-cell-gdb-watchpoints.patch
+sfent patches.arch/ppc-clock_gettime-nanoseconds.patch
@@ -216,15 +203,3 @@ List of patches to forward-port or drop.
+sfent patches.arch/ppc-spufs-10-Explain-conditional-decrement-of-aff_.patch
+sfent patches.arch/ppc-syscall-xer.so.1.patch
+sfent patches.arch/ppc-valid-hugepage-size-hugetlb_get_unmapped_area.patch
-+sfent patches.fixes/uv-bios_call_memprotect.diff
-+sfent patches.fixes/uv-bios_call_partition.diff
-+sfent patches.fixes/uv-bios_call_reserve_page.diff
-+sfent patches.fixes/uv-bios_call_watchlist.diff
-+sfent patches.fixes/uv-bios_common.diff
-+sfent patches.fixes/uv-efi_bios.diff
-+sfent patches.fixes/uv-sn_region_size.diff
-+sfent patches.fixes/uv-sysfs.diff
-+sfent patches.fixes/uv-xp-change_memprotect.diff
-+sfent patches.fixes/uv-xpc-get_sn_info.diff
-+sfent patches.fixes/uv-xpc_create_gru_mq_uv.diff
-+sfent patches.fixes/uv-xpc_get_part_rsvd_page.diff
diff --git a/patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch b/patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
index d6e55f27eb..e6057ad01e 100644
--- a/patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
+++ b/patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch
@@ -1958,10 +1958,12 @@ diff -Narup a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
#include "ql4_def.h"
#include "ql4_version.h"
-@@ -19,6 +21,17 @@
+@@ -18,7 +20,18 @@
+ /*
* Driver version
*/
- static char qla4xxx_version_str[40];
+-static char qla4xxx_version_str[40];
++char qla4xxx_version_str[40];
+EXPORT_SYMBOL_GPL(qla4xxx_version_str);
+
+/*