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

Commit ece928df authored by Joel Becker's avatar Joel Becker
Browse files

Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window 

Conflicts:
	fs/ocfs2/ioctl.c
parents 3d1c1829 dda54e76

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ modules.builtin 
include/config

include/config

include/linux/version.h

include/linux/version.h

include/generated

include/generated

arch/*/include/generated





# stgit generated dirs

# stgit generated dirs

patches-*

patches-*

Documentation/DocBook/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ installmandocs: mandocs 
###

###

#External programs used

#External programs used

KERNELDOC = $(srctree)/scripts/kernel-doc

KERNELDOC = $(srctree)/scripts/kernel-doc

DOCPROC   = $(objtree)/scripts/basic/docproc

DOCPROC   = $(objtree)/scripts/docproc





XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl

XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl

XMLTOFLAGS += --skip-validation

XMLTOFLAGS += --skip-validation

Documentation/filesystems/ubifs.txt

+2 −24
Original line number Original line Diff line number Diff line
@@ -115,28 +115,8 @@ ubi.mtd=0 root=ubi0:rootfs rootfstype=ubifs 
Module Parameters for Debugging

Module Parameters for Debugging

===============================

===============================





When UBIFS has been compiled with debugging enabled, there are 3 module

When UBIFS has been compiled with debugging enabled, there are 2 module

parameters that are available to control aspects of testing and debugging.

parameters that are available to control aspects of testing and debugging.

The parameters are unsigned integers where each bit controls an option.

The parameters are:



debug_msgs	Selects which debug messages to display, as follows:



		Message Type				Flag value



		General messages			1

		Journal messages			2

		Mount messages				4

		Commit messages				8

		LEB search messages			16

		Budgeting messages			32

		Garbage collection messages		64

		Tree Node Cache (TNC) messages		128

		LEB properties (lprops) messages	256

		Input/output messages			512

		Log messages				1024

		Scan messages				2048

		Recovery messages			4096





debug_chks	Selects extra checks that UBIFS can do while running:

debug_chks	Selects extra checks that UBIFS can do while running:
@@ -154,11 +134,9 @@ debug_tsts Selects a mode of testing, as follows: 




		Test mode				Flag value

		Test mode				Flag value





		Force in-the-gaps method		2

		Failure mode for recovery testing	4

		Failure mode for recovery testing	4





For example, set debug_msgs to 5 to display General messages and Mount

For example, set debug_chks to 3 to enable general and TNC checks.

messages.









References

References

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ Supported adapters: 
  * Intel 6 Series (PCH)

  * Intel 6 Series (PCH)

  * Intel Patsburg (PCH)

  * Intel Patsburg (PCH)

  * Intel DH89xxCC (PCH)

  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

   Datasheets: Publicly available at the Intel website

   Datasheets: Publicly available at the Intel website





On Intel Patsburg and later chipsets, both the normal host SMBus controller

On Intel Patsburg and later chipsets, both the normal host SMBus controller

Documentation/i2c/writing-clients

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ static struct i2c_driver foo_driver = { 
		.name	= "foo",

		.name	= "foo",

	},

	},





	.id_table	= foo_ids,

	.id_table	= foo_idtable,

	.probe		= foo_probe,

	.probe		= foo_probe,

	.remove		= foo_remove,

	.remove		= foo_remove,

	/* if device autodetection is needed: */

	/* if device autodetection is needed: */