Wed May 2 17:54:42 UTC 2007

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6979

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch 
	linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch 
	linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch 
	linux-2.6-20.8f-x86_64_always_flush_all_pages.patch 
	linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch 
	linux-2.6-20.8n-net_vlan_allow_with_bridge.patch 
	linux-2.6-20.8n-ppp_fix_skb_under_panic.patch 
	linux-2.6-page_is_ram.patch patch-2.6.20.10-11.bz2.sign 
	patch-2.6.20.9-10.bz2.sign 
Removed Files:
	linux-2.6.20.10-unoffical.patch 
Log Message:
* Tue May 05 2007 Chuck Ebbert <cebbert at redhat.com>		1.2317
- 2.6.20.10 (official)
- 2.6.20.11
- Additional fixes (1830 - 1837)


linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch:
 i386/kernel/nmi.c   |    9 +++++----
 x86_64/kernel/nmi.c |   10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

--- NEW FILE linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1714f9bfc92d6ee67e84127332a1fae27772acfe
Commit:     1714f9bfc92d6ee67e84127332a1fae27772acfe
Parent:     08269c6d38e003adb12f55c6d795daa89bdc1bae
Author:     Andi Kleen <ak at suse.de>
AuthorDate: Mon Apr 16 10:30:27 2007 +0200
Committer:  Andi Kleen <andi at basil.nowhere.org>
CommitDate: Mon Apr 16 10:30:27 2007 +0200

    [PATCH] x86: Fix potential overflow in perfctr reservation
    
    While reviewing this code again I found a potential overflow of the bitmap.
    The p4 oprofile can theoretically set bits beyond the reservation bitmap for
    specific configurations. Avoid that by sizing the bitmaps properly.
    
    Signed-off-by: Andi Kleen <ak at suse.de>
---
 arch/i386/kernel/nmi.c   |    9 +++++----
 arch/x86_64/kernel/nmi.c |   10 ++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index a98ba88..9f1e8c1 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -41,16 +41,17 @@ int nmi_watchdog_enabled;
  *   different subsystems this reservation system just tries to coordinate
  *   things a little
  */
-static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner);
-static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[3]);
-
-static cpumask_t backtrace_mask = CPU_MASK_NONE;
 
 /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's
  * offset from MSR_P4_BSU_ESCR0.  It will be the max for all platforms (for now)
  */
 #define NMI_MAX_COUNTER_BITS 66
+#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS)
 
+static DEFINE_PER_CPU(unsigned long, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]);
+static DEFINE_PER_CPU(unsigned long, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]);
+
+static cpumask_t backtrace_mask = CPU_MASK_NONE;
 /* nmi_active:
  * >0: the lapic NMI watchdog is active, but can be disabled
  * <0: the lapic NMI watchdog has not been set up, and cannot
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index a90996c..dfab9f1 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -39,15 +39,17 @@ int panic_on_unrecovered_nmi;
  *   different subsystems this reservation system just tries to coordinate
  *   things a little
  */
-static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner);
-static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[2]);
-
-static cpumask_t backtrace_mask = CPU_MASK_NONE;
 
 /* this number is calculated from Intel's MSR_P4_CRU_ESCR5 register and it's
  * offset from MSR_P4_BSU_ESCR0.  It will be the max for all platforms (for now)
  */
 #define NMI_MAX_COUNTER_BITS 66
+#define NMI_MAX_COUNTER_LONGS BITS_TO_LONGS(NMI_MAX_COUNTER_BITS)
+
+static DEFINE_PER_CPU(unsigned, perfctr_nmi_owner[NMI_MAX_COUNTER_LONGS]);
+static DEFINE_PER_CPU(unsigned, evntsel_nmi_owner[NMI_MAX_COUNTER_LONGS]);
+
+static cpumask_t backtrace_mask = CPU_MASK_NONE;
 
 /* nmi_active:
  * >0: the lapic NMI watchdog is active, but can be disabled

linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch:
 capiutil.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch ---
Minimal fix for CAPI buffer overflow.

Original patch by Karsten Keil <kkeil at suse.de>

Modified by Chuck Ebbert <cebbert at redhat.com>
to unconditionally disable CAPI debug messages.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

--- linux-2.6.16.21-0.23.org/drivers/isdn/capi/capiutil.c
+++ linux-2.6.16.21-0.23/drivers/isdn/capi/capiutil.c
@@ -647,7 +647,7 @@ char *capi_cmd2str(u8 cmd, u8 subcmd)
 	return mnames[command_2_index(cmd, subcmd)];
 }
 
-
+#if 0
 /*-------------------------------------------------------*/
 /*-------------------------------------------------------*/
 
