Commit 0b98f0c0 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'master' into for-4.4-fixes 



The following commit which went into mainline through networking tree

  3b13758f ("cgroups: Allow dynamically changing net_classid")

conflicts in net/core/netclassid_cgroup.c with the following pending
fix in cgroup/for-4.4-fixes.

  1f7dd3e5 ("cgroup: fix handling of multi-destination migration from subtree_control enabling")

The former separates out update_classid() from cgrp_attach() and
updates it to walk all fds of all tasks in the target css so that it
can be used from both migration and config change paths.  The latter
drops @css from cgrp_attach().

Resolve the conflict by making cgrp_attach() call update_classid()
with the css from the first task.  We can revive @tset walking in
cgrp_attach() but given that net_cls is v1 only where there always is
only one target css during migration, this is fine.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Nina Schiff <ninasc@fb.com>
parents 67cde9c4 527e9316

Documentation/IPMI.txt

+5 −2
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ used to control it: 


  modprobe ipmi_watchdog timeout=<t> pretimeout=<t> action=<action type>

      preaction=<preaction type> preop=<preop type> start_now=x

      nowayout=x ifnum_to_use=n

      nowayout=x ifnum_to_use=n panic_wdt_timeout=<t>



ifnum_to_use specifies which interface the watchdog timer should use.

The default is -1, which means to pick the first one registered.
@@ -597,7 +597,9 @@ is the amount of seconds before the reset that the pre-timeout panic will 
occur (if pretimeout is zero, then pretimeout will not be enabled).  Note

that the pretimeout is the time before the final timeout.  So if the

timeout is 50 seconds and the pretimeout is 10 seconds, then the pretimeout

will occur in 40 second (10 seconds before the timeout).

will occur in 40 second (10 seconds before the timeout). The panic_wdt_timeout

is the value of timeout which is set on kernel panic, in order to let actions

such as kdump to occur during panic.



The action may be "reset", "power_cycle", or "power_off", and

specifies what to do when the timer times out, and defaults to
@@ -634,6 +636,7 @@ for configuring the watchdog: 
	ipmi_watchdog.preop=<preop type>

	ipmi_watchdog.start_now=x

	ipmi_watchdog.nowayout=x

	ipmi_watchdog.panic_wdt_timeout=<t>



The options are the same as the module parameter options.

Documentation/arm/keystone/Overview.txt

+0 −18
Original line number Diff line number Diff line
@@ -49,24 +49,6 @@ specified through DTS. Following are the DTS used:- 
The device tree documentation for the keystone machines are located at

        Documentation/devicetree/bindings/arm/keystone/keystone.txt



Known issues & workaround

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



Some of the device drivers used on keystone are re-used from that from

DaVinci and other TI SoCs. These device drivers may use clock APIs directly.

Some of the keystone specific drivers such as netcp uses run time power

management API instead to enable clock. As this API has limitations on

keystone, following workaround is needed to boot Linux.



   Add 'clk_ignore_unused' to the bootargs env variable in u-boot. Otherwise

   clock frameworks will try to disable clocks that are unused and disable

   the hardware. This is because netcp related power domain and clock

   domains are enabled in u-boot as run time power management API currently

   doesn't enable clocks for netcp due to a limitation. This workaround is

   expected to be removed in the future when proper API support becomes

   available. Until then, this work around is needed.





Document Author

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

Murali Karicheri <m-karicheri2@ti.com>

Documentation/block/null_blk.txt

+3 −0
Original line number Diff line number Diff line
@@ -70,3 +70,6 @@ use_per_node_hctx=[0/1]: Default: 0 
     parameter.

  1: The multi-queue block layer is instantiated with a hardware dispatch

     queue for each CPU node in the system.



use_lightnvm=[0/1]: Default: 0

  Register device with LightNVM. Requires blk-mq to be used.

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ Required properties: 
- phy-mode: See ethernet.txt file in the same directory

- clocks: a pointer to the reference clock for this device.



Optional properties:

- tx-csum-limit: maximum mtu supported by port that allow TX checksum.

  Value is presented in bytes. If not used, by default 1600B is set for

  "marvell,armada-370-neta" and 9800B for others.



Example:



ethernet@d0070000 {
@@ -15,6 +20,7 @@ ethernet@d0070000 { 
	reg = <0xd0070000 0x2500>;

	interrupts = <8>;

	clocks = <&gate_clk 4>;

	tx-csum-limit = <9800>

	status = "okay";

	phy = <&phy0>;

	phy-mode = "rgmii-id";

Documentation/devicetree/bindings/thermal/rockchip-thermal.txt

+3 −1
Original line number Diff line number Diff line 
* Temperature Sensor ADC (TSADC) on rockchip SoCs



Required properties:

- compatible : "rockchip,rk3288-tsadc"

- compatible : should be "rockchip,<name>-tsadc"

   "rockchip,rk3288-tsadc": found on RK3288 SoCs

   "rockchip,rk3368-tsadc": found on RK3368 SoCs

- reg : physical base address of the controller and length of memory mapped

	region.

- interrupts : The interrupt number to the cpu. The interrupt specifier format

CRA Git | Maintained and supported by SUSTech CRA and CCSE