Merge branch 'rdunlap' (patches from Randy Dunlap)

+6 -6

Documentation/DocBook/drm.tmpl

··· 79 79 <partintro> 80 80 <para> 81 81 This first part of the DRM Developer's Guide documents core DRM code, 82 - helper libraries for writting drivers and generic userspace interfaces 82 + helper libraries for writing drivers and generic userspace interfaces 83 83 exposed by DRM drivers. 84 84 </para> 85 85 </partintro> ··· 459 459 providing a solution to every graphics memory-related problems, GEM 460 460 identified common code between drivers and created a support library to 461 461 share it. GEM has simpler initialization and execution requirements than 462 - TTM, but has no video RAM management capabitilies and is thus limited to 462 + TTM, but has no video RAM management capabilities and is thus limited to 463 463 UMA devices. 464 464 </para> 465 465 <sect2> ··· 889 889 vice versa. Drivers must use the kernel dma-buf buffer sharing framework 890 890 to manage the PRIME file descriptors. Similar to the mode setting 891 891 API PRIME is agnostic to the underlying buffer object manager, as 892 - long as handles are 32bit unsinged integers. 892 + long as handles are 32bit unsigned integers. 893 893 </para> 894 894 <para> 895 895 While non-GEM drivers must implement the operations themselves, GEM ··· 2356 2356 first create properties and then create and associate individual instances 2357 2357 of those properties to objects. A property can be instantiated multiple 2358 2358 times and associated with different objects. Values are stored in property 2359 - instances, and all other property information are stored in the propery 2359 + instances, and all other property information are stored in the property 2360 2360 and shared between all instances of the property. 2361 2361 </para> 2362 2362 <para> ··· 2697 2697 <sect1> 2698 2698 <title>Legacy Support Code</title> 2699 2699 <para> 2700 - The section very brievely covers some of the old legacy support code which 2700 + The section very briefly covers some of the old legacy support code which 2701 2701 is only used by old DRM drivers which have done a so-called shadow-attach 2702 2702 to the underlying device instead of registering as a real driver. This 2703 - also includes some of the old generic buffer mangement and command 2703 + also includes some of the old generic buffer management and command 2704 2704 submission code. Do not use any of this in new and modern drivers. 2705 2705 </para> 2706 2706

+5 -10

Documentation/email-clients.txt

··· 201 201 202 202 - Edit your Thunderbird config settings so that it won't use format=flowed. 203 203 Go to "edit->preferences->advanced->config editor" to bring up the 204 - thunderbird's registry editor, and set "mailnews.send_plaintext_flowed" to 205 - "false". 204 + thunderbird's registry editor. 206 205 207 - - Disable HTML Format: Set "mail.identity.id1.compose_html" to "false". 206 + - Set "mailnews.send_plaintext_flowed" to "false" 208 207 209 - - Enable "preformat" mode: Set "editor.quotesPreformatted" to "true". 208 + - Set "mailnews.wraplength" from "72" to "0" 210 209 211 - - Enable UTF8: Set "prefs.converted-to-utf8" to "true". 210 + - "View" > "Message Body As" > "Plain Text" 212 211 213 - - Install the "toggle wordwrap" extension. Download the file from: 214 - https://addons.mozilla.org/thunderbird/addon/2351/ 215 - Then go to "tools->add ons", select "install" at the bottom of the screen, 216 - and browse to where you saved the .xul file. This adds an "Enable 217 - Wordwrap" entry under the Options menu of the message composer. 212 + - "View" > "Character Encoding" > "Unicode (UTF-8)" 218 213 219 214 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 220 215 TkRat (GUI)

+3 -2

Documentation/filesystems/proc.txt

··· 1245 1245 1246 1246 The "intr" line gives counts of interrupts serviced since boot time, for each 1247 1247 of the possible system interrupts. The first column is the total of all 1248 - interrupts serviced; each subsequent column is the total for that particular 1249 - interrupt. 1248 + interrupts serviced including unnumbered architecture specific interrupts; 1249 + each subsequent column is the total for that particular numbered interrupt. 1250 + Unnumbered interrupts are not shown, only summed into the total. 1250 1251 1251 1252 The "ctxt" line gives the total number of context switches across all CPUs. 1252 1253

+8

Documentation/java.txt

··· 188 188 #define CP_METHODREF 10 189 189 #define CP_INTERFACEMETHODREF 11 190 190 #define CP_NAMEANDTYPE 12 191 + #define CP_METHODHANDLE 15 192 + #define CP_METHODTYPE 16 193 + #define CP_INVOKEDYNAMIC 18 191 194 192 195 /* Define some commonly used error messages */ 193 196 ··· 245 242 break; 246 243 case CP_CLASS: 247 244 case CP_STRING: 245 + case CP_METHODTYPE: 248 246 seekerr = fseek(classfile, 2, SEEK_CUR); 247 + break; 248 + case CP_METHODHANDLE: 249 + seekerr = fseek(classfile, 3, SEEK_CUR); 249 250 break; 250 251 case CP_INTEGER: 251 252 case CP_FLOAT: ··· 257 250 case CP_METHODREF: 258 251 case CP_INTERFACEMETHODREF: 259 252 case CP_NAMEANDTYPE: 253 + case CP_INVOKEDYNAMIC: 260 254 seekerr = fseek(classfile, 4, SEEK_CUR); 261 255 break; 262 256 case CP_LONG:

Configure Feed

Configure Feed