-- Although when you're in the situation that RMS is telling you that you're being too ideological about freedom, maybe, just maybe, it's true. - Matthew Wilcox |
--- Begin Message ---
- To: jbailey@raspberryginger.com
- Subject: r1805 - in linux-kernel-headers/trunk: . debian debian/patches
- From: Clint Adams <schizo@costa.debian.org>
- Date: Sun, 24 Sep 2006 16:49:10 +0000
- Message-id: <E1GRXAE-0004XP-M6@costa.debian.org>
Author: schizo Date: 2006-09-24 16:49:07 +0000 (Sun, 24 Sep 2006) New Revision: 1805 Removed: linux-kernel-headers/trunk/debian/patches/alpha-asm-param.patch linux-kernel-headers/trunk/debian/patches/linux-joystick.patch linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch Modified: linux-kernel-headers/trunk/debian/changelog linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch linux-kernel-headers/trunk/debian/patches/byteorder-const.patch linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch linux-kernel-headers/trunk/debian/patches/linux-futex.patch linux-kernel-headers/trunk/debian/patches/linux-unistd-errno.patch linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch linux-kernel-headers/trunk/debian/patches/series linux-kernel-headers/trunk/version.h Log: * New upstream release 2.6.18. - Drop alpha-asm-param.patch (included upstream) - Update asm-system-and-padding.patch - Update byteorder-const.patch - Update hppa-atomic.patch - Update linux-unistd-errno.patch - Drop videodev2-timeval.patch (kernel stuff moved to media/v4l2-dev.h) - Drop linux-joystick.patch (included upstream) - Update linux-futex.patch Modified: linux-kernel-headers/trunk/debian/changelog =================================================================== --- linux-kernel-headers/trunk/debian/changelog 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/changelog 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,3 +1,18 @@ +linux-kernel-headers (2.6.18-1) unstable; urgency=low + + * New upstream release 2.6.18. + - Drop alpha-asm-param.patch (included upstream) + - Update asm-system-and-padding.patch + - Update byteorder-const.patch + - Update hppa-atomic.patch + - Update linux-unistd-errno.patch + - Drop videodev2-timeval.patch (kernel stuff moved to + media/v4l2-dev.h) + - Drop linux-joystick.patch (included upstream) + - Update linux-futex.patch + + -- Clint Adams <schizo@debian.org> Sun, 24 Sep 2006 12:02:47 -0400 + linux-kernel-headers (2.6.17.10-3) unstable; urgency=medium * Apply patch from James Bruce to fix linux/joystick.h. Deleted: linux-kernel-headers/trunk/debian/patches/alpha-asm-param.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/alpha-asm-param.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/alpha-asm-param.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,18 +0,0 @@ -Including <linux/config.h> (via <sys/param.h> and <asm/param.h>) breaks the -build of busybox; it pollutes the namespace by undefining CONFIG_TR. -All architectures except Alpha appear fixed now. - ---- include/asm-alpha/param.h.orig 2003-10-15 11:12:09.000000000 -0400 -+++ include/asm-alpha/param.h 2003-11-01 17:46:06.000000000 -0500 -@@ -5,7 +5,11 @@ - hardware ignores reprogramming. We also need userland buy-in to the - change in HZ, since this is visible in the wait4 resources etc. */ - -+#ifdef __KERNEL__ -+/* Debian doesn't define CONFIG_ALPHA_RAWHIDE, and including -+ <linux/config.h> pollutes the namespace. */ - #include <linux/config.h> -+#endif - - #ifndef HZ - # ifndef CONFIG_ALPHA_RAWHIDE Modified: linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -25,13 +25,12 @@ =================================================================== --- include/asm-parisc/system.h.orig 2006-06-05 13:18:23.000000000 -0400 +++ include/asm-parisc/system.h 2006-06-09 23:44:40.074356872 -0400 -@@ -1,6 +1,8 @@ +@@ -1,5 +1,7 @@ #ifndef __PARISC_SYSTEM_H #define __PARISC_SYSTEM_H +#ifdef __KERNEL__ + - #include <linux/config.h> #include <asm/psw.h> @@ -193,3 +195,5 @@ Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -102,28 +102,6 @@ { __asm__("swap.b %0, %0" : "=r" (x) -Index: include/asm-sh64/byteorder.h -=================================================================== ---- include/asm-sh64/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400 -+++ include/asm-sh64/byteorder.h 2006-06-18 18:12:22.034491317 -0400 -@@ -14,7 +14,7 @@ - - #include <asm/types.h> - --static __inline__ __const__ __u32 ___arch__swab32(__u32 x) -+static __inline__ __u32 ___arch__swab32(__u32 x) - { - __asm__("byterev %0, %0\n\t" - "shari %0, 32, %0" -@@ -23,7 +23,7 @@ - return x; - } - --static __inline__ __const__ __u16 ___arch__swab16(__u16 x) -+static __inline__ __u16 ___arch__swab16(__u16 x) - { - __asm__("byterev %0, %0\n\t" - "shari %0, 48, %0" Index: include/asm-v850/byteorder.h =================================================================== --- include/asm-v850/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400 @@ -239,25 +217,3 @@ { __u32 result; -Index: include/asm-arm/byteorder.h -=================================================================== ---- include/asm-arm/byteorder.h.orig 2006-06-18 18:12:35.000000000 -0400 -+++ include/asm-arm/byteorder.h 2006-06-18 18:14:15.983979638 -0400 -@@ -18,7 +18,7 @@ - #include <linux/compiler.h> - #include <asm/types.h> - --static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) -+static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x) - { - __u32 t; - -@@ -30,7 +30,7 @@ - * right thing and not screw it up to different degrees - * depending on the gcc version. - */ -- asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); -+ __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); - } - x = (x << 24) | (x >> 8); /* mov r0,r0,ror #8 */ - t &= ~0x00FF0000; /* bic r1,r1,#0x00FF0000 */ Modified: linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -2,13 +2,12 @@ =================================================================== --- include/asm-parisc/atomic.h.orig 2006-06-05 13:18:23.000000000 -0400 +++ include/asm-parisc/atomic.h 2006-06-09 23:58:19.250847086 -0400 -@@ -5,6 +5,8 @@ +@@ -5,5 +5,7 @@ #ifndef _ASM_PARISC_ATOMIC_H_ #define _ASM_PARISC_ATOMIC_H_ +#ifdef __KERNEL__ + - #include <linux/config.h> #include <linux/types.h> #include <asm/system.h> @@ -91,6 +93,7 @@ Modified: linux-kernel-headers/trunk/debian/patches/linux-futex.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/linux-futex.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/linux-futex.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -14,14 +14,13 @@ /* Second argument to futex syscall */ -@@ -90,6 +94,7 @@ +@@ -90,5 +94,6 @@ */ #define ROBUST_LIST_LIMIT 2048 +#ifdef __KERNEL__ - long do_futex(unsigned long uaddr, int op, int val, - unsigned long timeout, unsigned long uaddr2, int val2, - int val3); + long do_futex(u32 __user *uaddr, int op, u32 val, unsigned long timeout, + u32 __user *uaddr2, u32 val2, u32 val3); @@ -103,6 +108,7 @@ { } Deleted: linux-kernel-headers/trunk/debian/patches/linux-joystick.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,41 +0,0 @@ -Index: linux-kernel-headers-2.6.17.10/include/linux/joystick.h -=================================================================== ---- linux-kernel-headers-2.6.17.10.orig/include/linux/joystick.h 2006-08-22 15:09:35.000000000 -0400 -+++ linux-kernel-headers-2.6.17.10/include/linux/joystick.h 2006-09-07 11:57:01.934792426 -0400 -@@ -111,25 +111,25 @@ - #define JS_SET_ALL 8 - - struct JS_DATA_TYPE { -- int32_t buttons; -- int32_t x; -- int32_t y; -+ __s32 buttons; -+ __s32 x; -+ __s32 y; - }; - - struct JS_DATA_SAVE_TYPE_32 { -- int32_t JS_TIMEOUT; -- int32_t BUSY; -- int32_t JS_EXPIRETIME; -- int32_t JS_TIMELIMIT; -+ __s32 JS_TIMEOUT; -+ __s32 BUSY; -+ __s32 JS_EXPIRETIME; -+ __s32 JS_TIMELIMIT; - struct JS_DATA_TYPE JS_SAVE; - struct JS_DATA_TYPE JS_CORR; - }; - - struct JS_DATA_SAVE_TYPE_64 { -- int32_t JS_TIMEOUT; -- int32_t BUSY; -- int64_t JS_EXPIRETIME; -- int64_t JS_TIMELIMIT; -+ __s32 JS_TIMEOUT; -+ __s32 BUSY; -+ __s64 JS_EXPIRETIME; -+ __s64 JS_TIMELIMIT; - struct JS_DATA_TYPE JS_SAVE; - struct JS_DATA_TYPE JS_CORR; - }; Modified: linux-kernel-headers/trunk/debian/patches/linux-unistd-errno.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/linux-unistd-errno.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/linux-unistd-errno.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -3,15 +3,15 @@ --- include/linux/unistd.h.orig 2003-10-15 11:11:17.000000000 -0400 +++ include/linux/unistd.h 2003-11-05 09:20:45.000000000 -0500 -@@ -1,7 +1,11 @@ +@@ -1,9 +1,11 @@ #ifndef _LINUX_UNISTD_H_ #define _LINUX_UNISTD_H_ -+#ifdef __KERNEL__ + #ifdef __KERNEL__ extern int errno; +#else +# include <errno.h> -+#endif + #endif /* * Include machine specific syscallX macros Modified: linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -22,13 +22,12 @@ =================================================================== --- include/asm-mips/system.h.orig 2006-06-05 13:18:23.000000000 -0400 +++ include/asm-mips/system.h 2006-06-10 00:22:40.481313069 -0400 -@@ -12,6 +12,8 @@ +@@ -12,5 +12,7 @@ #ifndef _ASM_SYSTEM_H #define _ASM_SYSTEM_H +#ifdef __KERNEL__ + - #include <linux/config.h> #include <linux/types.h> @@ -462,4 +464,6 @@ Modified: linux-kernel-headers/trunk/debian/patches/series =================================================================== --- linux-kernel-headers/trunk/debian/patches/series 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/series 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,5 +1,4 @@ alpha-ansi.patch -p0 -alpha-asm-param.patch -p0 arm-query-module.patch -p0 asm-i386-byteorder-u64.patch -p0 asm-system-and-padding.patch -p0 @@ -30,10 +29,8 @@ sparc-asm-fbio.patch -p0 spinlock.patch -p0 usb.patch -p0 -videodev2-timeval.patch -p0 asm-powerpc-unaligned.patch #linux-input-input_device.patch -linux-joystick.patch linux-futex.patch asm-generic-bitops-fls64.patch asm-generic-div64.patch Deleted: linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch =================================================================== --- linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,18 +0,0 @@ -videodev2.h is needed in userspace by Video4Linux programs. -linux/time.h has a definition of 'struct timeval' which conflicts with the -one in time.h, even though it has the same fields with types of the same -lengths. So just use the userspace one in userspace! - -Index: include/linux/videodev2.h -=================================================================== ---- include/linux/videodev2.h.orig 2006-06-20 05:31:55.000000000 -0400 -+++ include/linux/videodev2.h 2006-06-20 20:46:56.667418632 -0400 -@@ -18,6 +18,8 @@ - #include <linux/poll.h> - #include <linux/device.h> - #include <linux/mutex.h> -+#else -+#include <time.h> - #endif - #include <linux/compiler.h> /* need __user */ - Modified: linux-kernel-headers/trunk/version.h =================================================================== --- linux-kernel-headers/trunk/version.h 2006-09-19 21:23:56 UTC (rev 1804) +++ linux-kernel-headers/trunk/version.h 2006-09-24 16:49:07 UTC (rev 1805) @@ -1,3 +1,3 @@ -#define UTS_RELEASE "2.6.13" -#define LINUX_VERSION_CODE 132621 +#define UTS_RELEASE "2.6.18" +#define LINUX_VERSION_CODE 132626 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
--- End Message ---
Attachment:
signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=