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

Commit 71a83a6d authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b97526f3 a6c5170d

Documentation/ABI/testing/sysfs-driver-samsung-laptop

+8 −0
Original line number Diff line number Diff line
@@ -35,3 +35,11 @@ Contact: Corentin Chary <corentin.chary@gmail.com> 
Description:	Use your USB ports to charge devices, even

		when your laptop is powered off.

		1 means enabled, 0 means disabled.



What:		/sys/devices/platform/samsung/lid_handling

Date:		December 11, 2014

KernelVersion:	3.19

Contact:	Julijonas Kikutis <julijonas.kikutis@gmail.com>

Description:	Some Samsung laptops handle lid closing quicker and

		only handle lid opening with this mode enabled.

		1 means enabled, 0 means disabled.

Documentation/ABI/testing/sysfs-driver-toshiba_acpi

0 → 100644
+114 −0
Original line number Diff line number Diff line 
What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_mode

Date:		June 8, 2014

KernelVersion:	3.15

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls the keyboard backlight operation mode, valid

		values are:

			* 0x1  -> FN-Z

			* 0x2  -> AUTO (also called TIMER)

			* 0x8  -> ON

			* 0x10 -> OFF

		Note that the kernel 3.16 onwards this file accepts all listed

		parameters, kernel 3.15 only accepts the first two (FN-Z and

		AUTO).

Users:		KToshiba



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_backlight_timeout

Date:		June 8, 2014

KernelVersion:	3.15

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls the timeout of the keyboard backlight

		whenever the operation mode is set to AUTO (or TIMER),

		valid values range from 0-60.

		Note that the kernel 3.15 only had support for the first

		keyboard type, the kernel 3.16 added support for the second

		type and the range accepted for type 2 is 1-60.

		See the entry named "kbd_type"

Users:		KToshiba



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/position

Date:		June 8, 2014

KernelVersion:	3.15

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file shows the absolute position of the built-in

		accelereometer.



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/touchpad

Date:		June 8, 2014

KernelVersion:	3.15

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This files controls the status of the touchpad and pointing

		stick (if available), valid values are:

			* 0 -> OFF

			* 1 -> ON

Users:		KToshiba



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/available_kbd_modes

Date:		August 3, 2014

KernelVersion:	3.16

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file shows the supported keyboard backlight modes

		the system supports, which can be:

			* 0x1  -> FN-Z

			* 0x2  -> AUTO (also called TIMER)

			* 0x8  -> ON

			* 0x10 -> OFF

		Note that not all keyboard types support the listed modes.

		See the entry named "available_kbd_modes"

Users:		KToshiba



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_type

Date:		August 3, 2014

KernelVersion:	3.16

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file shows the current keyboard backlight type,

		which can be:

			* 1 -> Type 1, supporting modes FN-Z and AUTO

			* 2 -> Type 2, supporting modes TIMER, ON and OFF

Users:		KToshiba



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/version

Date:		February, 2015

KernelVersion:	3.20

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file shows the current version of the driver



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/fan

Date:		February, 2015

KernelVersion:	3.20

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls the state of the internal fan, valid

		values are:

			* 0 -> OFF

			* 1 -> ON



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/kbd_function_keys

Date:		February, 2015

KernelVersion:	3.20

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls the Special Functions (hotkeys) operation

		mode, valid values are:

			* 0 -> Normal Operation

			* 1 -> Special Functions

		In the "Normal Operation" mode, the F{1-12} keys are as usual

		and the hotkeys are accessed via FN-F{1-12}.

		In the "Special Functions" mode, the F{1-12} keys trigger the

		hotkey and the F{1-12} keys are accessed via FN-F{1-12}.



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/panel_power_on

Date:		February, 2015

KernelVersion:	3.20

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls whether the laptop should turn ON whenever

		the LID is opened, valid values are:

			* 0 -> Disabled

			* 1 -> Enabled



What:		/sys/devices/LNXSYSTM:00/LNXSYBUS:00/TOS{1900,620{0,7,8}}:00/usb_three

Date:		February, 2015

KernelVersion:	3.20

Contact:	Azael Avalos <coproscefalo@gmail.com>

Description:	This file controls whether the USB 3 functionality, valid

		values are:

			* 0 -> Disabled (Acts as a regular USB 2)

			* 1 -> Enabled (Full USB 3 functionality)

Documentation/DocBook/kgdb.tmpl

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

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

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

   </para>

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

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

   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

   full graphics console applications to run.

   </para>

   </para>

   <sect2 id="kgdbocArgs">

   <title>kgdboc arguments</title>

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

   </orderedlist>

   </para>

   </sect3>

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

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

   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

    allows an unmodified gdb to do the debugging.

   </para>

   </sect3>

   </sect2>

   </sect1>

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

   </listitem>

   </orderedlist>

  </para>

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

   </para>

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

   </para>

  </para>

  </sect1>

   <sect1 id="kgdbreboot">

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

Documentation/cgroups/unified-hierarchy.txt

+2 −2
Original line number 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

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



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

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

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

  indicate and set the highest possible value.



5. Planned Changes

Documentation/clk.txt

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

		long		(*determine_rate)(struct clk_hw *hw,

						unsigned long rate,

						unsigned long min_rate,

						unsigned long max_rate,

						unsigned long *best_parent_rate,

						struct clk_hw **best_parent_clk);

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