diff for duplicates of <20080109005443.227306069@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b5b50ed..532ae63 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,8 @@ is just not important in the -ENOMEM case, or if this is a bug. 14 files changed, 19 insertions(+), 18 deletions(-) Index: v2.6.24-rc7/drivers/char/drm/drmP.h -=================================--- v2.6.24-rc7.orig/drivers/char/drm/drmP.h +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/drmP.h +++ v2.6.24-rc7/drivers/char/drm/drmP.h @@ -833,8 +833,7 @@ static inline int drm_mtrr_del(int handl /* Driver support (drm_drv.h) */ @@ -47,7 +48,8 @@ Index: v2.6.24-rc7/drivers/char/drm/drmP.h unsigned int cmd, unsigned long arg); extern int drm_lastclose(struct drm_device *dev); Index: v2.6.24-rc7/drivers/char/drm/drm_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/drm_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/drm_drv.c +++ v2.6.24-rc7/drivers/char/drm/drm_drv.c @@ -438,7 +438,6 @@ static int drm_version(struct drm_device /** @@ -96,7 +98,8 @@ Index: v2.6.24-rc7/drivers/char/drm/drm_drv.c } Index: v2.6.24-rc7/drivers/char/drm/i810_dma.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/i810_dma.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/i810_dma.c +++ v2.6.24-rc7/drivers/char/drm/i810_dma.c @@ -115,7 +115,7 @@ static int i810_mmap_buffers(struct file static const struct file_operations i810_buffer_fops = { @@ -108,7 +111,8 @@ Index: v2.6.24-rc7/drivers/char/drm/i810_dma.c .fasync = drm_fasync, }; Index: v2.6.24-rc7/drivers/char/drm/i810_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/i810_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/i810_drv.c +++ v2.6.24-rc7/drivers/char/drm/i810_drv.c @@ -59,7 +59,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -120,7 +124,8 @@ Index: v2.6.24-rc7/drivers/char/drm/i810_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/i830_dma.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/i830_dma.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/i830_dma.c +++ v2.6.24-rc7/drivers/char/drm/i830_dma.c @@ -117,7 +117,7 @@ static int i830_mmap_buffers(struct file static const struct file_operations i830_buffer_fops = { @@ -132,7 +137,8 @@ Index: v2.6.24-rc7/drivers/char/drm/i830_dma.c .fasync = drm_fasync, }; Index: v2.6.24-rc7/drivers/char/drm/i830_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/i830_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/i830_drv.c +++ v2.6.24-rc7/drivers/char/drm/i830_drv.c @@ -70,7 +70,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -144,7 +150,8 @@ Index: v2.6.24-rc7/drivers/char/drm/i830_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/i915_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/i915_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/i915_drv.c +++ v2.6.24-rc7/drivers/char/drm/i915_drv.c @@ -64,7 +64,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -156,7 +163,8 @@ Index: v2.6.24-rc7/drivers/char/drm/i915_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/mga_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/mga_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/mga_drv.c +++ v2.6.24-rc7/drivers/char/drm/mga_drv.c @@ -67,7 +67,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -168,7 +176,8 @@ Index: v2.6.24-rc7/drivers/char/drm/mga_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/r128_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/r128_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/r128_drv.c +++ v2.6.24-rc7/drivers/char/drm/r128_drv.c @@ -62,7 +62,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -180,7 +189,8 @@ Index: v2.6.24-rc7/drivers/char/drm/r128_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/radeon_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/radeon_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/radeon_drv.c +++ v2.6.24-rc7/drivers/char/drm/radeon_drv.c @@ -85,7 +85,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -192,7 +202,8 @@ Index: v2.6.24-rc7/drivers/char/drm/radeon_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/savage_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/savage_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/savage_drv.c +++ v2.6.24-rc7/drivers/char/drm/savage_drv.c @@ -50,7 +50,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -204,7 +215,8 @@ Index: v2.6.24-rc7/drivers/char/drm/savage_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/sis_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/sis_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/sis_drv.c +++ v2.6.24-rc7/drivers/char/drm/sis_drv.c @@ -80,7 +80,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -216,7 +228,8 @@ Index: v2.6.24-rc7/drivers/char/drm/sis_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/tdfx_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/tdfx_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/tdfx_drv.c +++ v2.6.24-rc7/drivers/char/drm/tdfx_drv.c @@ -48,7 +48,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, @@ -228,7 +241,8 @@ Index: v2.6.24-rc7/drivers/char/drm/tdfx_drv.c .poll = drm_poll, .fasync = drm_fasync, Index: v2.6.24-rc7/drivers/char/drm/via_drv.c -=================================--- v2.6.24-rc7.orig/drivers/char/drm/via_drv.c +=================================================================== +--- v2.6.24-rc7.orig/drivers/char/drm/via_drv.c +++ v2.6.24-rc7/drivers/char/drm/via_drv.c @@ -62,7 +62,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, diff --git a/a/content_digest b/N1/content_digest index 795d24c..f3917a4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020080109005416.039551758@gmail.com\0" "From\0Kevin Winchester <kjwinchester@gmail.com>\0" "Subject\0[patch 1/1] Convert drivers in drivers/char/drm to use .unlocked_ioctl\0" - "Date\0Wed, 09 Jan 2008 00:54:17 +0000\0" + "Date\0Tue, 08 Jan 2008 20:54:17 -0400\0" "To\0David Airlie <airlied@linux.ie>\0" "Cc\0dri-devel@lists.sourceforge.net" Andi Kleen <andi@firstfloor.org> @@ -9,6 +9,7 @@ kernel-janitors@vger.kernel.org " Kevin Winchester <kjwinchester@gmail.com>\0" "\00:1\0" + "fn\0drm_ioctl-unlocked_ioctl.patch\0" "b\0" "To: David Airlie <airlied@linux.ie>\n" "Cc: dri-devel@lists.sourceforge.net\n" @@ -46,7 +47,8 @@ " 14 files changed, 19 insertions(+), 18 deletions(-)\n" "\n" "Index: v2.6.24-rc7/drivers/char/drm/drmP.h\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/drmP.h\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/drmP.h\n" "+++ v2.6.24-rc7/drivers/char/drm/drmP.h\n" "@@ -833,8 +833,7 @@ static inline int drm_mtrr_del(int handl\n" " \t\t\t\t/* Driver support (drm_drv.h) */\n" @@ -59,7 +61,8 @@ " \t\t\t unsigned int cmd, unsigned long arg);\n" " extern int drm_lastclose(struct drm_device *dev);\n" "Index: v2.6.24-rc7/drivers/char/drm/drm_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/drm_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/drm_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/drm_drv.c\n" "@@ -438,7 +438,6 @@ static int drm_version(struct drm_device\n" " /**\n" @@ -108,7 +111,8 @@ " }\n" " \n" "Index: v2.6.24-rc7/drivers/char/drm/i810_dma.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/i810_dma.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/i810_dma.c\n" "+++ v2.6.24-rc7/drivers/char/drm/i810_dma.c\n" "@@ -115,7 +115,7 @@ static int i810_mmap_buffers(struct file\n" " static const struct file_operations i810_buffer_fops = {\n" @@ -120,7 +124,8 @@ " \t.fasync = drm_fasync,\n" " };\n" "Index: v2.6.24-rc7/drivers/char/drm/i810_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/i810_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/i810_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/i810_drv.c\n" "@@ -59,7 +59,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -132,7 +137,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/i830_dma.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/i830_dma.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/i830_dma.c\n" "+++ v2.6.24-rc7/drivers/char/drm/i830_dma.c\n" "@@ -117,7 +117,7 @@ static int i830_mmap_buffers(struct file\n" " static const struct file_operations i830_buffer_fops = {\n" @@ -144,7 +150,8 @@ " \t.fasync = drm_fasync,\n" " };\n" "Index: v2.6.24-rc7/drivers/char/drm/i830_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/i830_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/i830_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/i830_drv.c\n" "@@ -70,7 +70,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -156,7 +163,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/i915_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/i915_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/i915_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/i915_drv.c\n" "@@ -64,7 +64,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -168,7 +176,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/mga_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/mga_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/mga_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/mga_drv.c\n" "@@ -67,7 +67,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -180,7 +189,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/r128_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/r128_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/r128_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/r128_drv.c\n" "@@ -62,7 +62,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -192,7 +202,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/radeon_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/radeon_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/radeon_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/radeon_drv.c\n" "@@ -85,7 +85,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -204,7 +215,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/savage_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/savage_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/savage_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/savage_drv.c\n" "@@ -50,7 +50,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -216,7 +228,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/sis_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/sis_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/sis_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/sis_drv.c\n" "@@ -80,7 +80,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -228,7 +241,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/tdfx_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/tdfx_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/tdfx_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/tdfx_drv.c\n" "@@ -48,7 +48,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -240,7 +254,8 @@ " \t\t .poll = drm_poll,\n" " \t\t .fasync = drm_fasync,\n" "Index: v2.6.24-rc7/drivers/char/drm/via_drv.c\n" - "=================================--- v2.6.24-rc7.orig/drivers/char/drm/via_drv.c\n" + "===================================================================\n" + "--- v2.6.24-rc7.orig/drivers/char/drm/via_drv.c\n" "+++ v2.6.24-rc7/drivers/char/drm/via_drv.c\n" "@@ -62,7 +62,7 @@ static struct drm_driver driver = {\n" " \t\t .owner = THIS_MODULE,\n" @@ -254,4 +269,4 @@ "\n" -- -00ea47f9df7b15deb8539a80486dc2e0a19b71dabfb9e8e62d074b31388f4301 +8f41ec5b3fba515614d257f34b566e037ae0a1a7c4f8b7c3d5b856efab708399
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.