Wed Apr 22 14:16:36 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15559

Modified Files:
	drm-next.patch git-linus.diff kernel.spec 
Removed Files:
	linux-2.6-acer-wmi-bail-on-aao.patch 
	linux-2.6-kvm-kconfig-irqchip.patch 
	linux-2.6-kvm-mask-notifiers.patch 
	linux-2.6-kvm-reset-pit-irq-on-unmask.patch 
	linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch 
	linux-2.6-mm-define-unique-value-for-as_unevictable.patch 
	linux-2.6-net-fix-another-gro-bug.patch 
	linux-2.6-posix-timers-fix-clock-monotonicity.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch 
	linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch 
Log Message:
Add 2.6.29.2 patch queue (as git-linus.diff)
Drop queued patches:
    linux-2.6-acer-wmi-bail-on-aao.patch
    linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
    linux-2.6-mm-define-unique-value-for-as_unevictable.patch
    linux-2.6-posix-timers-fix-clock-monotonicity.patch
    linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
    linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
    linux-2.6-net-fix-another-gro-bug.patch
    linux-2.6-kvm-kconfig-irqchip.patch
    linux-2.6-kvm-mask-notifiers.patch
    linux-2.6-kvm-reset-pit-irq-on-unmask.patch

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17

--- drm-next.patch	3 Apr 2009 03:26:37 -0000	1.16
+++ drm-next.patch	22 Apr 2009 14:16:26 -0000	1.17
@@ -3201,7 +3201,7 @@
  	if (!obj_priv->page_cpu_valid)
 @@ -2160,7 +2157,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
  				continue;
- 			drm_clflush_pages(obj_priv->page_list + i, 1);
+ 			drm_clflush_pages(obj_priv->pages + i, 1);
  		}
 -		drm_agp_chipset_flush(dev);
  	}

