Commit ca371d28 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

 into sh-latest

Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 0d376945 a0e86bd4

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot

Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

+1 −1
Original line number Diff line number Diff line 
What:		/sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.

Date:		July 2011

KernelVersion:	3.2

Contact:	Michal Malý <madcatxster@gmail.com>

Contact:	Michal Malý <madcatxster@gmail.com>

Description:	Display minimum, maximum and current range of the steering

		wheel. Writing a value within min and max boundaries sets the

		range of the wheel.

Documentation/DocBook/debugobjects.tmpl

+50 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ 
	<listitem><para>debug_object_deactivate</para></listitem>

	<listitem><para>debug_object_destroy</para></listitem>

	<listitem><para>debug_object_free</para></listitem>

	<listitem><para>debug_object_assert_init</para></listitem>

      </itemizedlist>

      Each of these functions takes the address of the real object and

      a pointer to the object type specific debug description
@@ -273,6 +274,26 @@ 
	debug checks.

      </para>

    </sect1>



    <sect1 id="debug_object_assert_init">

      <title>debug_object_assert_init</title>

      <para>

	This function is called to assert that an object has been

	initialized.

      </para>

      <para>

	When the real object is not tracked by debugobjects, it calls

	fixup_assert_init of the object type description structure

	provided by the caller, with the hardcoded object state

	ODEBUG_NOT_AVAILABLE. The fixup function can correct the problem

	by calling debug_object_init and other specific initializing

	functions.

      </para>

      <para>

	When the real object is already tracked by debugobjects it is

	ignored.

      </para>

    </sect1>

  </chapter>

  <chapter id="fixupfunctions">

    <title>Fixup functions</title>
@@ -381,6 +402,35 @@ 
	statistics.

      </para>

    </sect1>

    <sect1 id="fixup_assert_init">

      <title>fixup_assert_init</title>

      <para>

	This function is called from the debug code whenever a problem

	in debug_object_assert_init is detected.

      </para>

      <para>

	Called from debug_object_assert_init() with a hardcoded state

	ODEBUG_STATE_NOTAVAILABLE when the object is not found in the

	debug bucket.

      </para>

      <para>

	The function returns 1 when the fixup was successful,

	otherwise 0. The return value is used to update the

	statistics.

      </para>

      <para>

	Note, this function should make sure debug_object_init() is

	called before returning.

      </para>

      <para>

	The handling of statically initialized objects is a special

	case. The fixup function should check if this is a legitimate

	case of a statically initialized object or not. In this case only

	debug_object_init() should be called to make the object known to

	the tracker. Then the function should return 0 because this is not

	a real fixup.

      </para>

    </sect1>

  </chapter>

  <chapter id="bugs">

    <title>Known Bugs And Assumptions</title>

Documentation/HOWTO

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ versions. 
If no 2.6.x.y kernel is available, then the highest numbered 2.6.x

kernel is the current stable kernel.



2.6.x.y are maintained by the "stable" team <stable@kernel.org>, and are

released as needs dictate.  The normal release period is approximately 

2.6.x.y are maintained by the "stable" team <stable@vger.kernel.org>, and

are released as needs dictate.  The normal release period is approximately

two weeks, but it can be longer if there are no pressing problems.  A

security-related problem, instead, can cause a release to happen almost

instantly.