@@ -849,6 +849,18 @@ char *capi_cmsg2str(_cmsg * cmsg)
 	protocol_message_2_pars(cmsg, 1);
 	return buf;
 }
+#else
+
+char *capi_message2str(u8 * msg)
+{
+	return "capi_message2str not implemented";
+}       
+
+char *capi_cmsg2str(_cmsg * cmsg)
+{
+	return "capi_cmsg2str not implemented";
+}       
+#endif
 
 EXPORT_SYMBOL(capi_cmsg2message);
 EXPORT_SYMBOL(capi_message2cmsg);

linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch:
 oom_kill.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=650a7c974f1b91de9732c0f720e792837f8abfd6
Commit:     650a7c974f1b91de9732c0f720e792837f8abfd6
Parent:     c445a31cd7f469d77acc37538ab43a99530968b8
Author:     David Rientjes <rientjes at google.com>
AuthorDate: Mon Apr 23 21:36:13 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Tue Apr 24 08:11:49 2007 -0700

    oom: kill all threads that share mm with killed task
    
    oom_kill_task() calls __oom_kill_task() to OOM kill a selected task.
    When finding other threads that share an mm with that task, we need to
    kill those individual threads and not the same one.
    
    (Bug introduced by f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584)
    
    Acked-by: William Irwin <bill.irwin at oracle.com>
    Acked-by: Christoph Lameter <clameter at engr.sgi.com>
    Cc: Nick Piggin <npiggin at suse.de>
    Cc: Andrew Morton <akpm at osdl.org>
    Cc: Andi Kleen <ak at suse.de>
    Signed-off-by: David Rientjes <rientjes at google.com>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 mm/oom_kill.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 2f39169..af981b6 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -333,7 +333,7 @@ static int oom_kill_task(struct task_struct *p)
 	 */
 	do_each_thread(g, q) {
 		if (q->mm == mm && q->tgid != p->tgid)
-			force_sig(SIGKILL, p);
+			force_sig(SIGKILL, q);
 	} while_each_thread(g, q);
 
 	return 0;

linux-2.6-20.8f-x86_64_always_flush_all_pages.patch:
 pageattr.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-20.8f-x86_64_always_flush_all_pages.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=90767bd13febfdf8a5f5077e2bb975f79d6b919c
Commit:     90767bd13febfdf8a5f5077e2bb975f79d6b919c
Parent:     9ce883becb83190061369940de9c415595836c9b
Author:     Andi Kleen <ak at suse.de>
AuthorDate: Tue Apr 24 13:05:37 2007 +0200
Committer:  Andi Kleen <andi at basil.nowhere.org>
CommitDate: Tue Apr 24 13:05:37 2007 +0200

    [PATCH] x86-64: Always flush all pages in change_page_attr
    
    change_page_attr on x86-64 only flushed the TLB for pages that got
    reverted. That's not correct: it has to be flushed in all cases.
    
    This bug was added in some earlier changes.
    
    Just flush all pages for now.
    
    This could be done more efficiently, but for this late in the release
    this seem to be the best fix.
    
    Pointed out by Jan Beulich
    
    Signed-off-by: Andi Kleen <ak at suse.de>
---
 arch/x86_64/mm/pageattr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86_64/mm/pageattr.c
index 65c5eaa..081409a 100644
--- a/arch/x86_64/mm/pageattr.c
+++ b/arch/x86_64/mm/pageattr.c
@@ -81,8 +81,8 @@ static void flush_kernel_map(void *arg)
 		void *adr = page_address(pg);
 		if (cpu_has_clflush)
 			cache_flush_page(adr);
-		__flush_tlb_one(adr);
 	}
+	__flush_tlb_all();
 }
 
 static inline void flush_map(struct list_head *l)

linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch:
 xfrm_user.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=661697f728d75302e1f661a58db2fcba71d5cbc9
