Loading Documentation/filesystems/seq_file.txt +3 −3 Original line number Original line Diff line number Diff line Loading @@ -92,7 +92,7 @@ implementations; in most cases the start() function should check for a "past end of file" condition and return NULL if need be. "past end of file" condition and return NULL if need be. For more complicated applications, the private field of the seq_file For more complicated applications, the private field of the seq_file structure can be used. There is also a special value whch can be returned structure can be used. There is also a special value which can be returned by the start() function called SEQ_START_TOKEN; it can be used if you wish by the start() function called SEQ_START_TOKEN; it can be used if you wish to instruct your show() function (described below) to print a header at the to instruct your show() function (described below) to print a header at the top of the output. SEQ_START_TOKEN should only be used if the offset is top of the output. SEQ_START_TOKEN should only be used if the offset is Loading Loading @@ -146,7 +146,7 @@ the four functions we have just defined: This structure will be needed to tie our iterator to the /proc file in This structure will be needed to tie our iterator to the /proc file in a little bit. a little bit. It's worth noting that the interator value returned by start() and It's worth noting that the iterator value returned by start() and manipulated by the other functions is considered to be completely opaque by manipulated by the other functions is considered to be completely opaque by the seq_file code. It can thus be anything that is useful in stepping the seq_file code. It can thus be anything that is useful in stepping through the data to be output. Counters can be useful, but it could also be through the data to be output. Counters can be useful, but it could also be Loading Documentation/networking/can.txt +4 −4 Original line number Original line Diff line number Diff line Loading @@ -281,10 +281,10 @@ solution for a couple of reasons: sa_family_t can_family; sa_family_t can_family; int can_ifindex; int can_ifindex; union { union { struct { canid_t rx_id, tx_id; } tp16; /* transport protocol class address info (e.g. ISOTP) */ struct { canid_t rx_id, tx_id; } tp20; struct { canid_t rx_id, tx_id; } tp; struct { canid_t rx_id, tx_id; } mcnet; struct { canid_t rx_id, tx_id; } isotp; /* reserved for future CAN protocols address information */ } can_addr; } can_addr; }; }; Loading Documentation/vm/hugetlbpage.txt +3 −4 Original line number Original line Diff line number Diff line Loading @@ -88,10 +88,9 @@ hugepages from the buddy allocator, if the normal pool is exhausted. As these surplus hugepages go out of use, they are freed back to the buddy these surplus hugepages go out of use, they are freed back to the buddy allocator. allocator. Caveat: Shrinking the pool via nr_hugepages while a surplus is in effect Caveat: Shrinking the pool via nr_hugepages such that it becomes less will allow the number of surplus huge pages to exceed the overcommit than the number of hugepages in use will convert the balance to surplus value, as the pool hugepages (which must have been in use for a surplus huge pages even if it would exceed the overcommit value. As long as hugepages to be allocated) will become surplus hugepages. As long as this condition holds, however, no more surplus huge pages will be this condition holds, however, no more surplus huge pages will be allowed on the system until one of the two sysctls are increased allowed on the system until one of the two sysctls are increased sufficiently, or the surplus huge pages go out of use and are freed. sufficiently, or the surplus huge pages go out of use and are freed. Loading MAINTAINERS +11 −3 Original line number Original line Diff line number Diff line Loading @@ -2116,7 +2116,7 @@ M: reinette.chatre@intel.com L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org L: ipw3945-devel@lists.sourceforge.net L: ipw3945-devel@lists.sourceforge.net W: http://intellinuxwireless.org W: http://intellinuxwireless.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git T: git kernel.org:/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git S: Supported S: Supported IOC3 ETHERNET DRIVER IOC3 ETHERNET DRIVER Loading Loading @@ -2197,7 +2197,7 @@ S: Maintained ISDN SUBSYSTEM ISDN SUBSYSTEM P: Karsten Keil P: Karsten Keil M: kkeil@suse.de M: kkeil@suse.de L: isdn4linux@listserv.isdn4linux.de L: isdn4linux@listserv.isdn4linux.de (subscribers-only) W: http://www.isdn4linux.de W: http://www.isdn4linux.de T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git S: Maintained S: Maintained Loading @@ -2205,7 +2205,7 @@ S: Maintained ISDN SUBSYSTEM (Eicon active card driver) ISDN SUBSYSTEM (Eicon active card driver) P: Armin Schindler P: Armin Schindler M: mac@melware.de M: mac@melware.de L: isdn4linux@listserv.isdn4linux.de L: isdn4linux@listserv.isdn4linux.de (subscribers-only) W: http://www.melware.de W: http://www.melware.de S: Maintained S: Maintained Loading Loading @@ -3280,6 +3280,7 @@ L: linux-wireless@vger.kernel.org L: rt2400-devel@lists.sourceforge.net L: rt2400-devel@lists.sourceforge.net W: http://rt2x00.serialmonkey.com/ W: http://rt2x00.serialmonkey.com/ S: Maintained S: Maintained T: git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git F: drivers/net/wireless/rt2x00/ F: drivers/net/wireless/rt2x00/ RAMDISK RAM BLOCK DEVICE DRIVER RAMDISK RAM BLOCK DEVICE DRIVER Loading Loading @@ -3342,6 +3343,13 @@ L: reiserfs-devel@vger.kernel.org W: http://www.namesys.com W: http://www.namesys.com S: Supported S: Supported RFKILL P: Ivo van Doorn M: IvDoorn@gmail.com L: netdev@vger.kernel.org S: Maintained F: net/rfkill ROCKETPORT DRIVER ROCKETPORT DRIVER P: Comtrol Corp. P: Comtrol Corp. W: http://www.comtrol.com W: http://www.comtrol.com Loading Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 2 VERSION = 2 PATCHLEVEL = 6 PATCHLEVEL = 6 SUBLEVEL = 25 SUBLEVEL = 25 EXTRAVERSION = -rc9 EXTRAVERSION = NAME = Funky Weasel is Jiggy wit it NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION* # *DOCUMENTATION* Loading Loading
Documentation/filesystems/seq_file.txt +3 −3 Original line number Original line Diff line number Diff line Loading @@ -92,7 +92,7 @@ implementations; in most cases the start() function should check for a "past end of file" condition and return NULL if need be. "past end of file" condition and return NULL if need be. For more complicated applications, the private field of the seq_file For more complicated applications, the private field of the seq_file structure can be used. There is also a special value whch can be returned structure can be used. There is also a special value which can be returned by the start() function called SEQ_START_TOKEN; it can be used if you wish by the start() function called SEQ_START_TOKEN; it can be used if you wish to instruct your show() function (described below) to print a header at the to instruct your show() function (described below) to print a header at the top of the output. SEQ_START_TOKEN should only be used if the offset is top of the output. SEQ_START_TOKEN should only be used if the offset is Loading Loading @@ -146,7 +146,7 @@ the four functions we have just defined: This structure will be needed to tie our iterator to the /proc file in This structure will be needed to tie our iterator to the /proc file in a little bit. a little bit. It's worth noting that the interator value returned by start() and It's worth noting that the iterator value returned by start() and manipulated by the other functions is considered to be completely opaque by manipulated by the other functions is considered to be completely opaque by the seq_file code. It can thus be anything that is useful in stepping the seq_file code. It can thus be anything that is useful in stepping through the data to be output. Counters can be useful, but it could also be through the data to be output. Counters can be useful, but it could also be Loading
Documentation/networking/can.txt +4 −4 Original line number Original line Diff line number Diff line Loading @@ -281,10 +281,10 @@ solution for a couple of reasons: sa_family_t can_family; sa_family_t can_family; int can_ifindex; int can_ifindex; union { union { struct { canid_t rx_id, tx_id; } tp16; /* transport protocol class address info (e.g. ISOTP) */ struct { canid_t rx_id, tx_id; } tp20; struct { canid_t rx_id, tx_id; } tp; struct { canid_t rx_id, tx_id; } mcnet; struct { canid_t rx_id, tx_id; } isotp; /* reserved for future CAN protocols address information */ } can_addr; } can_addr; }; }; Loading
Documentation/vm/hugetlbpage.txt +3 −4 Original line number Original line Diff line number Diff line Loading @@ -88,10 +88,9 @@ hugepages from the buddy allocator, if the normal pool is exhausted. As these surplus hugepages go out of use, they are freed back to the buddy these surplus hugepages go out of use, they are freed back to the buddy allocator. allocator. Caveat: Shrinking the pool via nr_hugepages while a surplus is in effect Caveat: Shrinking the pool via nr_hugepages such that it becomes less will allow the number of surplus huge pages to exceed the overcommit than the number of hugepages in use will convert the balance to surplus value, as the pool hugepages (which must have been in use for a surplus huge pages even if it would exceed the overcommit value. As long as hugepages to be allocated) will become surplus hugepages. As long as this condition holds, however, no more surplus huge pages will be this condition holds, however, no more surplus huge pages will be allowed on the system until one of the two sysctls are increased allowed on the system until one of the two sysctls are increased sufficiently, or the surplus huge pages go out of use and are freed. sufficiently, or the surplus huge pages go out of use and are freed. Loading
MAINTAINERS +11 −3 Original line number Original line Diff line number Diff line Loading @@ -2116,7 +2116,7 @@ M: reinette.chatre@intel.com L: linux-wireless@vger.kernel.org L: linux-wireless@vger.kernel.org L: ipw3945-devel@lists.sourceforge.net L: ipw3945-devel@lists.sourceforge.net W: http://intellinuxwireless.org W: http://intellinuxwireless.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git T: git kernel.org:/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git S: Supported S: Supported IOC3 ETHERNET DRIVER IOC3 ETHERNET DRIVER Loading Loading @@ -2197,7 +2197,7 @@ S: Maintained ISDN SUBSYSTEM ISDN SUBSYSTEM P: Karsten Keil P: Karsten Keil M: kkeil@suse.de M: kkeil@suse.de L: isdn4linux@listserv.isdn4linux.de L: isdn4linux@listserv.isdn4linux.de (subscribers-only) W: http://www.isdn4linux.de W: http://www.isdn4linux.de T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git S: Maintained S: Maintained Loading @@ -2205,7 +2205,7 @@ S: Maintained ISDN SUBSYSTEM (Eicon active card driver) ISDN SUBSYSTEM (Eicon active card driver) P: Armin Schindler P: Armin Schindler M: mac@melware.de M: mac@melware.de L: isdn4linux@listserv.isdn4linux.de L: isdn4linux@listserv.isdn4linux.de (subscribers-only) W: http://www.melware.de W: http://www.melware.de S: Maintained S: Maintained Loading Loading @@ -3280,6 +3280,7 @@ L: linux-wireless@vger.kernel.org L: rt2400-devel@lists.sourceforge.net L: rt2400-devel@lists.sourceforge.net W: http://rt2x00.serialmonkey.com/ W: http://rt2x00.serialmonkey.com/ S: Maintained S: Maintained T: git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git F: drivers/net/wireless/rt2x00/ F: drivers/net/wireless/rt2x00/ RAMDISK RAM BLOCK DEVICE DRIVER RAMDISK RAM BLOCK DEVICE DRIVER Loading Loading @@ -3342,6 +3343,13 @@ L: reiserfs-devel@vger.kernel.org W: http://www.namesys.com W: http://www.namesys.com S: Supported S: Supported RFKILL P: Ivo van Doorn M: IvDoorn@gmail.com L: netdev@vger.kernel.org S: Maintained F: net/rfkill ROCKETPORT DRIVER ROCKETPORT DRIVER P: Comtrol Corp. P: Comtrol Corp. W: http://www.comtrol.com W: http://www.comtrol.com Loading
Makefile +1 −1 Original line number Original line Diff line number Diff line VERSION = 2 VERSION = 2 PATCHLEVEL = 6 PATCHLEVEL = 6 SUBLEVEL = 25 SUBLEVEL = 25 EXTRAVERSION = -rc9 EXTRAVERSION = NAME = Funky Weasel is Jiggy wit it NAME = Funky Weasel is Jiggy wit it # *DOCUMENTATION* # *DOCUMENTATION* Loading
