Home| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2010-01-12 11:31:10 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-01-12 11:31:10 (GMT) |
| commit | e55dc2b73dc1e1eabb3de0744f77fd728ec520a3 (patch) (side-by-side diff) | |
| tree | 971dea13c44004b5973fd877c4df344e4ba52c28 | |
| parent | 4e69294d3c11745e6f7f7b149fe2241a3959845f (diff) | |
| parent | 24771bc63ce95006a67ba802996e518bc180d76b (diff) | |
Merge branch 'master' into SLE11-SP1rpm-2.6.32.3-0.3
| -rw-r--r-- | kernel-source.changes | 12 | ||||
| -rw-r--r-- | needs_update | 25 | ||||
| -rw-r--r-- | patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch | 6 |
3 files changed, 16 insertions, 27 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 74065c8..8ac6fbe 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,2 +1,14 @@ ------------------------------------------------------------------- +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 diff --git a/needs_update b/needs_update index 6b7bd2a..467c42b 100644 --- a/needs_update +++ b/needs_update @@ -3,14 +3,2 @@ 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 @@ -183,3 +171,2 @@ List of patches to forward-port or drop. +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 @@ -218,13 +205 @@ List of patches to forward-port or drop. +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 d6e55f2..e6057ad 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 @@ -1960,6 +1960,8 @@ diff -Narup a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c #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); |