Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b981d8b3 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c
parents b11d2127 2b9e0aae
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@
#
#
.*
.*
*.o
*.o
*.o.*
*.a
*.a
*.s
*.s
*.ko
*.ko
@@ -22,6 +23,7 @@
tags
tags
TAGS
TAGS
vmlinux*
vmlinux*
!vmlinux.lds.S
System.map
System.map
Module.symvers
Module.symvers


+39 −7
Original line number Original line Diff line number Diff line
@@ -665,6 +665,11 @@ D: Minor updates to SCSI types, added /proc/pid/maps protection
S: (ask for current address)
S: (ask for current address)
S: USA
S: USA


N: Robin Cornelius
E: robincornelius@users.sourceforge.net
D: Ralink rt2x00 WLAN driver
S: Cornwall, U.K.

N: Mark Corner
N: Mark Corner
E: mcorner@umich.edu
E: mcorner@umich.edu
W: http://www.eecs.umich.edu/~mcorner/
W: http://www.eecs.umich.edu/~mcorner/
@@ -679,6 +684,11 @@ D: Kernel module SMART utilities
S: Santa Cruz, California
S: Santa Cruz, California
S: USA
S: USA


N: Luis Correia
E: lfcorreia@users.sf.net
D: Ralink rt2x00 WLAN driver
S: Belas, Portugal

N: Alan Cox
N: Alan Cox
W: http://www.linux.org.uk/diary/
W: http://www.linux.org.uk/diary/
D: Linux Networking (0.99.10->2.0.29)
D: Linux Networking (0.99.10->2.0.29)
@@ -833,6 +843,12 @@ S: Lancs
S: PR4 6AX
S: PR4 6AX
S: United Kingdom
S: United Kingdom


N: Ivo van Doorn
E: IvDoorn@gmail.com
W: http://www.mendiosus.nl
D: Ralink rt2x00 WLAN driver
S: Haarlem, The Netherlands

N: John G Dorsey
N: John G Dorsey
E: john+@cs.cmu.edu
E: john+@cs.cmu.edu
D: ARM Linux ports to Assabet/Neponset, Spot
D: ARM Linux ports to Assabet/Neponset, Spot
@@ -966,6 +982,7 @@ N: Pekka Enberg
E: penberg@cs.helsinki.fi
E: penberg@cs.helsinki.fi
W: http://www.cs.helsinki.fi/u/penberg/
W: http://www.cs.helsinki.fi/u/penberg/
D: Various kernel hacks, fixes, and cleanups.
D: Various kernel hacks, fixes, and cleanups.
D: Slab allocators
S: Finland
S: Finland


N: David Engebretsen
N: David Engebretsen
@@ -1939,8 +1956,8 @@ D: for Menuconfig's lxdialog.
N: Christoph Lameter
N: Christoph Lameter
E: christoph@lameter.com
E: christoph@lameter.com
D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
D: Early protocol filter for bridging code
D: NUMA support, Slab allocators, Page migration
D: Bug fixes
D: Scalability, Time subsystem


N: Paul Laufer
N: Paul Laufer
E: paul@laufernet.com
E: paul@laufernet.com
@@ -2212,13 +2229,13 @@ S: 2300 Copenhagen S
S: Denmark
S: Denmark


N: Claudio S. Matsuoka
N: Claudio S. Matsuoka
E: claudio@conectiva.com
E: cmatsuoka@gmail.com
E: claudio@helllabs.org
E: claudio@mandriva.com
W: http://helllabs.org/~claudio
W: http://helllabs.org/~claudio
D: V4L, OV511 driver hacks
D: V4L, OV511 and HDA-codec hacks
S: Conectiva S.A.
S: Conectiva S.A.
S: R. Tocantins 89
S: Souza Naves 1250
S: 80050-430  Curitiba PR
S: 80050-040  Curitiba PR
S: Brazil
S: Brazil


N: Heinz Mauelshagen
N: Heinz Mauelshagen
@@ -3516,6 +3533,12 @@ S: Maastrichterweg 63
S: 5554 GG Valkenswaard
S: 5554 GG Valkenswaard
S: The Netherlands
S: The Netherlands


