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

Commit 8006fdd6 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 18ce920a 7c398335

CREDITS

+2 −4
Original line number Original line Diff line number Diff line
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 
S: USA

S: USA





N: Michal Wronski

N: Michal Wronski

E: wrona@mat.uni.torun.pl

E: Michal.Wronski@motorola.com

W: http://www.mat.uni.torun.pl/~wrona

D: POSIX message queues fs (with K. Benedyczak)

D: POSIX message queues fs (with K. Benedyczak)

S: ul. Teczowa 23/12

S: Krakow

S: 80-680 Gdansk-Sobieszewo

S: Poland

S: Poland





N: Frank Xia

N: Frank Xia

Documentation/Changes

+8 −3
Original line number Original line Diff line number Diff line
@@ -139,9 +139,14 @@ You'll probably want to upgrade. 
Ksymoops

Ksymoops

--------

--------





If the unthinkable happens and your kernel oopses, you'll need a 2.4

If the unthinkable happens and your kernel oopses, you may need the

version of ksymoops to decode the report; see REPORTING-BUGS in the

ksymoops tool to decode it, but in most cases you don't.

root of the Linux source for more information.

In the 2.6 kernel it is generally preferred to build the kernel with

CONFIG_KALLSYMS so that it produces readable dumps that can be used as-is

(this also produces better output than ksymoops).

If for some reason your kernel is not build with CONFIG_KALLSYMS and

you have no way to rebuild and reproduce the Oops with that option, then

you can still decode that Oops with ksymoops.





Module-Init-Tools

Module-Init-Tools

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

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

Documentation/DocBook/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml \

	    procfs-guide.xml writing_usb_driver.xml \

	    sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \

	    sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml





###

###

# The build process is as follows (targets):

# The build process is as follows (targets):

Documentation/DocBook/journal-api.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -306,7 +306,7 @@ an example. 
</para>

</para>

	<sect1><title>Journal Level</title>

	<sect1><title>Journal Level</title>

!Efs/jbd/journal.c

!Efs/jbd/journal.c

!Efs/jbd/recovery.c

!Ifs/jbd/recovery.c

	</sect1>

	</sect1>

	<sect1><title>Transasction Level</title>

	<sect1><title>Transasction Level</title>

!Efs/jbd/transaction.c	

!Efs/jbd/transaction.c

Documentation/DocBook/kernel-api.tmpl

+3 −4
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ X!Ilib/string.c 
     </sect1>

     </sect1>

     <sect1><title>User Space Memory Access</title>

     <sect1><title>User Space Memory Access</title>

!Iinclude/asm-i386/uaccess.h

!Iinclude/asm-i386/uaccess.h

!Iarch/i386/lib/usercopy.c

!Earch/i386/lib/usercopy.c

     </sect1>

     </sect1>

     <sect1><title>More Memory Management Functions</title>

     <sect1><title>More Memory Management Functions</title>

!Iinclude/linux/rmap.h

!Iinclude/linux/rmap.h
@@ -174,7 +174,6 @@ X!Ilib/string.c 
     <title>The Linux VFS</title>

     <title>The Linux VFS</title>

     <sect1><title>The Filesystem types</title>

     <sect1><title>The Filesystem types</title>

!Iinclude/linux/fs.h

!Iinclude/linux/fs.h

!Einclude/linux/fs.h

     </sect1>

     </sect1>

     <sect1><title>The Directory Cache</title>

     <sect1><title>The Directory Cache</title>

!Efs/dcache.c

!Efs/dcache.c
@@ -266,7 +265,7 @@ X!Ekernel/module.c 
  <chapter id="hardware">

  <chapter id="hardware">

     <title>Hardware Interfaces</title>

     <title>Hardware Interfaces</title>

     <sect1><title>Interrupt Handling</title>

     <sect1><title>Interrupt Handling</title>

!Ikernel/irq/manage.c

!Ekernel/irq/manage.c

     </sect1>

     </sect1>





     <sect1><title>Resources Management</title>

     <sect1><title>Resources Management</title>
@@ -501,7 +500,7 @@ KAO --> 
!Edrivers/video/modedb.c

!Edrivers/video/modedb.c

     </sect1>

     </sect1>

     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>

     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>

!Idrivers/video/macmodes.c

!Edrivers/video/macmodes.c

     </sect1>

     </sect1>

     <sect1><title>Frame Buffer Fonts</title>

     <sect1><title>Frame Buffer Fonts</title>

        <para>

        <para>