Home Home > GIT Browse > openSUSE-12.1

Tools

Branches

openSUSE

Upstream

SLE

summaryrefslogtreecommitdiff
authorMichal Marek <mmarek@suse.cz>2010-01-12 11:31:10 (GMT)
committer Michal Marek <mmarek@suse.cz>2010-01-12 11:31:10 (GMT)
commite55dc2b73dc1e1eabb3de0744f77fd728ec520a3 (patch) (unidiff)
tree971dea13c44004b5973fd877c4df344e4ba52c28
parent4e69294d3c11745e6f7f7b149fe2241a3959845f (diff)
parent24771bc63ce95006a67ba802996e518bc180d76b (diff)
Merge branch 'master' into SLE11-SP1rpm-2.6.32.3-0.3
Diffstat (more/less context) (ignore whitespace changes)
-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 74065c8..8ac6fbe 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,16 @@
1------------------------------------------------------------------- 1-------------------------------------------------------------------
2Tue Jan 12 09:21:52 CET 2010 - tonyj@suse.de
3
4- needs_update: remove LTT/trace patches (assigned to jbl), all had
5 already been taken care of by my fwd port to 2.6.32
6
7-------------------------------------------------------------------
8Tue Jan 12 08:09:38 CET 2010 - hare@suse.de
9
10- patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch:
11 Fixup compilation error.
12
13-------------------------------------------------------------------
2Tue Jan 12 00:52:29 CET 2010 - rjw@suse.de 14Tue Jan 12 00:52:29 CET 2010 - rjw@suse.de
3 15
4- patches.fixes/PCI-Always-set-prefetchable-base-limit-upper32-registers.patch: 16- patches.fixes/PCI-Always-set-prefetchable-base-limit-upper32-registers.patch:
diff --git a/needs_update b/needs_update
index 6b7bd2a..467c42b 100644
--- a/needs_update
+++ b/needs_update
@@ -1,18 +1,6 @@
1List of patches to forward-port or drop. 1List of patches to forward-port or drop.
2 2
3 +agruenpatches.suse/file-capabilities-add-file_caps-switch.diff 3 +agruenpatches.suse/file-capabilities-add-file_caps-switch.diff
4 +jblunckpatches.trace/ftrace-port-to-tracepoints.patch
5 +jblunckpatches.trace/lttng-instrumentation-scheduler.patch
6 +jblunckpatches.trace/lttng-instrumentation-timer.patch
7 +jblunckpatches.trace/markers-use-rcu-read-lock-sched.patch
8 +jblunckpatches.trace/rcu-read-sched.patch
9 +jblunckpatches.trace/tracepoints-documentation-fix-teardown.patch
10 +jblunckpatches.trace/tracepoints-documentation.patch
11 +jblunckpatches.trace/tracepoints-samples-fix-teardown.patch
12 +jblunckpatches.trace/tracepoints-samples.patch
13 +jblunckpatches.trace/tracepoints-tracepoint-synchronize-unregister.patch
14 +jblunckpatches.trace/tracepoints-use-table-size-macro.patch
15 +jblunckpatches.trace/tracepoints.patch
16 +jjollypatches.arch/ppc-axon-missing-msi-workaround-5.diff 4 +jjollypatches.arch/ppc-axon-missing-msi-workaround-5.diff
17 +jjollypatches.arch/s390-01-02-dcss-64-v2.patch 5 +jjollypatches.arch/s390-01-02-dcss-64-v2.patch
18 +jjollypatches.arch/s390-01-04-fcpperf-1.patch 6 +jjollypatches.arch/s390-01-04-fcpperf-1.patch
@@ -181,7 +169,6 @@ List of patches to forward-port or drop.
181 +rjwpatches.fixes/bug-502026_fix_apicid_panic.patch 169 +rjwpatches.fixes/bug-502026_fix_apicid_panic.patch
182 +rjwpatches.suse/bug-504646-acpi-enable-root-bridge-to-wakeup.patch 170 +rjwpatches.suse/bug-504646-acpi-enable-root-bridge-to-wakeup.patch
183 +rjwpatches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch 171 +rjwpatches.suse/mm-do-not-disable-memory-hotplug-when-hibernation-is-enabled.patch
184 +rwpatches.drivers/sgi-ioc4-request-submodules
185 +sfentpatches.arch/compat-sys-swapcontext 172 +sfentpatches.arch/compat-sys-swapcontext
186 +sfentpatches.arch/ppc-cell-gdb-watchpoints.patch 173 +sfentpatches.arch/ppc-cell-gdb-watchpoints.patch
187 +sfentpatches.arch/ppc-clock_gettime-nanoseconds.patch 174 +sfentpatches.arch/ppc-clock_gettime-nanoseconds.patch
@@ -216,15 +203,3 @@ List of patches to forward-port or drop.
216 +sfentpatches.arch/ppc-spufs-10-Explain-conditional-decrement-of-aff_.patch 203 +sfentpatches.arch/ppc-spufs-10-Explain-conditional-decrement-of-aff_.patch
217 +sfentpatches.arch/ppc-syscall-xer.so.1.patch 204 +sfentpatches.arch/ppc-syscall-xer.so.1.patch
218 +sfentpatches.arch/ppc-valid-hugepage-size-hugetlb_get_unmapped_area.patch 205 +sfentpatches.arch/ppc-valid-hugepage-size-hugetlb_get_unmapped_area.patch
219 +sfentpatches.fixes/uv-bios_call_memprotect.diff
220 +sfentpatches.fixes/uv-bios_call_partition.diff
221 +sfentpatches.fixes/uv-bios_call_reserve_page.diff
222 +sfentpatches.fixes/uv-bios_call_watchlist.diff
223 +sfentpatches.fixes/uv-bios_common.diff
224 +sfentpatches.fixes/uv-efi_bios.diff
225 +sfentpatches.fixes/uv-sn_region_size.diff
226 +sfentpatches.fixes/uv-sysfs.diff
227 +sfentpatches.fixes/uv-xp-change_memprotect.diff
228 +sfentpatches.fixes/uv-xpc-get_sn_info.diff
229 +sfentpatches.fixes/uv-xpc_create_gru_mq_uv.diff
230 +sfentpatches.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
@@ -1958,10 +1958,12 @@ diff -Narup a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
1958 1958
1959 #include "ql4_def.h" 1959 #include "ql4_def.h"
1960 #include "ql4_version.h" 1960 #include "ql4_version.h"
1961@@ -19,6 +21,17 @@ 1961@@ -18,7 +20,18 @@
1962 /*
1962 * Driver version 1963 * Driver version
1963 */ 1964 */
1964 static char qla4xxx_version_str[40]; 1965-static char qla4xxx_version_str[40];
1966+char qla4xxx_version_str[40];
1965+EXPORT_SYMBOL_GPL(qla4xxx_version_str); 1967+EXPORT_SYMBOL_GPL(qla4xxx_version_str);
1966+ 1968+
1967+/* 1969+/*