Linux 2.6.34.6-rc1

Drop merged patches:
  matroxfb-fix-font-corruption.patch

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 45
+%global baserelease 46
 %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}
@@ -757,7 +757,6 @@ Patch12270: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 Patch12400: input-synaptics-relax-capability-id-checks-on-new-hardware.patch
 
 Patch12410: cifs-fix-dns-resolver.patch
-Patch12420: matroxfb-fix-font-corruption.patch
 Patch12430: cred-dont-resurrect-dead-credentials.patch
 
 Patch12440: direct-io-move-aio_complete-into-end_io.patch
@@ -1408,9 +1407,6 @@ ApplyPatch input-synaptics-relax-capability-id-checks-on-new-hardware.patch
 # Remove __init and __exit attributes from resolver code
 ApplyPatch cifs-fix-dns-resolver.patch
 
-# RHBZ #617687
-ApplyPatch matroxfb-fix-font-corruption.patch
-
 # RHBZ #591015
 ApplyPatch cred-dont-resurrect-dead-credentials.patch
 
@@ -2040,7 +2036,12 @@ fi
 
 
 %changelog
-* Mon Aug 24 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.34.5-45
+* Wed Aug 25 2010 Chuck Ebbert <cebbert@redhat.com>  2.6.34.6-46.rc1
+- Linux 2.6.34.6-rc1
+- Drop merged patches:
+    matroxfb-fix-font-corruption.patch
+
+* Tue Aug 24 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.34.5-45
 - Revert commit 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b from 2.6.34.2;
   it causes dropped keystrokes (#625758)
 

linux-2.6-execshield.patch

@@ -736,15 +736,16 @@ index 75557c6..8173284 100644
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -388,6 +401,8 @@ static inline void
- __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
- 		struct vm_area_struct *prev, struct rb_node *rb_parent)
+@@ -388,6 +401,9 @@ static inline void
  {
+ 	struct vm_area_struct *next;
+ 
 +	if (vma->vm_flags & VM_EXEC)
 +		arch_add_exec_range(mm, vma->vm_end);
++
+ 	vma->vm_prev = prev;
  	if (prev) {
- 		vma->vm_next = prev->vm_next;
- 		prev->vm_next = vma;
+ 		next = prev->vm_next;
 @@ -489,6 +504,8 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
  	rb_erase(&vma->vm_rb, &mm->mm_rb);
  	if (mm->mmap_cache == vma)

matroxfb-fix-font-corruption.patch

@@ -1,23 +0,0 @@
-Fix incorrect use of memcpy_toio() in matroxfb that broke in 2.6.34.
-
-Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
-
---- linux-2.6.35-rc2/drivers/video/matrox/matroxfb_base.h	2010-06-06 05:43:24.000000000 +0200
-+++ linux-2.6.35-rc3/drivers/video/matrox/matroxfb_base.h	2010-08-03 18:13:46.000000000 +0200
-@@ -151,13 +151,13 @@ static inline void mga_writel(vaddr_t va
- static inline void mga_memcpy_toio(vaddr_t va, const void* src, int len) {
- #if defined(__alpha__) || defined(__i386__) || defined(__x86_64__)
- 	/*
--	 * memcpy_toio works for us if:
-+	 * iowrite32_rep works for us if:
- 	 *  (1) Copies data as 32bit quantities, not byte after byte,
- 	 *  (2) Performs LE ordered stores, and
- 	 *  (3) It copes with unaligned source (destination is guaranteed to be page
- 	 *      aligned and length is guaranteed to be multiple of 4).
- 	 */
--	memcpy_toio(va.vaddr, src, len);
-+	iowrite32_rep(va.vaddr, src, len >> 2);
- #else
-         u_int32_t __iomem* addr = va.vaddr;
- 
-

sources

@@ -1,2 +1,3 @@
 10eebcb0178fb4540e2165bfd7efc7ad  linux-2.6.34.tar.bz2
 8a4d2f75b2e09edb20de304c4f2240f6  patch-2.6.34.5.bz2
+4f04a2fb8add57a2848d168f292e8792  patch-2.6.34.6-rc1.bz2