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

Commit a4ec8008 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 



Resolve conflict between commit 264640fc ("ipv6: distinguish frag
queues by device for multicast and link-local packets") from the net
tree and commit 029f7f3b ("netfilter: ipv6: nf_defrag: avoid/free
clone operations") from the nf-next tree.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>

Conflicts:
	net/ipv6/netfilter/nf_conntrack_reasm.c
parents 19576c94 cb4396ed

Documentation/ABI/testing/sysfs-class-net-cdc_ncm

+19 −0
Original line number Diff line number Diff line
@@ -19,6 +19,25 @@ Description: 
		Set to 0 to pad all frames. Set greater than tx_max to

		disable all padding.



What:		/sys/class/net/<iface>/cdc_ncm/ndp_to_end

Date:		Dec 2015

KernelVersion:	4.5

Contact:	Bjørn Mork <bjorn@mork.no>

Description:

		Boolean attribute showing the status of the "NDP to

		end" quirk.  Defaults to 'N', except for devices

		already known to need it enabled.



		The "NDP to end" quirk makes the driver place the NDP

		(the packet index table) after the payload.  The NCM

		specification does not mandate this, but some devices

		are known to be more restrictive. Write 'Y' to this

		attribute for temporary testing of a suspect device

		failing to work with the default driver settings.



		A device entry should be added to the driver if this

		quirk is found to be required.



What:		/sys/class/net/<iface>/cdc_ncm/rx_max

Date:		May 2014

KernelVersion:	3.16

Documentation/ABI/testing/sysfs-class-net-qmi

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/net/<iface>/qmi/raw_ip

Date:		Dec 2015

KernelVersion:	4.4

Contact:	Bjørn Mork <bjorn@mork.no>

Description:

		Boolean.  Default: 'N'



		Set this to 'Y' to change the network device link

		framing from '802.3' to 'raw-ip'.



		The netdev will change to reflect the link framing

		mode.  The netdev is an ordinary ethernet device in

		'802.3' mode, and the driver expects to exchange

		frames with an ethernet header over the USB link. The

		netdev is a headerless p-t-p device in 'raw-ip' mode,

		and the driver expects to echange IPv4 or IPv6 packets

		without any L2 header over the USB link.



		Userspace is in full control of firmware configuration

		through the delegation of the QMI protocol. Userspace

		is responsible for coordination of driver and firmware

		link framing mode, changing this setting to 'Y' if the

		firmware is configured for 'raw-ip' mode.

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.