N: Mark Wallis
E: mwallis@serialmonkey.com
W: http://mark.serialmonkey.com
D: Ralink rt2x00 WLAN driver
S: Newcastle, Australia

N: Peter Shaobo Wang
N: Peter Shaobo Wang
E: pwang@mmdcorp.com
E: pwang@mmdcorp.com
W: http://www.mmdcorp.com/pw/linux
W: http://www.mmdcorp.com/pw/linux
@@ -3650,6 +3673,15 @@ S: Alte Regensburger Str. 11a
S: 93149 Nittenau
S: 93149 Nittenau
S: Germany
S: Germany


N: Gertjan van Wingerde
E: gwingerde@home.nl
D: Ralink rt2x00 WLAN driver
D: Minix V2 file-system
D: Misc fixes
S: Geessinkweg 177
S: 7544 TX Enschede
S: The Netherlands

N: Lars Wirzenius
N: Lars Wirzenius
E: liw@iki.fi
E: liw@iki.fi
D: Linux System Administrator's Guide, author, former maintainer
D: Linux System Administrator's Guide, author, former maintainer
+0 −2
Original line number Original line Diff line number Diff line
@@ -134,8 +134,6 @@ dvb/
	- info on Linux Digital Video Broadcast (DVB) subsystem.
	- info on Linux Digital Video Broadcast (DVB) subsystem.
early-userspace/
early-userspace/
	- info about initramfs, klibc, and userspace early during boot.
	- info about initramfs, klibc, and userspace early during boot.
ecryptfs.txt
	- docs on eCryptfs: stacked cryptographic filesystem for Linux.
eisa.txt
eisa.txt
	- info on EISA bus support.
	- info on EISA bus support.
exception.txt
exception.txt
+1 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ o nfs-utils 1.0.5 # showmount --version
o  procps                 3.2.0                   # ps --version
o  procps                 3.2.0                   # ps --version
o  oprofile               0.9                     # oprofiled --version
o  oprofile               0.9                     # oprofiled --version
o  udev                   081                     # udevinfo -V
o  udev                   081                     # udevinfo -V
o  grub                   0.93                    # grub --version


Kernel compilation
Kernel compilation
==================
==================
+18 −2
Original line number Original line Diff line number Diff line
@@ -633,12 +633,27 @@ covers RTL which is used frequently with assembly language in the kernel.


Kernel developers like to be seen as literate. Do mind the spelling
Kernel developers like to be seen as literate. Do mind the spelling
of kernel messages to make a good impression. Do not use crippled
of kernel messages to make a good impression. Do not use crippled
words like "dont" and use "do not" or "don't" instead.
words like "dont"; use "do not" or "don't" instead.  Make the messages
concise, clear, and unambiguous.


Kernel messages do not have to be terminated with a period.
Kernel messages do not have to be terminated with a period.


Printing numbers in parentheses (%d) adds no value and should be avoided.
Printing numbers in parentheses (%d) adds no value and should be avoided.


There are a number of driver model diagnostic macros in <linux/device.h>
which you should use to make sure messages are matched to the right device
and driver, and are tagged with the right level:  dev_err(), dev_warn(),
dev_info(), and so forth.  For messages that aren't associated with a
particular device, <linux/kernel.h> defines pr_debug() and pr_info().

Coming up with good debugging messages can be quite a challenge; and once
you have them, they can be a huge help for remote troubleshooting.  Such
messages should be compiled out when the DEBUG symbol is not defined (that
is, by default they are not included).  When you use dev_dbg() or pr_debug(),
that's automatic.  Many subsystems have Kconfig options to turn on -DDEBUG.
A related convention uses VERBOSE_DEBUG to add dev_vdbg() messages to the
ones already enabled by DEBUG.



		Chapter 14: Allocating memory
		Chapter 14: Allocating memory


@@ -790,4 +805,5 @@ Kernel CodingStyle, by greg@kroah.com at OLS 2002:
http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/
http://www.kroah.com/linux/talks/ols_2002_kernel_codingstyle_talk/html/


--
--
Last updated on 2006-December-06.
Last updated on 2007-July-13.
Loading