diff --git a/debian/changelog b/debian/changelog index fdc9400b9..c11f2081b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ linux-2.6 (2.6.32-10) UNRELEASED; urgency=low - MSI and MSI-X are disabled if qlx2enablemsix=0 * [sparc64] Make prom entry spinlock NMI safe (Closes: #572442) * firmware: Correct copyright information and add source for CIS files + * Fix first line of kernel-doc for a few functions so that they get valid + manual pages -- maximilian attems Thu, 25 Feb 2010 13:07:47 +0100 diff --git a/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch b/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch new file mode 100644 index 000000000..0d42a9a9b --- /dev/null +++ b/debian/patches/bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch @@ -0,0 +1,107 @@ +From 3c31f07ad0dab02fe17195d32a965d57fd947707 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 14 Feb 2010 14:18:53 +0000 +Subject: [PATCH] Driver core: Fix first line of kernel-doc for a few functions + +The function name must be followed by a space, hypen, space, and a +short description. + +Signed-off-by: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman +--- + drivers/base/firmware_class.c | 2 +- + drivers/base/platform.c | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c +index 0797748..d0dc26a 100644 +--- a/drivers/base/firmware_class.c ++++ b/drivers/base/firmware_class.c +@@ -613,7 +613,7 @@ request_firmware_work_func(void *arg) + } + + /** +- * request_firmware_nowait: asynchronous version of request_firmware ++ * request_firmware_nowait - asynchronous version of request_firmware + * @module: module requesting the firmware + * @uevent: sends uevent to copy the firmware image if this flag + * is non-zero else the firmware copy must be done manually. +diff --git a/drivers/base/platform.c b/drivers/base/platform.c +index 575e08b..1ba9d61 100644 +--- a/drivers/base/platform.c ++++ b/drivers/base/platform.c +@@ -128,7 +128,7 @@ struct platform_object { + }; + + /** +- * platform_device_put ++ * platform_device_put - destroy a platform device + * @pdev: platform device to free + * + * Free all memory associated with a platform device. This function must +@@ -152,7 +152,7 @@ static void platform_device_release(struct device *dev) + } + + /** +- * platform_device_alloc ++ * platform_device_alloc - create a platform device + * @name: base name of the device we're adding + * @id: instance id + * +@@ -177,7 +177,7 @@ struct platform_device *platform_device_alloc(const char *name, int id) + EXPORT_SYMBOL_GPL(platform_device_alloc); + + /** +- * platform_device_add_resources ++ * platform_device_add_resources - add resources to a platform device + * @pdev: platform device allocated by platform_device_alloc to add resources to + * @res: set of resources that needs to be allocated for the device + * @num: number of resources +@@ -202,7 +202,7 @@ int platform_device_add_resources(struct platform_device *pdev, + EXPORT_SYMBOL_GPL(platform_device_add_resources); + + /** +- * platform_device_add_data ++ * platform_device_add_data - add platform-specific data to a platform device + * @pdev: platform device allocated by platform_device_alloc to add resources to + * @data: platform specific data for this platform device + * @size: size of platform specific data +@@ -344,7 +344,7 @@ void platform_device_unregister(struct platform_device *pdev) + EXPORT_SYMBOL_GPL(platform_device_unregister); + + /** +- * platform_device_register_simple ++ * platform_device_register_simple - add a platform-level device and its resources + * @name: base name of the device we're adding + * @id: instance id + * @res: set of resources that needs to be allocated for the device +@@ -396,7 +396,7 @@ error: + EXPORT_SYMBOL_GPL(platform_device_register_simple); + + /** +- * platform_device_register_data ++ * platform_device_register_data - add a platform-level device with platform-specific data + * @parent: parent device for the device we're adding + * @name: base name of the device we're adding + * @id: instance id +@@ -473,7 +473,7 @@ static void platform_drv_shutdown(struct device *_dev) + } + + /** +- * platform_driver_register ++ * platform_driver_register - register a driver for platform-level devices + * @drv: platform driver structure + */ + int platform_driver_register(struct platform_driver *drv) +@@ -491,7 +491,7 @@ int platform_driver_register(struct platform_driver *drv) + EXPORT_SYMBOL_GPL(platform_driver_register); + + /** +- * platform_driver_unregister ++ * platform_driver_unregister - unregister a driver for platform-level devices + * @drv: platform driver structure + */ + void platform_driver_unregister(struct platform_driver *drv) +-- +1.7.0 + diff --git a/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch b/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch new file mode 100644 index 000000000..5808811d2 --- /dev/null +++ b/debian/patches/bugfix/all/lib-fix-first-line-of-kernel-doc.patch @@ -0,0 +1,81 @@ +From 9a86e2bad0b9fbf3290ae496da6dab9536dd6bf7 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Fri, 5 Mar 2010 13:43:17 -0800 +Subject: [PATCH] lib: fix first line of kernel-doc for a few functions + +The function name must be followed by a space, hypen, space, and a short +description. + +Signed-off-by: Ben Hutchings +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + include/linux/list.h | 6 +++--- + lib/bitmap.c | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/include/linux/list.h b/include/linux/list.h +index 5d9c655..8392884 100644 +--- a/include/linux/list.h ++++ b/include/linux/list.h +@@ -498,7 +498,7 @@ static inline void list_splice_tail_init(struct list_head *list, + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + + /** +- * list_for_each_entry_safe_continue ++ * list_for_each_entry_safe_continue - continue list iteration safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. +@@ -514,7 +514,7 @@ static inline void list_splice_tail_init(struct list_head *list, + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + + /** +- * list_for_each_entry_safe_from ++ * list_for_each_entry_safe_from - iterate over list from current point safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. +@@ -529,7 +529,7 @@ static inline void list_splice_tail_init(struct list_head *list, + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + + /** +- * list_for_each_entry_safe_reverse ++ * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. +diff --git a/lib/bitmap.c b/lib/bitmap.c +index 11bf497..61998c5 100644 +--- a/lib/bitmap.c ++++ b/lib/bitmap.c +@@ -487,7 +487,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen, + EXPORT_SYMBOL(__bitmap_parse); + + /** +- * bitmap_parse_user() ++ * bitmap_parse_user - convert an ASCII hex string in a user buffer into a bitmap + * + * @ubuf: pointer to user buffer containing string. + * @ulen: buffer size in bytes. If string is smaller than this +@@ -619,7 +619,7 @@ int bitmap_parselist(const char *bp, unsigned long *maskp, int nmaskbits) + EXPORT_SYMBOL(bitmap_parselist); + + /** +- * bitmap_pos_to_ord(buf, pos, bits) ++ * bitmap_pos_to_ord - find ordinal of set bit at given position in bitmap + * @buf: pointer to a bitmap + * @pos: a bit position in @buf (0 <= @pos < @bits) + * @bits: number of valid bit positions in @buf +@@ -655,7 +655,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, int pos, int bits) + } + + /** +- * bitmap_ord_to_pos(buf, ord, bits) ++ * bitmap_ord_to_pos - find position of n-th set bit in bitmap + * @buf: pointer to bitmap + * @ord: ordinal bit position (n-th set bit, n >= 0) + * @bits: number of valid bit positions in @buf +-- +1.7.0 + diff --git a/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch b/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch new file mode 100644 index 000000000..f8356a88e --- /dev/null +++ b/debian/patches/bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch @@ -0,0 +1,38 @@ +From a6a1af184afadb15482b47fa2cc3d1ff50718729 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 14 Feb 2010 05:11:49 +0000 +Subject: [PATCH 5/5] mptscsih: Fix first line of kernel-doc for a few functions + +The function name must be followed by a space, hypen, space, and a +short description. +--- + drivers/message/fusion/mptscsih.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c +index 4a7d1af..53516ed 100644 +--- a/drivers/message/fusion/mptscsih.c ++++ b/drivers/message/fusion/mptscsih.c +@@ -2560,9 +2560,7 @@ mptscsih_getclear_scsi_lookup(MPT_ADAPTER *ioc, int i) + } + + /** +- * mptscsih_set_scsi_lookup +- * +- * writes a scmd entry into the ScsiLookup[] array list ++ * mptscsih_set_scsi_lookup - write a scmd entry into the ScsiLookup[] array list + * + * @ioc: Pointer to MPT_ADAPTER structure + * @i: index into the array +@@ -2725,7 +2723,7 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, + + + /** +- * mptscsih_get_completion_code - ++ * mptscsih_get_completion_code - get completion code from MPT request + * @ioc: Pointer to MPT_ADAPTER structure + * @req: Pointer to original MPT request frame + * @reply: Pointer to MPT reply frame (NULL if TurboReply) +-- +1.7.0 + diff --git a/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch b/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch new file mode 100644 index 000000000..da01aa48e --- /dev/null +++ b/debian/patches/bugfix/all/net-Fix-first-line-of-kernel-doc.patch @@ -0,0 +1,64 @@ +From a66096c37e202b623264b1a784562322a76dea03 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sun, 14 Feb 2010 05:04:36 +0000 +Subject: [PATCH 3/5] net: Fix first line of kernel-doc for a few functions + +The function name must be followed by a space, hypen, space, and a +short description. +--- + include/linux/skbuff.h | 4 ++-- + include/net/sock.h | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index ae836fd..ba0f8e3 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -738,7 +738,7 @@ static inline struct sk_buff *skb_unshare(struct sk_buff *skb, + } + + /** +- * skb_peek ++ * skb_peek - peek at the head of an &sk_buff_head + * @list_: list to peek at + * + * Peek an &sk_buff. Unlike most other operations you _MUST_ +@@ -759,7 +759,7 @@ static inline struct sk_buff *skb_peek(struct sk_buff_head *list_) + } + + /** +- * skb_peek_tail ++ * skb_peek_tail - peek at the tail of an &sk_buff_head + * @list_: list to peek at + * + * Peek an &sk_buff. Unlike most other operations you _MUST_ +diff --git a/include/net/sock.h b/include/net/sock.h +index c8d4000..580d51f 100644 +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -1049,7 +1049,7 @@ extern void sk_common_release(struct sock *sk); + extern void sock_init_data(struct socket *sock, struct sock *sk); + + /** +- * sk_filter_release: Release a socket filter ++ * sk_filter_release - release a socket filter + * @fp: filter to remove + * + * Remove a filter from a socket and release its resources. +diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c +index 9ac493f..8d63f8f 100644 +--- a/net/sunrpc/rpc_pipe.c ++++ b/net/sunrpc/rpc_pipe.c +@@ -78,7 +78,7 @@ rpc_timeout_upcall_queue(struct work_struct *work) + } + + /** +- * rpc_queue_upcall ++ * rpc_queue_upcall - queue an upcall message to userspace + * @inode: inode of upcall pipe on which to queue given message + * @msg: message to queue + * +-- +1.7.0 + diff --git a/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch b/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch new file mode 100644 index 000000000..4953e0c43 --- /dev/null +++ b/debian/patches/bugfix/all/video-fix-first-line-of-kernel-doc.patch @@ -0,0 +1,58 @@ +From a8b1925430339be1464a9a028754d94984dacfdb Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 10 Mar 2010 15:21:49 -0800 +Subject: [PATCH] video: fix first line of kernel-doc for a few functions + +The function name must be followed by a space, hypen, space, and a short +description. + +Signed-off-by: Ben Hutchings +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + drivers/video/modedb.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c +index 0129f1b..b895aae 100644 +--- a/drivers/video/modedb.c ++++ b/drivers/video/modedb.c +@@ -893,7 +893,7 @@ const struct fb_videomode *fb_match_mode(const struct fb_var_screeninfo *var, + } + + /** +- * fb_add_videomode: adds videomode entry to modelist ++ * fb_add_videomode - adds videomode entry to modelist + * @mode: videomode to add + * @head: struct list_head of modelist + * +@@ -928,7 +928,7 @@ int fb_add_videomode(const struct fb_videomode *mode, struct list_head *head) + } + + /** +- * fb_delete_videomode: removed videomode entry from modelist ++ * fb_delete_videomode - removed videomode entry from modelist + * @mode: videomode to remove + * @head: struct list_head of modelist + * +@@ -953,7 +953,7 @@ void fb_delete_videomode(const struct fb_videomode *mode, + } + + /** +- * fb_destroy_modelist: destroy modelist ++ * fb_destroy_modelist - destroy modelist + * @head: struct list_head of modelist + */ + void fb_destroy_modelist(struct list_head *head) +@@ -968,7 +968,7 @@ void fb_destroy_modelist(struct list_head *head) + EXPORT_SYMBOL_GPL(fb_destroy_modelist); + + /** +- * fb_videomode_to_modelist: convert mode array to mode list ++ * fb_videomode_to_modelist - convert mode array to mode list + * @modedb: array of struct fb_videomode + * @num: number of entries in array + * @head: struct list_head of modelist +-- +1.7.0 + diff --git a/debian/patches/series/10 b/debian/patches/series/10 index c07bf0a9f..529d59a29 100644 --- a/debian/patches/series/10 +++ b/debian/patches/series/10 @@ -20,3 +20,8 @@ + debian/drm-restore-private-list_sort.patch + features/all/i915-autoload-without-CONFIG_DRM_I915_KMS-2.patch + features/all/radeon-autoload-without-CONFIG_DRM_RADEON_KMS.patch ++ bugfix/all/Driver-core-Fix-first-line-of-kernel-doc.patch ++ bugfix/all/lib-fix-first-line-of-kernel-doc.patch ++ bugfix/all/net-Fix-first-line-of-kernel-doc.patch ++ bugfix/all/video-fix-first-line-of-kernel-doc.patch ++ bugfix/all/mptscsih-Fix-first-line-of-kernel-doc.patch