git-linus.diff:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.13 -r 1.14 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/git-linus.diff,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git-linus.diff	6 Oct 2008 14:26:12 -0000	1.13
+++ git-linus.diff	22 Apr 2009 14:16:27 -0000	1.14
@@ -0,0 +1,5873 @@
+Index: vanilla-2.6.29.1/security/smack/smack_lsm.c
+===================================================================
+--- vanilla-2.6.29.1.orig/security/smack/smack_lsm.c
++++ vanilla-2.6.29.1/security/smack/smack_lsm.c
+@@ -607,6 +607,8 @@ static int smack_inode_setxattr(struct d
+ 	    strcmp(name, XATTR_NAME_SMACKIPOUT) == 0) {
+ 		if (!capable(CAP_MAC_ADMIN))
+ 			rc = -EPERM;
++		if (size == 0)
++			rc = -EINVAL;
+ 	} else
+ 		rc = cap_inode_setxattr(dentry, name, value, size, flags);
+ 
+@@ -1430,7 +1432,7 @@ static int smack_inode_setsecurity(struc
+ 	struct socket *sock;
+ 	int rc = 0;
+ 
+-	if (value == NULL || size > SMK_LABELLEN)
++	if (value == NULL || size > SMK_LABELLEN || size == 0)
+ 		return -EACCES;
+ 
+ 	sp = smk_import(value, size);
+Index: vanilla-2.6.29.1/drivers/video/console/fbcon.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/video/console/fbcon.c
++++ vanilla-2.6.29.1/drivers/video/console/fbcon.c
+@@ -2263,9 +2263,12 @@ static void fbcon_generic_blank(struct v
+ 	}
+ 
+ 
++	if (!lock_fb_info(info))
++		return;
+ 	event.info = info;
+ 	event.data = ␣
+ 	fb_notifier_call_chain(FB_EVENT_CONBLANK, &event);
++	unlock_fb_info(info);
+ }
+ 
+ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
+@@ -2954,8 +2957,9 @@ static int fbcon_fb_unbind(int idx)
+ 
+ static int fbcon_fb_unregistered(struct fb_info *info)
+ {
+-	int i, idx = info->node;
++	int i, idx;
+ 
++	idx = info->node;
+ 	for (i = first_fb_vc; i <= last_fb_vc; i++) {
+ 		if (con2fb_map[i] == idx)
+ 			con2fb_map[i] = -1;
+@@ -2979,13 +2983,12 @@ static int fbcon_fb_unregistered(struct 
+ 		}
+ 	}
+ 
+-	if (!num_registered_fb)
+-		unregister_con_driver(&fb_con);
+-
+-
+ 	if (primary_device == idx)
+ 		primary_device = -1;
+ 
++	if (!num_registered_fb)
++		unregister_con_driver(&fb_con);
++
+ 	return 0;
+ }
+ 
+@@ -3021,8 +3024,9 @@ static inline void fbcon_select_primary(
+ 
+ static int fbcon_fb_registered(struct fb_info *info)
+ {
+-	int ret = 0, i, idx = info->node;
++	int ret = 0, i, idx;
+ 
++	idx = info->node;
+ 	fbcon_select_primary(info);
+ 
+ 	if (info_idx == -1) {
+@@ -3124,7 +3128,7 @@ static void fbcon_get_requirement(struct
+ 	}
+ }
+ 
+-static int fbcon_event_notify(struct notifier_block *self, 
++static int fbcon_event_notify(struct notifier_block *self,
+ 			      unsigned long action, void *data)
+ {
+ 	struct fb_event *event = data;
+@@ -3132,7 +3136,7 @@ static int fbcon_event_notify(struct not
+ 	struct fb_videomode *mode;
+ 	struct fb_con2fbmap *con2fb;
+ 	struct fb_blit_caps *caps;
+-	int ret = 0;
++	int idx, ret = 0;
+ 
+ 	/*
+ 	 * ignore all events except driver registration and deregistration
+@@ -3160,7 +3164,8 @@ static int fbcon_event_notify(struct not
+ 		ret = fbcon_mode_deleted(info, mode);
+ 		break;
+ 	case FB_EVENT_FB_UNBIND:
+-		ret = fbcon_fb_unbind(info->node);
++		idx = info->node;
++		ret = fbcon_fb_unbind(idx);
+ 		break;
+ 	case FB_EVENT_FB_REGISTERED:
+ 		ret = fbcon_fb_registered(info);
+@@ -3188,7 +3193,6 @@ static int fbcon_event_notify(struct not
+ 		fbcon_get_requirement(info, caps);
+ 		break;
+ 	}
+-
+ done:
+ 	return ret;
+ }
+Index: vanilla-2.6.29.1/drivers/video/fbmem.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/video/fbmem.c
++++ vanilla-2.6.29.1/drivers/video/fbmem.c
+@@ -1086,13 +1086,11 @@ static long do_fb_ioctl(struct fb_info *
+ 			return -EINVAL;
+ 		con2fb.framebuffer = -1;
+ 		event.data = &con2fb;
+-
+ 		if (!lock_fb_info(info))
+ 			return -ENODEV;
+ 		event.info = info;
+ 		fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
+ 		unlock_fb_info(info);
+-
+ 		ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
+ 		break;
+ 	case FBIOPUT_CON2FBMAP:
+@@ -1112,8 +1110,7 @@ static long do_fb_ioctl(struct fb_info *
+ 		if (!lock_fb_info(info))
+ 			return -ENODEV;
+ 		event.info = info;
+-		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP,
+-					      &event);
++		ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
+ 		unlock_fb_info(info);
+ 		break;
+ 	case FBIOBLANK:
+@@ -1519,7 +1516,10 @@ register_framebuffer(struct fb_info *fb_
+ 	registered_fb[i] = fb_info;
+ 
+ 	event.info = fb_info;
++	if (!lock_fb_info(fb_info))
++		return -ENODEV;
+ 	fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
++	unlock_fb_info(fb_info);
+ 	return 0;
+ }
+ 
+@@ -1553,8 +1553,12 @@ unregister_framebuffer(struct fb_info *f
+ 		goto done;
+ 	}
+ 
++
++	if (!lock_fb_info(fb_info))
++		return -ENODEV;
+ 	event.info = fb_info;
+ 	ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
++	unlock_fb_info(fb_info);
+ 
+ 	if (ret) {
+ 		ret = -EINVAL;
+@@ -1588,6 +1592,8 @@ void fb_set_suspend(struct fb_info *info
+ {
+ 	struct fb_event event;
+ 
++	if (!lock_fb_info(info))
++		return;
+ 	event.info = info;
+ 	if (state) {
+ 		fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
+@@ -1596,6 +1602,7 @@ void fb_set_suspend(struct fb_info *info
+ 		info->state = FBINFO_STATE_RUNNING;
+ 		fb_notifier_call_chain(FB_EVENT_RESUME, &event);
+ 	}
++	unlock_fb_info(info);
+ }
+ 
+ /**
+@@ -1665,8 +1672,11 @@ int fb_new_modelist(struct fb_info *info
+ 	err = 1;
+ 
+ 	if (!list_empty(&info->modelist)) {
++		if (!lock_fb_info(info))
++			return -ENODEV;
+ 		event.info = info;
+ 		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
[...5482 lines suppressed...]
+-	unsigned long vma_end = vma->vm_end;
+-	unsigned long vma_size = vma_end - vma_start;
++	unsigned long vma_size = vma->vm_end - vma->vm_start;
+ 
+ 	if (!pat_enabled)
+ 		return;
+ 
++	/*
++	 * For now, only handle remap_pfn_range() vmas where
++	 * is_linear_pfn_mapping() == TRUE. Handling of
++	 * vm_insert_pfn() is TBD.
++	 */
+ 	if (is_linear_pfn_mapping(vma)) {
+ 		/* free the whole chunk starting from vm_pgoff */
+ 		paddr = (resource_size_t)vma->vm_pgoff << PAGE_SHIFT;
+ 		free_pfn_range(paddr, vma_size);
+ 		return;
+ 	}
+-
+-	if (size != 0 && size != vma_size) {
+-		/* free page by page, using pfn and size */
+-		paddr = (resource_size_t)pfn << PAGE_SHIFT;
+-		for (i = 0; i < size; i += PAGE_SIZE) {
+-			paddr = paddr + i;
+-			free_pfn_range(paddr, PAGE_SIZE);
+-		}
+-	} else {
+-		/* free entire vma, page by page, using the pfn from pte */
+-		for (i = 0; i < vma_size; i += PAGE_SIZE) {
+-			if (follow_phys(vma, vma_start + i, 0, &prot, &paddr))
+-				continue;
+-
+-			free_pfn_range(paddr, PAGE_SIZE);
+-		}
+-	}
+ }
+ 
+ pgprot_t pgprot_writecombine(pgprot_t prot)
+Index: vanilla-2.6.29.1/drivers/input/gameport/gameport.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/input/gameport/gameport.c
++++ vanilla-2.6.29.1/drivers/input/gameport/gameport.c
+@@ -50,9 +50,8 @@ static LIST_HEAD(gameport_list);
+ 
+ static struct bus_type gameport_bus;
+ 
+-static void gameport_add_driver(struct gameport_driver *drv);
+ static void gameport_add_port(struct gameport *gameport);
+-static void gameport_destroy_port(struct gameport *gameport);
++static void gameport_attach_driver(struct gameport_driver *drv);
+ static void gameport_reconnect_port(struct gameport *gameport);
+ static void gameport_disconnect_port(struct gameport *gameport);
+ 
+@@ -230,7 +229,6 @@ static void gameport_find_driver(struct 
+ 
+ enum gameport_event_type {
+ 	GAMEPORT_REGISTER_PORT,
+-	GAMEPORT_REGISTER_DRIVER,
+ 	GAMEPORT_ATTACH_DRIVER,
+ };
+ 
+@@ -374,8 +372,8 @@ static void gameport_handle_event(void)
+ 				gameport_add_port(event->object);
+ 				break;
+ 
+-			case GAMEPORT_REGISTER_DRIVER:
+-				gameport_add_driver(event->object);
++			case GAMEPORT_ATTACH_DRIVER:
++				gameport_attach_driver(event->object);
+ 				break;
+ 
+ 			default:
+@@ -706,14 +704,14 @@ static int gameport_driver_remove(struct
+ 	return 0;
+ }
+ 
+-static void gameport_add_driver(struct gameport_driver *drv)
++static void gameport_attach_driver(struct gameport_driver *drv)
+ {
+ 	int error;
+ 
+-	error = driver_register(&drv->driver);
++	error = driver_attach(&drv->driver);
+ 	if (error)
+ 		printk(KERN_ERR
+-			"gameport: driver_register() failed for %s, error: %d\n",
++			"gameport: driver_attach() failed for %s, error: %d\n",
+ 			drv->driver.name, error);
+ }
+ 
+Index: vanilla-2.6.29.1/drivers/char/vt.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/char/vt.c
++++ vanilla-2.6.29.1/drivers/char/vt.c
+@@ -2271,7 +2271,7 @@ rescan_last_byte:
+ 				    continue; /* nothing to display */
+ 				}
+ 				/* Glyph not found */
+-				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
++				if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
+ 				    /* In legacy mode use the glyph we get by a 1:1 mapping.
+ 				       This would make absolutely no sense with Unicode in mind,
+ 				       but do this for ASCII characters since a font may lack
+Index: vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/virtio/virtio_balloon.c
++++ vanilla-2.6.29.1/drivers/virtio/virtio_balloon.c
+@@ -190,7 +190,8 @@ static int balloon(void *_vballoon)
+ 		try_to_freeze();
+ 		wait_event_interruptible(vb->config_change,
+ 					 (diff = towards_target(vb)) != 0
+-					 || kthread_should_stop());
++					 || kthread_should_stop()
++					 || freezing(current));
+ 		if (diff > 0)
+ 			fill_balloon(vb, diff);
+ 		else if (diff < 0)
+Index: vanilla-2.6.29.1/drivers/char/agp/generic.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/char/agp/generic.c
++++ vanilla-2.6.29.1/drivers/char/agp/generic.c
+@@ -1226,7 +1226,7 @@ int agp_generic_alloc_pages(struct agp_b
+ 	int i, ret = -ENOMEM;
+ 
+ 	for (i = 0; i < num_pages; i++) {
+-		page = alloc_page(GFP_KERNEL | GFP_DMA32);
++		page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+ 		/* agp_free_memory() needs gart address */
+ 		if (page == NULL)
+ 			goto out;
+@@ -1257,7 +1257,7 @@ void *agp_generic_alloc_page(struct agp_
+ {
+ 	struct page * page;
+ 
+-	page = alloc_page(GFP_KERNEL | GFP_DMA32);
++	page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO);
+ 	if (page == NULL)
+ 		return NULL;
+ 
+Index: vanilla-2.6.29.1/net/core/skbuff.c
+===================================================================
+--- vanilla-2.6.29.1.orig/net/core/skbuff.c
++++ vanilla-2.6.29.1/net/core/skbuff.c
+@@ -2496,7 +2496,7 @@ struct sk_buff *skb_segment(struct sk_bu
+ 					  skb_network_header_len(skb));
+ 		skb_copy_from_linear_data(skb, nskb->data, doffset);
+ 
+-		if (pos >= offset + len)
++		if (fskb != skb_shinfo(skb)->frag_list)
+ 			continue;
+ 
+ 		if (!sg) {
+Index: vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
+===================================================================
+--- vanilla-2.6.29.1.orig/fs/nfs/nfs3xdr.c
++++ vanilla-2.6.29.1/fs/nfs/nfs3xdr.c
+@@ -716,7 +716,8 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req
+ 	if (args->npages != 0)
+ 		xdr_encode_pages(buf, args->pages, 0, args->len);
+ 	else
+-		req->rq_slen += args->len;
++		req->rq_slen = xdr_adjust_iovec(req->rq_svec,
++				p + XDR_QUADLEN(args->len));
+ 
+ 	err = nfsacl_encode(buf, base, args->inode,
+ 			    (args->mask & NFS_ACL) ?
+Index: vanilla-2.6.29.1/fs/hugetlbfs/inode.c
+===================================================================
+--- vanilla-2.6.29.1.orig/fs/hugetlbfs/inode.c
++++ vanilla-2.6.29.1/fs/hugetlbfs/inode.c
+@@ -26,7 +26,6 @@
+ #include <linux/pagevec.h>
+ #include <linux/parser.h>
+ #include <linux/mman.h>
+-#include <linux/quotaops.h>
+ #include <linux/slab.h>
+ #include <linux/dnotify.h>
+ #include <linux/statfs.h>
+@@ -842,7 +841,7 @@ hugetlbfs_parse_options(char *options, s
+ bad_val:
+  	printk(KERN_ERR "hugetlbfs: Bad value '%s' for mount option '%s'\n",
+ 	       args[0].from, p);
+- 	return 1;
++ 	return -EINVAL;
+ }
+ 
+ static int
+Index: vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
+===================================================================
+--- vanilla-2.6.29.1.orig/drivers/message/fusion/mptbase.c
++++ vanilla-2.6.29.1/drivers/message/fusion/mptbase.c
+@@ -5934,7 +5934,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS
+ 
+ 	/* Initalize the timer
+ 	 */
+-	init_timer(&pCfg->timer);
++	init_timer_on_stack(&pCfg->timer);
+ 	pCfg->timer.data = (unsigned long) ioc;
+ 	pCfg->timer.function = mpt_timer_expired;
+ 	pCfg->wait_done = 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -r1.1339 -r1.1340
--- kernel.spec	21 Apr 2009 20:45:08 -0000	1.1339
+++ kernel.spec	22 Apr 2009 14:16:30 -0000	1.1340
@@ -621,7 +621,6 @@
 Patch383: linux-2.6-defaults-fat-utf8.patch
 Patch390: linux-2.6-defaults-acpi-video.patch
 Patch391: linux-2.6-acpi-video-dos.patch
-Patch396: linux-2.6-acer-wmi-bail-on-aao.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch460: linux-2.6-serial-460800.patch
@@ -698,16 +697,8 @@
 Patch4000: linux-2.6-usb-cdc-acm-remove-low-latency-flag.patch
 
 # patches headed for -stable
-# fix oops in md raid1 (#495550)
-Patch6000: linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-# fix duplicated flags
-Patch7000: linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-# fix posix clock monotonicity
-Patch7001: linux-2.6-posix-timers-fix-clock-monotonicity.patch
 # make RLIMIT_CPU work again
 Patch7002: linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-Patch7003: linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-Patch7004: linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 Patch9000: squashfs3.patch
 Patch9001: squashfs-fixups.patch
@@ -717,13 +708,7 @@
 #Adding dropmonitor bits from 2.6.30
 Patch9011: linux-2.6-dropwatch-protocol.patch
 
-# fix for net lockups, will be in 2.6.29.1
-Patch9101: linux-2.6-net-fix-another-gro-bug.patch
-
 # kvm fixes
-Patch9300: linux-2.6-kvm-kconfig-irqchip.patch
-Patch9301: linux-2.6-kvm-mask-notifiers.patch
-Patch9302: linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 Patch9303: linux-2.6-kvm-skip-pit-check.patch
 Patch9304: linux-2.6-xen-check-for-nx-support.patch
 
@@ -963,6 +948,20 @@
   esac
 }
 
+# don't apply patch if it's empty
+ApplyOptionalPatch()
+{
+  local patch=$1
+  shift
+  if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
+    exit 1
+  fi
+  local C=$(wc -l $RPM_SOURCE_DIR/$patch | awk '{print $1}')
+  if [ "$C" -gt 9 ]; then
+    ApplyPatch $patch ${1+"$@"}
+  fi
+}
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1102,7 +1101,7 @@
   done
 %endif
 
-#ApplyPatch git-linus.diff
+ApplyOptionalPatch git-linus.diff
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1114,18 +1113,12 @@
 #
 # misc small stuff to make things compile
 #
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
+ApplyOptionalPatch linux-2.6-compile-fixes.patch
 
 %if !%{nopatches}
 
 # revert patches from upstream that conflict or that we get via other means
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-upstream-reverts.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-upstream-reverts.patch -R
-fi
+ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
 #ApplyPatch git-cpufreq.patch
 ApplyPatch git-bluetooth.patch
@@ -1205,7 +1198,6 @@
 # ACPI
 ApplyPatch linux-2.6-defaults-acpi-video.patch
 ApplyPatch linux-2.6-acpi-video-dos.patch
-ApplyPatch linux-2.6-acer-wmi-bail-on-aao.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1308,21 +1300,13 @@
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-firewire-git-pending.patch
-fi
+ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
 
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
 # patches headed for -stable
-ApplyPatch linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
-ApplyPatch linux-2.6-mm-define-unique-value-for-as_unevictable.patch
-ApplyPatch linux-2.6-posix-timers-fix-clock-monotonicity.patch
 ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
-ApplyPatch linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
 
 # we need squashfs3 for Fedora-10
 ApplyPatch squashfs3.patch
@@ -1337,12 +1321,7 @@
 # Apply dropmonitor protocol bits from 2.6..30 net-next tree
 ApplyPatch linux-2.6-dropwatch-protocol.patch
 
-ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
-
 # kvm fixes
-ApplyPatch linux-2.6-kvm-kconfig-irqchip.patch
-ApplyPatch linux-2.6-kvm-mask-notifiers.patch
-ApplyPatch linux-2.6-kvm-reset-pit-irq-on-unmask.patch
 ApplyPatch linux-2.6-kvm-skip-pit-check.patch
 ApplyPatch linux-2.6-xen-check-for-nx-support.patch
 
@@ -1928,6 +1907,20 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
+- Add 2.6.29.2 patch queue (as git-linus.diff)
+- Drop queued patches:
+    linux-2.6-acer-wmi-bail-on-aao.patch
+    linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch
+    linux-2.6-mm-define-unique-value-for-as_unevictable.patch
+    linux-2.6-posix-timers-fix-clock-monotonicity.patch
+    linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch
+    linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch
+    linux-2.6-net-fix-another-gro-bug.patch
+    linux-2.6-kvm-kconfig-irqchip.patch
+    linux-2.6-kvm-mask-notifiers.patch
+    linux-2.6-kvm-reset-pit-irq-on-unmask.patch
+
 * Tue Apr 21 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-39
 - Don't include the modules.*.bin files in the RPM package.
 


--- linux-2.6-acer-wmi-bail-on-aao.patch DELETED ---


--- linux-2.6-kvm-kconfig-irqchip.patch DELETED ---


--- linux-2.6-kvm-mask-notifiers.patch DELETED ---


--- linux-2.6-kvm-reset-pit-irq-on-unmask.patch DELETED ---


--- linux-2.6-md-raid1-dont-assume-new-bvecs-are-init.patch DELETED ---


--- linux-2.6-mm-define-unique-value-for-as_unevictable.patch DELETED ---


--- linux-2.6-net-fix-another-gro-bug.patch DELETED ---


--- linux-2.6-posix-timers-fix-clock-monotonicity.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-fork-2.patch DELETED ---


--- linux-2.6-posix-timers-fix-rlimit_cpu-setitimer.patch DELETED ---


