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

Commit a0afd4f7 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge remote branch 'wireless-next/master' into ath6kl-next 

Conflicts:
	drivers/net/wireless/ath/ath6kl/usb.c
parents e80ec84d a8c1f65c

CREDITS

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




N: Kees Cook

N: Kees Cook

E: kees@outflux.net

E: kees@outflux.net

W: http://outflux.net/

E: kees@ubuntu.com

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

E: keescook@chromium.org

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

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: (ask for current address)

S: Portland, Oregon

S: USA

S: USA





N: Robin Cornelius

N: Robin Cornelius

Documentation/ABI/testing/sysfs-block

+0 −13
Original line number Original line Diff line number Diff line
@@ -206,16 +206,3 @@ Description: 
		when a discarded area is read the discard_zeroes_data

		when a discarded area is read the discard_zeroes_data

		parameter will be set to one. Otherwise it will be 0 and

		parameter will be set to one. Otherwise it will be 0 and

		the result of reading a discarded area is undefined.
 
		the result of reading a discarded area is undefined.
 
What:		/sys/block/<disk>/alias

Date:		Aug 2011

Contact:	Nao Nishijima <nao.nishijima.xt@hitachi.com>

Description:

		A raw device name of a disk does not always point a same disk

		each boot-up time. Therefore, users have to use persistent

		device names, which udev creates when the kernel finds a disk,

		instead of raw device name. However, kernel doesn't show those

		persistent names on its messages (e.g. dmesg).

		This file can store an alias of the disk and it would be

		appeared in kernel messages if it is set. A disk can have an

		alias which length is up to 255bytes. Users can use alphabets,

		numbers, "-" and "_" in alias name. This file is writeonce.

Documentation/ABI/testing/sysfs-bus-rbd

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




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

	 $ 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_*

snap_*





	A directory per each snapshot

	A directory per each snapshot

Documentation/DocBook/debugobjects.tmpl

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

	<listitem><para>debug_object_deactivate</para></listitem>

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

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

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

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

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

      </itemizedlist>

      </itemizedlist>

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

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

      a pointer to the object type specific debug description

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

	debug checks.

      </para>

      </para>

    </sect1>

    </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>

  <chapter id="fixupfunctions">

  <chapter id="fixupfunctions">

    <title>Fixup functions</title>

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

	statistics.

      </para>

      </para>

    </sect1>

    </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>

  <chapter id="bugs">

  <chapter id="bugs">

    <title>Known Bugs And Assumptions</title>

    <title>Known Bugs And Assumptions</title>

Documentation/DocBook/uio-howto.tmpl

+6 −1
Original line number Original line Diff line number Diff line
@@ -520,6 +520,11 @@ Here's a description of the fields of <varname>struct uio_mem</varname>: 
</para>

</para>





<itemizedlist>

<itemizedlist>

<listitem><para>

<varname>const char *name</varname>: Optional. Set this to help identify

the memory region, it will show up in the corresponding sysfs node.

</para></listitem>



<listitem><para>

<listitem><para>

<varname>int memtype</varname>: Required if the mapping is used. Set this to

<varname>int memtype</varname>: Required if the mapping is used. Set this to

<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your

<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
@@ -553,7 +558,7 @@ instead to remember such an address. 
</itemizedlist>

</itemizedlist>





<para>

<para>

Please do not touch the <varname>kobj</varname> element of

Please do not touch the <varname>map</varname> element of

<varname>struct uio_mem</varname>! It is used by the UIO framework

<varname>struct uio_mem</varname>! It is used by the UIO framework

to set up sysfs files for this mapping. Simply leave it alone.

to set up sysfs files for this mapping. Simply leave it alone.

</para>

</para>