rpms/kernel/F-10 patch-2.6.29.2-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.1003, 1.1004 drm-next.patch, 1.17, 1.18 git-linus.diff, 1.14, 1.15 kernel.spec, 1.1343, 1.1344 sources, 1.964, 1.965 upstream, 1.875, 1.876

Thu Apr 23 14:24:49 UTC 2009

Author: cebbert

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

Modified Files:
	.cvsignore drm-next.patch git-linus.diff kernel.spec sources 
	upstream 
Added Files:
	patch-2.6.29.2-rc1.bz2.sign 
Log Message:
2.6.29.2-rc1

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

iD8DBQBJ8B4VyGugalF9Dw4RAgNjAJwKY3Bc7lliRBFflCybCoYWbHaCrQCeP1j5
cE2DuNPH+QloWmk9ldwGcVs=
=PI8N
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1003
retrieving revision 1.1004
diff -u -r1.1003 -r1.1004
--- .cvsignore	2 Apr 2009 23:54:23 -0000	1.1003
+++ .cvsignore	23 Apr 2009 14:24:17 -0000	1.1004
@@ -6,3 +6,4 @@
 kernel-2.6.29
 linux-2.6.29.tar.bz2
 patch-2.6.29.1.bz2
+patch-2.6.29.2-rc1.bz2

drm-next.patch:

Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- drm-next.patch	22 Apr 2009 14:16:26 -0000	1.17
+++ drm-next.patch	23 Apr 2009 14:24:17 -0000	1.18
@@ -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->pages + i, 1);
+ 			drm_clflush_pages(obj_priv->page_list + 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.14 -r 1.15 git-linus.diff
Index: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/git-linus.diff,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- git-linus.diff	22 Apr 2009 14:16:27 -0000	1.14
+++ git-linus.diff	23 Apr 2009 14:24:17 -0000	1.15
@@ -1,5873 +0,0 @@
-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.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- kernel.spec	23 Apr 2009 14:12:49 -0000	1.1343
+++ kernel.spec	23 Apr 2009 14:24:18 -0000	1.1344
@@ -36,9 +36,9 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # 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}
@@ -1907,16 +1907,19 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-43
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.2-44.rc1
+- 2.6.29.2-rc1
+
+* Thu Apr 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-43
 - Remove bluetooth updates that broke OBEX.
 
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
+* Wed Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-42
 - Fix loss of link on resume from hibernate with forcdeth adapter (reported in Bodhi)
 
 * Wed Apr 22 2009 John W. Linville <linville at redhat.com> 2.6.29.1-41
 - back-port mac80211: fix beacon loss detection after scan
 
-* Tue Apr 22 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-40
+* Wed 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.964
retrieving revision 1.965
diff -u -r1.964 -r1.965
--- sources	2 Apr 2009 23:54:24 -0000	1.964
+++ sources	23 Apr 2009 14:24:18 -0000	1.965
@@ -1,2 +1,3 @@
 64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2
 87c6fbf4096b644d66d4da8bb00641a5  patch-2.6.29.1.bz2
+b1c47bcaa6a72dfd4adaa5630ae75585  patch-2.6.29.2-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- upstream	2 Apr 2009 23:54:24 -0000	1.875
+++ upstream	23 Apr 2009 14:24:18 -0000	1.876
@@ -1,2 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29.1.bz2
+patch-2.6.29.2-rc1.bz2


