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

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

Merge branch 'linux-2.6'

parents f03e64f2 62d0cfcb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3279,7 +3279,7 @@ S: Sevilla 41005
S: Spain

N: Linus Torvalds
E: torvalds@osdl.org
E: torvalds@linux-foundation.org
D: Original kernel hacker
S: 12725 SW Millikan Way, Suite 400
S: Beaverton, Oregon 97005
+4 −0
Original line number Diff line number Diff line
@@ -72,3 +72,7 @@ kernel patches.

    If the new code is substantial, addition of subsystem-specific fault
    injection might be appropriate.

22: Newly-added code has been compiled with `gcc -W'.  This will generate
    lots of noise, but is good for finding bugs like "warning: comparison
    between signed and unsigned".
+3 −3
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ Do not send more than 15 patches at once to the vger mailing lists!!!


Linus Torvalds is the final arbiter of all changes accepted into the
Linux kernel.  His e-mail address is <torvalds@osdl.org>.  He gets
a lot of e-mail, so typically you should do your best to -avoid- sending
him e-mail.
Linux kernel.  His e-mail address is <torvalds@linux-foundation.org>. 
He gets a lot of e-mail, so typically you should do your best to -avoid-
sending him e-mail. 

Patches which are bug fixes, are "obvious" changes, or similarly
require little discussion should be sent or CC'd to Linus.  Patches
+7 −0
Original line number Diff line number Diff line
@@ -318,3 +318,10 @@ Why: /proc/acpi/button has been replaced by events to the input layer
Who:	Len Brown <len.brown@intel.com>

---------------------------

What:	JFFS (version 1)
When:	2.6.21
Why:	Unmaintained for years, superceded by JFFS2 for years.
Who:	Jeff Garzik <jeff@garzik.org>

---------------------------
+17 −3
Original line number Diff line number Diff line
@@ -73,8 +73,22 @@ OPTIONS
RESOURCES
=========

The Linux version of the 9p server is now maintained under the npfs project
on sourceforge (http://sourceforge.net/projects/npfs).
Our current recommendation is to use Inferno (http://www.vitanuova.com/inferno)
as the 9p server.  You can start a 9p server under Inferno by issuing the
following command:
   ; styxlisten -A tcp!*!564 export '#U*'

The -A specifies an unauthenticated export.  The 564 is the port # (you may
have to choose a higher port number if running as a normal user).  The '#U*'
specifies exporting the root of the Linux name space.  You may specify a
subset of the namespace by extending the path: '#U*'/tmp would just export
/tmp.  For more information, see the Inferno manual pages covering styxlisten
and export.

A Linux version of the 9p server is now maintained under the npfs project
on sourceforge (http://sourceforge.net/projects/npfs).  There is also a
more stable single-threaded version of the server (named spfs) available from
the same CVS repository.

There are user and developer mailing lists available through the v9fs project
on sourceforge (http://sourceforge.net/projects/v9fs).
@@ -96,5 +110,5 @@ STATUS

The 2.6 kernel support is working on PPC and x86.

PLEASE USE THE SOURCEFORGE BUG-TRACKER TO REPORT PROBLEMS.
PLEASE USE THE KERNEL BUGZILLA TO REPORT PROBLEMS. (http://bugzilla.kernel.org)
Loading