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

Commit a9931a6e authored by Jody McIntyre's avatar Jody McIntyre
Browse files

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

parents 7301c8d3 811803c5

CREDITS

+3 −5
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ S: 80050-430 - Curitiba - Paran 
S: Brazil



N: Kumar Gala

E: kumar.gala@freescale.com

E: galak@kernel.crashing.org

D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support

S: Austin, Texas 78729

S: USA
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 
S: USA



N: Michal Wronski

E: wrona@mat.uni.torun.pl

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

E: Michal.Wronski@motorola.com

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

S: ul. Teczowa 23/12

S: 80-680 Gdansk-Sobieszewo

S: Krakow

S: Poland



N: Frank Xia

Documentation/Changes

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

--------



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

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

root of the Linux source for more information.

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

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

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

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

Documentation/DocBook/Makefile

+34 −16
Original line number 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 \

	    procfs-guide.xml writing_usb_driver.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):
@@ -20,6 +20,12 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
#                        +--> DIR=file  (htmldocs)

#                        +--> man/      (mandocs)





# for PDF and PS output you can choose between xmlto and docbook-utils tools

PDF_METHOD	= $(prefer-db2x)

PS_METHOD	= $(prefer-db2x)





###

# The targets that may be used.

.PHONY:	xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
@@ -93,27 +99,39 @@ C-procfs-example = procfs_example.xml 
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)



###

# Rules to generate postscript, PDF and HTML

# db2html creates a directory. Generate a html file used for timestamp

notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \

		   exit 1

db2xtemplate = db2TYPE -o $(dir $@) $<

xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<



# determine which methods are available

ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)

	use-db2x = db2x

	prefer-db2x = db2x

else

	use-db2x = notfound

	prefer-db2x = $(use-xmlto)

endif

ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)

	use-xmlto = xmlto

	prefer-xmlto = xmlto

else

	use-xmlto = notfound

	prefer-xmlto = $(use-db2x)

endif



quiet_cmd_db2ps = XMLTO    $@

      cmd_db2ps = xmlto ps $(XMLTOFLAGS) -o $(dir $@) $<

# the commands, generated from the chosen template

quiet_cmd_db2ps = PS      $@

      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))

%.ps : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2ps)



quiet_cmd_db2pdf = XMLTO   $@

      cmd_db2pdf = xmlto pdf $(XMLTOFLAGS) -o $(dir $@) $<

quiet_cmd_db2pdf = PDF      $@

      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))

%.pdf : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2pdf)



quiet_cmd_db2html = XMLTO  $@

quiet_cmd_db2html = HTML   $@

      cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \

		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \

         Goto $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
@@ -127,7 +145,7 @@ quiet_cmd_db2html = XMLTO $@ 
	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \

            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi



quiet_cmd_db2man = XMLTO   $@

quiet_cmd_db2man = MAN     $@

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi

%.9 : %.xml

	@(which xmlto > /dev/null 2>&1) || \

Documentation/DocBook/journal-api.tmpl

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

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

!Efs/jbd/journal.c

!Efs/jbd/recovery.c

!Ifs/jbd/recovery.c

	</sect1>

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

!Efs/jbd/transaction.c

Documentation/DocBook/kernel-api.tmpl

+5 −8
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ X!Iinclude/linux/kobject.h 


     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

<!-- This needs to clean up to make kernel-doc happy

X!Ekernel/printk.c

 -->

!Ekernel/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c
@@ -118,7 +116,7 @@ X!Ilib/string.c 
     </sect1>

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

!Iinclude/asm-i386/uaccess.h

!Iarch/i386/lib/usercopy.c

!Earch/i386/lib/usercopy.c

     </sect1>

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

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

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

!Iinclude/linux/fs.h

!Einclude/linux/fs.h

     </sect1>

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

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

     <title>Hardware Interfaces</title>

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

!Ikernel/irq/manage.c

!Ekernel/irq/manage.c

     </sect1>



     <sect1><title>Resources Management</title>
@@ -389,7 +386,7 @@ X!Edrivers/pnp/system.c 


  <chapter id="blkdev">

     <title>Block Devices</title>

!Edrivers/block/ll_rw_blk.c

!Eblock/ll_rw_blk.c

  </chapter>



  <chapter id="miscdev">
@@ -501,7 +498,7 @@ KAO --> 
!Edrivers/video/modedb.c

     </sect1>

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

!Idrivers/video/macmodes.c

!Edrivers/video/macmodes.c

     </sect1>

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

        <para>