Commit:     661697f728d75302e1f661a58db2fcba71d5cbc9
Parent:     279e172a580d415b83eba4f9fbbc77b08e546553
Author:     Joy Latten <latten at austin.ibm.com>
AuthorDate: Fri Apr 13 16:14:35 2007 -0700
Committer:  David S. Miller <davem at davemloft.net>
CommitDate: Fri Apr 13 16:14:35 2007 -0700

    [IPSEC] XFRM_USER: kernel panic when large security contexts in ACQUIRE
    
    When sending a security context of 50+ characters in an ACQUIRE
    message, following kernel panic occurred.
    
    kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781!
    cpu 0x3: Vector: 700 (Program Check) at [c0000000421bb2e0]
        pc: c00000000033b074: .xfrm_send_acquire+0x240/0x2c8
        lr: c00000000033b014: .xfrm_send_acquire+0x1e0/0x2c8
        sp: c0000000421bb560
       msr: 8000000000029032
      current = 0xc00000000fce8f00
      paca    = 0xc000000000464b00
        pid   = 2303, comm = ping
    kernel BUG in xfrm_send_acquire at net/xfrm/xfrm_user.c:1781!
    enter ? for help
    3:mon> t
    [c0000000421bb650] c00000000033538c .km_query+0x6c/0xec
    [c0000000421bb6f0] c000000000337374 .xfrm_state_find+0x7f4/0xb88
    [c0000000421bb7f0] c000000000332350 .xfrm_tmpl_resolve+0xc4/0x21c
    [c0000000421bb8d0] c0000000003326e8 .xfrm_lookup+0x1a0/0x5b0
    [c0000000421bba00] c0000000002e6ea0 .ip_route_output_flow+0x88/0xb4
    [c0000000421bbaa0] c0000000003106d8 .ip4_datagram_connect+0x218/0x374
    [c0000000421bbbd0] c00000000031bc00 .inet_dgram_connect+0xac/0xd4
    [c0000000421bbc60] c0000000002b11ac .sys_connect+0xd8/0x120
    [c0000000421bbd90] c0000000002d38d0 .compat_sys_socketcall+0xdc/0x214
    [c0000000421bbe30] c00000000000869c syscall_exit+0x0/0x40
    --- Exception: c00 (System Call) at 0000000007f0ca9c
    SP (fc0ef8f0) is in userspace
    
    We are using size of security context from xfrm_policy to determine
    how much space to alloc skb and then putting security context from
    xfrm_state into skb. Should have been using size of security context
    from xfrm_state to alloc skb. Following fix does that
    
    Signed-off-by: Joy Latten <latten at austin.ibm.com>
    Acked-by: James Morris <jmorris at namei.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/xfrm/xfrm_user.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index e81e2fb..816e369 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -272,9 +272,8 @@ static int attach_encap_tmpl(struct xfrm_encap_tmpl **encapp, struct rtattr *u_a
 }
 
 
-static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp)
+static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx)
 {
-	struct xfrm_sec_ctx *xfrm_ctx = xp->security;
 	int len = 0;
 
 	if (xfrm_ctx) {
@@ -2170,7 +2169,7 @@ static int xfrm_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *xt,
 
 	len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
 	len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire));
-	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
+	len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security));
 #ifdef CONFIG_XFRM_SUB_POLICY
 	len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
 #endif
@@ -2280,7 +2279,7 @@ static int xfrm_exp_policy_notify(struct xfrm_policy *xp, int dir, struct km_eve
 
 	len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
 	len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire));
-	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
+	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security));
 #ifdef CONFIG_XFRM_SUB_POLICY
 	len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
 #endif

linux-2.6-20.8n-net_vlan_allow_with_bridge.patch:
 vlan_dev.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE linux-2.6-20.8n-net_vlan_allow_with_bridge.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=279e172a580d415b83eba4f9fbbc77b08e546553
