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

Commit 3527a86b authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

Merge tag 'v4.0-rc5' into linux-next 

Merge the upstream -rc5 tag because we needed a more up-to-date base our
further work.
parents b388e6a7 bc465aa9

Documentation/CodeOfConflict

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
Code of Conflict

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



The Linux kernel development effort is a very personal process compared

to "traditional" ways of developing software.  Your code and ideas

behind it will be carefully reviewed, often resulting in critique and

criticism.  The review will almost always require improvements to the

code before it can be included in the kernel.  Know that this happens

because everyone involved wants to see the best possible solution for

the overall success of Linux.  This development process has been proven

to create the most robust operating system kernel ever, and we do not

want to do anything to cause the quality of submission and eventual

result to ever decrease.



If however, anyone feels personally abused, threatened, or otherwise

uncomfortable due to this process, that is not acceptable.  If so,

please contact the Linux Foundation's Technical Advisory Board at

<tab@lists.linux-foundation.org>, or the individual members, and they

will work to resolve the issue to the best of their ability.  For more

information on who is on the Technical Advisory Board and what their

role is, please see:

	http://www.linuxfoundation.org/programs/advisory-councils/tab



As a reviewer of code, please strive to keep things civil and focused on

the technical issues involved.  We are all humans, and frustrations can

be high on both sides of the process.  Try to keep in mind the immortal

words of Bill and Ted, "Be excellent to each other."

Documentation/DocBook/kgdb.tmpl

+3 −3
Original line number Original line Diff line number Diff line
@@ -197,6 +197,7 @@ 
   may be configured as a kernel built-in or a kernel loadable module.

   may be configured as a kernel built-in or a kernel loadable module.

   You can only make use of <constant>kgdbwait</constant> and early

   You can only make use of <constant>kgdbwait</constant> and early

   debugging if you build kgdboc into the kernel as a built-in.

   debugging if you build kgdboc into the kernel as a built-in.

   </para>

   <para>Optionally you can elect to activate kms (Kernel Mode

   <para>Optionally you can elect to activate kms (Kernel Mode

   Setting) integration.  When you use kms with kgdboc and you have a

   Setting) integration.  When you use kms with kgdboc and you have a

   video driver that has atomic mode setting hooks, it is possible to

   video driver that has atomic mode setting hooks, it is possible to
@@ -206,7 +207,6 @@ 
   crashes or doing analysis of memory with kdb while allowing the

   crashes or doing analysis of memory with kdb while allowing the

   full graphics console applications to run.

   full graphics console applications to run.

   </para>

   </para>

   </para>

   <sect2 id="kgdbocArgs">

   <sect2 id="kgdbocArgs">

   <title>kgdboc arguments</title>

   <title>kgdboc arguments</title>

   <para>Usage: <constant>kgdboc=[kms][[,]kbd][[,]serial_device][,baud]</constant></para>

   <para>Usage: <constant>kgdboc=[kms][[,]kbd][[,]serial_device][,baud]</constant></para>
@@ -284,7 +284,6 @@ 
   </listitem>

   </listitem>

   </orderedlist>

   </orderedlist>

   </para>

   </para>

   </sect3>

   <para>NOTE: Kgdboc does not support interrupting the target via the

   <para>NOTE: Kgdboc does not support interrupting the target via the

   gdb remote protocol.  You must manually send a sysrq-g unless you

   gdb remote protocol.  You must manually send a sysrq-g unless you

   have a proxy that splits console output to a terminal program.

   have a proxy that splits console output to a terminal program.
@@ -305,6 +304,7 @@ 
    as well as on the initial connect, or to use a debugger proxy that

    as well as on the initial connect, or to use a debugger proxy that

    allows an unmodified gdb to do the debugging.

    allows an unmodified gdb to do the debugging.

   </para>

   </para>

   </sect3>

   </sect2>

   </sect2>

   </sect1>

   </sect1>

   <sect1 id="kgdbwait">

   <sect1 id="kgdbwait">
