From eda054e8bdc8ecca4db5a904a1ca84b90c290c62 Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Sep 25 2010 12:18:19 +0000 Subject: Linux 2.6.35.6-rc1 Comment out merged patches: aio-check-for-multiplication-overflow-in-do_io_submit.patch linux-2.6.35.4-virtio_console-fix-poll.patch fix-unprotected-access-to-task-credentials-in-whatid.patch dell-wmi-add-support-for-eject-key-studio-1555.patch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch sched-00-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch Revert: "drm/nv50: initialize ramht_refs list for faked 0 channel" (our DRM update removes ramht_refs entirely.) --- diff --git a/kernel.spec b/kernel.spec index a800f2b..e8e6cc6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,7 +48,7 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 32 +%global baserelease 33 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -60,9 +60,9 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Is it a -stable RC? -%define stable_rc 0 +%define stable_rc 1 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev .%{stable_update} @@ -1206,7 +1206,7 @@ ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch # bugfixes to drivers and filesystems # -ApplyPatch aio-check-for-multiplication-overflow-in-do_io_submit.patch +#ApplyPatch aio-check-for-multiplication-overflow-in-do_io_submit.patch # ext4 @@ -1298,7 +1298,7 @@ ApplyPatch linux-2.6-crash-driver.patch # Assorted Virt Fixes ApplyPatch fix_xen_guest_on_old_EC2.patch -ApplyPatch linux-2.6.35.4-virtio_console-fix-poll.patch +#ApplyPatch linux-2.6.35.4-virtio_console-fix-poll.patch #ApplyPatch drm-revert-drm-fbdev-rework-output-polling-to-be-back-in-core.patch #ApplyPatch revert-drm-kms-toggle-poll-around-switcheroo.patch @@ -1365,10 +1365,10 @@ ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch # bz 622149 ApplyPatch fix-rcu_deref_check-warning.patch ApplyPatch linux-2.6-cgroups-rcu.patch -ApplyPatch fix-unprotected-access-to-task-credentials-in-whatid.patch +#ApplyPatch fix-unprotected-access-to-task-credentials-in-whatid.patch # bz 513530 -ApplyPatch dell-wmi-add-support-for-eject-key-studio-1555.patch +#ApplyPatch dell-wmi-add-support-for-eject-key-studio-1555.patch # bz #575873 ApplyPatch flexcop-fix-xlate_proc_name-warning.patch @@ -1379,13 +1379,13 @@ ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch # CVE-2010-2954 -ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch +#ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch # CVE-2010-2960 -ApplyPatch keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch -ApplyPatch keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch +#ApplyPatch keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch +#ApplyPatch keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch # Scheduler fixes (#635813 and #633037) -ApplyPatch sched-00-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch +#ApplyPatch sched-00-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch ApplyPatch sched-05-avoid-side-effect-of-tickless-idle-on-update_cpu_load.patch ApplyPatch sched-10-change-nohz-idle-load-balancing-logic-to-push-model.patch ApplyPatch sched-15-update-rq-clock-for-nohz-balanced-cpus.patch @@ -1985,6 +1985,20 @@ fi # and build. %changelog +* Sat Sep 25 2010 Chuck Ebbert 2.6.35.6-33.rc1 +- Linux 2.6.35.6-rc1 +- Comment out merged patches: + aio-check-for-multiplication-overflow-in-do_io_submit.patch + linux-2.6.35.4-virtio_console-fix-poll.patch + fix-unprotected-access-to-task-credentials-in-whatid.patch + dell-wmi-add-support-for-eject-key-studio-1555.patch + irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch + keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch + keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch + sched-00-fix-user-time-incorrectly-accounted-as-system-time-on-32-bit.patch +- Revert: "drm/nv50: initialize ramht_refs list for faked 0 channel" + (our DRM update removes ramht_refs entirely.) + * Thu Sep 23 2010 Kyle McMartin 2.6.35.5-32 - Serialize mandocs/htmldocs build, since otherwise it will constantly fail on the koji builders. diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch index 607602c..fba7d24 100644 --- a/linux-2.6-upstream-reverts.patch +++ b/linux-2.6-upstream-reverts.patch @@ -1 +1,33 @@ -nil +From 615661f3948a066fd22a36fe8ea0c528b75ee373 Mon Sep 17 00:00:00 2001 +From: Marcin Slusarz +Date: Sun, 22 Aug 2010 20:54:08 +0200 +Subject: drm/nv50: initialize ramht_refs list for faked 0 channel + +From: Marcin Slusarz + +commit 615661f3948a066fd22a36fe8ea0c528b75ee373 upstream. + +We need it for PFIFO_INTR_CACHE_ERROR interrupt handling, +because nouveau_fifo_swmthd looks for matching gpuobj in +ramht_refs list. +It fixes kernel panic in nouveau_gpuobj_ref_find. + +Signed-off-by: Marcin Slusarz +Signed-off-by: Ben Skeggs +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/nouveau/nv50_instmem.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/gpu/drm/nouveau/nv50_instmem.c ++++ b/drivers/gpu/drm/nouveau/nv50_instmem.c +@@ -141,6 +141,8 @@ nv50_instmem_init(struct drm_device *dev + chan->file_priv = (struct drm_file *)-2; + dev_priv->fifos[0] = dev_priv->fifos[127] = chan; + ++ INIT_LIST_HEAD(&chan->ramht_refs); ++ + /* Channel's PRAMIN object + heap */ + ret = nouveau_gpuobj_new_fake(dev, 0, c_offset, c_size, 0, + NULL, &chan->ramin); diff --git a/sources b/sources index f6d872e..9f2ca48 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 5bf1900e4ea72b8c65f4f7aae0a28d14 patch-2.6.35.5.bz2 +bee26a90f42ded49a026f67f83443206 patch-2.6.35.6-rc1.bz2