Commit:     279e172a580d415b83eba4f9fbbc77b08e546553
Parent:     09fe3ef46c5a2cc65d173df9518013e208eb3ba3
Author:     Jerome Borsboom <j.borsboom at erasmusmc.nl>
AuthorDate: Fri Apr 13 16:12:47 2007 -0700
Committer:  David S. Miller <davem at davemloft.net>
CommitDate: Fri Apr 13 16:12:47 2007 -0700

    [VLAN]: Allow VLAN interface on top of bridge interface
    
    When a VLAN interface is created on top of a bridge interface and
    netfilter is enabled to see the bridged packets, the packets can be
    corrupted when passing through the netfilter code. This is caused by the
    VLAN driver not setting the 'protocol' and 'nh' members of the sk_buff
    structure. In general, this is no problem as the VLAN interface is mostly
    connected to a physical ethernet interface which does not use the
    'protocol' and 'nh' members. For a bridge interface, however, these
    members do matter.
    
    Signed-off-by: Jerome Borsboom <j.borsboom at erasmusmc.nl>
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 net/8021q/vlan_dev.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 2fc8fe2..b6e0eea 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -380,6 +380,9 @@ int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
 		} else {
 			vhdr->h_vlan_encapsulated_proto = htons(len);
 		}
+
+		skb->protocol = htons(ETH_P_8021Q);
+		skb->nh.raw = skb->data;
 	}
 
 	/* Before delegating work to the lower layer, enter our MAC-address */

linux-2.6-20.8n-ppp_fix_skb_under_panic.patch:
 ppp_async.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.8n-ppp_fix_skb_under_panic.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7c5050e3e49f6d89af0d63111611693d9625d1f5
Commit:     7c5050e3e49f6d89af0d63111611693d9625d1f5
Parent:     895e1fc7226e6732bc77138955b6c7dfa279f57a
Author:     Paul Mackerras <paulus at samba.org>
AuthorDate: Thu Apr 19 13:05:52 2007 -0700
Committer:  David S. Miller <davem at davemloft.net>
CommitDate: Thu Apr 19 13:05:52 2007 -0700

    [PPP]: Fix skbuff.c:BUG due incorrect logic in process_input_packet()
    
    From: Paul Mackerras <paulus at samba.org>
    
    This fixes:
    
    Subject: kernel BUG at net/core/skbuff.c in linux-2.6.21-rc6
    
    process_input_packet() treats the case where the first byte is 0xff
    (PPP_ALLSTATIONS) but the second byte is 0x03 (PPP_UI) as indicating a
    packet with a PPP protocol number of 0xff.  Arguably that's wrong
    since PPP protocol 0xff is reserved, and the RFC does envision the
    possibility of receiving frames where the control field has values
    other than 0x03.
    
    Signed-off-by: David S. Miller <davem at davemloft.net>
---
 drivers/net/ppp_async.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 933e2f3..caabbc4 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -802,9 +802,9 @@ process_input_packet(struct asyncppp *ap)
 
 	/* check for address/control and protocol compression */
 	p = skb->data;
