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

Commit ac7c5353 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6'

parents a8f75ea7 120dd64c
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -271,8 +271,6 @@ netlabel/
	- directory with information on the NetLabel subsystem.
	- directory with information on the NetLabel subsystem.
networking/
networking/
	- directory with info on various aspects of networking with Linux.
	- directory with info on various aspects of networking with Linux.
nfsroot.txt
	- short guide on setting up a diskless box with NFS root filesystem.
nmi_watchdog.txt
nmi_watchdog.txt
	- info on NMI watchdog for SMP systems.
	- info on NMI watchdog for SMP systems.
nommu-mmap.txt
nommu-mmap.txt
@@ -321,8 +319,6 @@ robust-futexes.txt
	- a description of what robust futexes are.
	- a description of what robust futexes are.
rocket.txt
rocket.txt
	- info on the Comtrol RocketPort multiport serial driver.
	- info on the Comtrol RocketPort multiport serial driver.
rpc-cache.txt
	- introduction to the caching mechanisms in the sunrpc layer.
rt-mutex-design.txt
rt-mutex-design.txt
	- description of the RealTime mutex implementation design.
	- description of the RealTime mutex implementation design.
rt-mutex.txt
rt-mutex.txt
+52 −4
Original line number Original line Diff line number Diff line
@@ -328,7 +328,7 @@ now, but you can do this to mark internal company procedures or just
point out some special detail about the sign-off. 
point out some special detail about the sign-off. 




13) When to use Acked-by:
13) When to use Acked-by: and Cc:


The Signed-off-by: tag indicates that the signer was involved in the
The Signed-off-by: tag indicates that the signer was involved in the
development of the patch, or that he/she was in the patch's delivery path.
development of the patch, or that he/she was in the patch's delivery path.
@@ -352,8 +352,56 @@ the part which affects that maintainer's code. Judgement should be used here.
When in doubt people should refer to the original discussion in the mailing
When in doubt people should refer to the original discussion in the mailing
list archives.
list archives.


If a person has had the opportunity to comment on a patch, but has not
provided such comments, you may optionally add a "Cc:" tag to the patch.
This is the only tag which might be added without an explicit action by the
person it names.  This tag documents that potentially interested parties
have been included in the discussion


14) The canonical patch format

14) Using Test-by: and Reviewed-by:

A Tested-by: tag indicates that the patch has been successfully tested (in
some environment) by the person named.  This tag informs maintainers that
some testing has been performed, provides a means to locate testers for
future patches, and ensures credit for the testers.

Reviewed-by:, instead, indicates that the patch has been reviewed and found
acceptable according to the Reviewer's Statement:

	Reviewer's statement of oversight

	By offering my Reviewed-by: tag, I state that:

 	 (a) I have carried out a technical review of this patch to
	     evaluate its appropriateness and readiness for inclusion into
	     the mainline kernel.

	 (b) Any problems, concerns, or questions relating to the patch
	     have been communicated back to the submitter.  I am satisfied
	     with the submitter's response to my comments.

	 (c) While there may be things that could be improved with this
	     submission, I believe that it is, at this time, (1) a
	     worthwhile modification to the kernel, and (2) free of known
	     issues which would argue against its inclusion.

	 (d) While I have reviewed the patch and believe it to be sound, I
	     do not (unless explicitly stated elsewhere) make any
	     warranties or guarantees that it will achieve its stated
	     purpose or function properly in any given situation.

A Reviewed-by tag is a statement of opinion that the patch is an
appropriate modification of the kernel without any remaining serious
technical issues.  Any interested reviewer (who has done the work) can
offer a Reviewed-by tag for a patch.  This tag serves to give credit to
reviewers and to inform maintainers of the degree of review which has been
done on the patch.  Reviewed-by: tags, when supplied by reviewers known to
understand the subject area and to perform thorough reviews, will normally
increase the liklihood of your patch getting into the kernel.


15) The canonical patch format


The canonical patch subject line is:
The canonical patch subject line is:


@@ -512,7 +560,7 @@ They provide type safety, have no length limitations, no formatting
limitations, and under gcc they are as cheap as macros.
limitations, and under gcc they are as cheap as macros.


Macros should only be used for cases where a static inline is clearly
Macros should only be used for cases where a static inline is clearly
suboptimal [there a few, isolated cases of this in fast paths],
suboptimal [there are a few, isolated cases of this in fast paths],
or where it is impossible to use a static inline function [such as
or where it is impossible to use a static inline function [such as
string-izing].
string-izing].


+6 −0
Original line number Original line Diff line number Diff line
@@ -66,6 +66,8 @@ mandatory-locking.txt
	- info on the Linux implementation of Sys V mandatory file locking.
	- info on the Linux implementation of Sys V mandatory file locking.
ncpfs.txt
ncpfs.txt
	- info on Novell Netware(tm) filesystem using NCP protocol.
	- info on Novell Netware(tm) filesystem using NCP protocol.
nfsroot.txt
	- short guide on setting up a diskless box with NFS root filesystem.
ntfs.txt
ntfs.txt
	- info and mount options for the NTFS filesystem (Windows NT).
	- info and mount options for the NTFS filesystem (Windows NT).
ocfs2.txt
ocfs2.txt
@@ -82,6 +84,10 @@ relay.txt
	- info on relay, for efficient streaming from kernel to user space.
	- info on relay, for efficient streaming from kernel to user space.
romfs.txt
romfs.txt
	- description of the ROMFS filesystem.
	- description of the ROMFS filesystem.
rpc-cache.txt
	- introduction to the caching mechanisms in the sunrpc layer.
seq_file.txt
	- how to use the seq_file API
sharedsubtree.txt
sharedsubtree.txt
	- a description of shared subtrees for namespaces.
	- a description of shared subtrees for namespaces.
smbfs.txt
smbfs.txt
Loading