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

Commit a0738a68 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/urgent 



Merge reason: pull in latest, to be able to revert a patch there.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 89ccf465 a3ccf63e

Documentation/debugging-via-ohci1394.txt

+4 −4
Original line number Diff line number Diff line
@@ -64,14 +64,14 @@ be used to view the printk buffer of a remote machine, even with live update. 


Bernhard Kaindl enhanced firescope to support accessing 64-bit machines

from 32-bit firescope and vice versa:

- ftp://ftp.suse.de/private/bk/firewire/tools/firescope-0.2.2.tar.bz2

- http://halobates.de/firewire/firescope-0.2.2.tar.bz2



and he implemented fast system dump (alpha version - read README.txt):

- ftp://ftp.suse.de/private/bk/firewire/tools/firedump-0.1.tar.bz2

- http://halobates.de/firewire/firedump-0.1.tar.bz2



There is also a gdb proxy for firewire which allows to use gdb to access

data which can be referenced from symbols found by gdb in vmlinux:

- ftp://ftp.suse.de/private/bk/firewire/tools/fireproxy-0.33.tar.bz2

- http://halobates.de/firewire/fireproxy-0.33.tar.bz2



The latest version of this gdb proxy (fireproxy-0.34) can communicate (not

yet stable) with kgdb over an memory-based communication module (kgdbom).
@@ -178,7 +178,7 @@ Step-by-step instructions for using firescope with early OHCI initialization: 


Notes

-----

Documentation and specifications: ftp://ftp.suse.de/private/bk/firewire/docs

Documentation and specifications: http://halobates.de/firewire/



FireWire is a trademark of Apple Inc. - for more information please refer to:

http://en.wikipedia.org/wiki/FireWire

Documentation/filesystems/ext3.txt

+12 −4
Original line number Diff line number Diff line
@@ -123,10 +123,18 @@ resuid=n The user ID which may use the reserved blocks. 


sb=n			Use alternate superblock at this location.



quota

noquota

grpquota

usrquota

quota			These options are ignored by the filesystem. They

noquota			are used only by quota tools to recognize volumes

grpquota		where quota should be turned on. See documentation

usrquota		in the quota-tools package for more details

			(http://sourceforge.net/projects/linuxquota).



jqfmt=<quota type>	These options tell filesystem details about quota

usrjquota=<file>	so that quota information can be properly updated

grpjquota=<file>	during journal replay. They replace the above

			quota options. See documentation in the quota-tools

			package for more details

			(http://sourceforge.net/projects/linuxquota).



bh		(*)	ext3 associates buffer heads to data pages to

nobh			(a) cache disk block mapping information

Documentation/infiniband/user_mad.txt

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ Setting IsSM Capability Bit 
  To create the appropriate character device files automatically with

  udev, a rule like



    KERNEL="umad*", NAME="infiniband/%k"

    KERNEL="issm*", NAME="infiniband/%k"

    KERNEL=="umad*", NAME="infiniband/%k"

    KERNEL=="issm*", NAME="infiniband/%k"



  can be used.  This will create device nodes named

Documentation/infiniband/user_verbs.txt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ Memory pinning 
  To create the appropriate character device files automatically with

  udev, a rule like



    KERNEL="uverbs*", NAME="infiniband/%k"

    KERNEL=="uverbs*", NAME="infiniband/%k"



  can be used.  This will create device nodes named

Documentation/scsi/hptiop.txt

+20 −1
Original line number Diff line number Diff line
@@ -3,6 +3,25 @@ HIGHPOINT ROCKETRAID 3xxx/4xxx ADAPTER DRIVER (hptiop) 
Controller Register Map

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



For RR44xx Intel IOP based adapters, the controller IOP is accessed via PCI BAR0 and BAR2:



     BAR0 offset    Register

            0x11C5C Link Interface IRQ Set

            0x11C60 Link Interface IRQ Clear



     BAR2 offset    Register

            0x10    Inbound Message Register 0

            0x14    Inbound Message Register 1

            0x18    Outbound Message Register 0

            0x1C    Outbound Message Register 1

            0x20    Inbound Doorbell Register

            0x24    Inbound Interrupt Status Register

            0x28    Inbound Interrupt Mask Register

            0x30    Outbound Interrupt Status Register

            0x34    Outbound Interrupt Mask Register

            0x40    Inbound Queue Port

            0x44    Outbound Queue Port



For Intel IOP based adapters, the controller IOP is accessed via PCI BAR0:



     BAR0 offset    Register
@@ -93,7 +112,7 @@ The driver exposes following sysfs attributes: 




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

Copyright (C) 2006-2007 HighPoint Technologies, Inc. All Rights Reserved.

Copyright (C) 2006-2009 HighPoint Technologies, Inc. All Rights Reserved.



  This file is distributed in the hope that it will be useful,

  but WITHOUT ANY WARRANTY; without even the implied warranty of