-	if (p[0] == PPP_ALLSTATIONS && p[1] == PPP_UI) {
+	if (p[0] == PPP_ALLSTATIONS) {
 		/* chop off address/control */
-		if (skb->len < 3)
+		if (p[1] != PPP_UI || skb->len < 3)
 			goto err;
 		p = skb_pull(skb, 2);
 	}

linux-2.6-page_is_ram.patch:
 e820.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-page_is_ram.patch ---
Make e820map non-initdata.

Otherwise execshild is broken.

--- linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c.orig	2007-04-26 14:38:12.000000000 -0400
+++ linux-2.6.20.x86_64/arch/x86_64/kernel/e820.c	2007-04-26 14:38:24.000000000 -0400
@@ -25,7 +25,7 @@
 #include <asm/bootsetup.h>
 #include <asm/sections.h>
 
-struct e820map e820 __initdata;
+struct e820map e820;
 
 /* 
  * PFN of last memory page.


--- NEW FILE patch-2.6.20.10-11.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGN9+qyGugalF9Dw4RAp6mAJ9GTQyYpln+s5442QpXRtoQMwztsACgh2HN
+ja7W7F60EvN6prII08nHoQ=
=fyPC
-----END PGP SIGNATURE-----


--- NEW FILE patch-2.6.20.9-10.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBGMnJ8yGugalF9Dw4RAswuAJ0Xv/NuAjc397yS9xyXF9J93q+2TgCgjRnj
WRRoVHZln0Vi0xCvWnC4d08=
=VVLI
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- .cvsignore	26 Apr 2007 15:04:06 -0000	1.442
+++ .cvsignore	2 May 2007 17:54:40 -0000	1.443
@@ -13,3 +13,5 @@
 patch-2.6.20.6-7.bz2
 patch-2.6.20.7-8.bz2
 patch-2.6.20.8-9.bz2
+patch-2.6.20.9-10.bz2
+patch-2.6.20.10-11.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2316
retrieving revision 1.2317
diff -u -r1.2316 -r1.2317
--- kernel-2.6.spec	27 Apr 2007 22:41:56 -0000	1.2316
+++ kernel-2.6.spec	2 May 2007 17:54:40 -0000	1.2317
@@ -319,7 +319,8 @@
 Patch7: patch-2.6.20.6-7.bz2
 Patch8: patch-2.6.20.7-8.bz2
 Patch9: patch-2.6.20.8-9.bz2
-Patch10: linux-2.6.20.10-unoffical.patch
+Patch10: patch-2.6.20.9-10.bz2
+Patch11: patch-2.6.20.10-11.bz2
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -466,8 +467,18 @@
 Patch1809: linux-2.6-21-rc6-readahead.patch
 Patch1810: linux-2.6-i386_pci-add_debugging.patch
 
+# post 2.6.20.11
+Patch1830: linux-2.6-20.8b-x86_perfctr_fix_bitmap_sizing.patch
+Patch1831: linux-2.6-20.8e-isdn-capi-disable-debug-messages.patch
+Patch1832: linux-2.6-20.8f-oom_kill_all_threads_that_share_mm.patch
+Patch1833: linux-2.6-20.8f-x86_64_always_flush_all_pages.patch
+Patch1834: linux-2.6-20.8n-ipsec_fix_oops_with_large_context.patch
+Patch1835: linux-2.6-20.8n-net_vlan_allow_with_bridge.patch
+Patch1836: linux-2.6-20.8n-ppp_fix_skb_under_panic.patch
+Patch1837: linux-2.6-page_is_ram.patch
+
 # SELinux/audit patches.
-Patch1850: linux-2.6-selinux-mprotect-checks.patch
+Patch1890: linux-2.6-selinux-mprotect-checks.patch
 
 # Warn about usage of various obsolete functionality that may go away.
 Patch1900: linux-2.6-obsolete-oss-warning.patch
@@ -884,6 +895,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1105,8 +1117,18 @@
 %patch1809 -p1
 %patch1810 -p1
 
+# post 2.6.20.11
+%patch1830 -p1
+%patch1831 -p1
+%patch1832 -p1
+%patch1833 -p1
+%patch1834 -p1
+%patch1835 -p1
+%patch1836 -p1
+%patch1837 -p1
+
 # Fix the SELinux mprotect checks on executable mappings
-%patch1850 -p1
+%patch1890 -p1
 
 # Warn about obsolete functionality usage.
 %patch1900 -p1
@@ -1894,6 +1916,11 @@
 %endif
 
 %changelog
+* Tue May 05 2007 Chuck Ebbert <cebbert at redhat.com>		1.2317
+- 2.6.20.10 (official)
+- 2.6.20.11
+- Additional fixes (1830 - 1837)
+
 * Fri Apr 27 2007 Chuck Ebbert <cebbert at redhat.com>		1.2316
 - 2.6.20.10 (from mailing list)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- sources	26 Apr 2007 15:04:07 -0000	1.382
+++ sources	2 May 2007 17:54:40 -0000	1.383
@@ -9,3 +9,5 @@
 557549a69f3ec7b615d252f302ad5099  patch-2.6.20.6-7.bz2
 2d67b7c603a3cb081da1db6048bd7316  patch-2.6.20.7-8.bz2
 931bd27010da400fc4902bef049904b9  patch-2.6.20.8-9.bz2
+26877e8750d036d6ea81a9bef6c685c6  patch-2.6.20.9-10.bz2
+71d6e53cf0accd8f09aa27ac9dd7f25d  patch-2.6.20.10-11.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- upstream	26 Apr 2007 15:04:07 -0000	1.345
+++ upstream	2 May 2007 17:54:40 -0000	1.346
@@ -8,3 +8,5 @@
 patch-2.6.20.6-7.bz2
 patch-2.6.20.7-8.bz2
 patch-2.6.20.8-9.bz2
+patch-2.6.20.9-10.bz2
+patch-2.6.20.10-11.bz2


--- linux-2.6.20.10-unoffical.patch DELETED ---