@@ -350,12 +350,12 @@ 
   </para>

   </para>

   </listitem>

   </listitem>

   </orderedlist>

   </orderedlist>

  </para>

   <para>IMPORTANT NOTE: You cannot use kgdboc + kgdbcon on a tty that is an

   <para>IMPORTANT NOTE: You cannot use kgdboc + kgdbcon on a tty that is an

   active system console.  An example of incorrect usage is <constant>console=ttyS0,115200 kgdboc=ttyS0 kgdbcon</constant>

   active system console.  An example of incorrect usage is <constant>console=ttyS0,115200 kgdboc=ttyS0 kgdbcon</constant>

   </para>

   </para>

   <para>It is possible to use this option with kgdboc on a tty that is not a system console.

   <para>It is possible to use this option with kgdboc on a tty that is not a system console.

   </para>

   </para>

  </para>

  </sect1>

  </sect1>

   <sect1 id="kgdbreboot">

   <sect1 id="kgdbreboot">

   <title>Run time parameter: kgdbreboot</title>

   <title>Run time parameter: kgdbreboot</title>

Documentation/cgroups/unified-hierarchy.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -404,8 +404,8 @@ supported and the interface files "release_agent" and 
  be understood as an underflow into the highest possible value, -2 or

  be understood as an underflow into the highest possible value, -2 or

  -10M etc. do not work, so it's not consistent.

  -10M etc. do not work, so it's not consistent.





  memory.low, memory.high, and memory.max will use the string

  memory.low, memory.high, and memory.max will use the string "max" to

  "infinity" to indicate and set the highest possible value.

  indicate and set the highest possible value.





5. Planned Changes

5. Planned Changes

Documentation/clk.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,8 @@ the operations defined in clk.h: 
						unsigned long *parent_rate);

						unsigned long *parent_rate);

		long		(*determine_rate)(struct clk_hw *hw,

		long		(*determine_rate)(struct clk_hw *hw,

						unsigned long rate,

						unsigned long rate,

						unsigned long min_rate,

						unsigned long max_rate,

						unsigned long *best_parent_rate,

						unsigned long *best_parent_rate,

						struct clk_hw **best_parent_clk);

						struct clk_hw **best_parent_clk);

		int		(*set_parent)(struct clk_hw *hw, u8 index);

		int		(*set_parent)(struct clk_hw *hw, u8 index);

Documentation/device-mapper/dm-crypt.txt

+14 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ Parameters: <cipher> <key> <iv_offset> <device path> \ 
    Otherwise #opt_params is the number of following arguments.

    Otherwise #opt_params is the number of following arguments.





    Example of optional parameters section:

    Example of optional parameters section:

        1 allow_discards

        3 allow_discards same_cpu_crypt submit_from_crypt_cpus





allow_discards

allow_discards

    Block discard requests (a.k.a. TRIM) are passed through the crypt device.

    Block discard requests (a.k.a. TRIM) are passed through the crypt device.
@@ -63,6 +63,19 @@ allow_discards 
    used space etc.) if the discarded blocks can be located easily on the

    used space etc.) if the discarded blocks can be located easily on the

    device later.

    device later.





same_cpu_crypt

    Perform encryption using the same cpu that IO was submitted on.

    The default is to use an unbound workqueue so that encryption work

    is automatically balanced between available CPUs.



submit_from_crypt_cpus

    Disable offloading writes to a separate thread after encryption.

    There are some situations where offloading write bios from the

    encryption threads to a single thread degrades performance

    significantly.  The default is to offload write bios to the same

    thread because it benefits CFQ to have writes submitted using the

    same context.



Example scripts

Example scripts

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

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

LUKS (Linux Unified Key Setup) is now the preferred way to set up disk

LUKS (Linux Unified Key Setup) is now the preferred way to set up disk