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

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

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



Several conflicts here.

NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to
nfp_fl_output() needed some adjustments because the code block is in
an else block now.

Parallel additions to net/pkt_cls.h and net/sch_generic.h

A bug fix in __tcp_retransmit_skb() conflicted with some of
the rbtree changes in net-next.

The tc action RCU callback fixes in 'net' had some overlap with some
of the recent tcf_block reworking.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents aad93c70 0b07194b

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+8 −0
Original line number Diff line number Diff line
@@ -14,3 +14,11 @@ Description: 
		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

		14 = outdoors



What		/sys/bus/iio/devices/iio:deviceX/noise_level_tripped

Date:		May 2017

KernelVersion:	4.13

Contact:	Matt Ranostay <matt.ranostay@konsulko.com>

Description:

		When 1 the noise level is over the trip level and not reporting

		valid data

Documentation/ABI/testing/sysfs-devices-power

+3 −1
Original line number Diff line number Diff line
@@ -211,7 +211,9 @@ Description: 
		device, after it has been suspended at run time, from a resume

		request to the moment the device will be ready to process I/O,

		in microseconds.  If it is equal to 0, however, this means that

		the PM QoS resume latency may be arbitrary.

		the PM QoS resume latency may be arbitrary and the special value

		"n/a" means that user space cannot accept any resume latency at

		all for the given device.



		Not all drivers support this attribute.  If it isn't supported,

		it is not present.

Documentation/devicetree/bindings/iio/proximity/as3935.txt

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ Optional properties: 
	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	  value 0 - 120pF. This will require using the calibration data from

	  the manufacturer.

	- ams,nflwdth: Set the noise and watchdog threshold register on

	  startup. This will need to set according to the noise from the

	  MCU board, and possibly the local environment. Refer to the

	  datasheet for the threshold settings.



Example:
@@ -27,4 +31,5 @@ as3935@0 { 
	interrupt-parent = <&gpio1>;

	interrupts = <16 1>;

	ams,tuning-capacitor-pf = <80>;

	ams,nflwdth = <0x44>;

};

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Examples: 
			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

			reg = <0x0 0x2c200000 0 0x20000>;

		};

	};
@@ -124,14 +124,14 @@ Examples: 
			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

			reg = <0x0 0x2c200000 0 0x20000>;

		};



		gic-its@2c400000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c400000 0 0x200000>;

			reg = <0x0 0x2c400000 0 0x20000>;

		};



		ppi-partitions {

Documentation/kbuild/makefiles.txt

+18 −13
Original line number Diff line number Diff line
@@ -1108,14 +1108,6 @@ When kbuild executes, the following steps are followed (roughly): 
    ld

	Link target. Often, LDFLAGS_$@ is used to set specific options to ld.



    objcopy

	Copy binary. Uses OBJCOPYFLAGS usually specified in

	arch/$(ARCH)/Makefile.

	OBJCOPYFLAGS_$@ may be used to set additional options.



    gzip

	Compress target. Use maximum compression to compress target.



	Example:

		#arch/x86/boot/Makefile

		LDFLAGS_bootsect := -Ttext 0x0 -s --oformat binary
@@ -1139,6 +1131,19 @@ When kbuild executes, the following steps are followed (roughly): 
	      resulting in the target file being recompiled for no

	      obvious reason.



    objcopy

	Copy binary. Uses OBJCOPYFLAGS usually specified in

	arch/$(ARCH)/Makefile.

	OBJCOPYFLAGS_$@ may be used to set additional options.



    gzip

	Compress target. Use maximum compression to compress target.



	Example:

		#arch/x86/boot/compressed/Makefile

		$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE

			$(call if_changed,gzip)



    dtc

	Create flattened device tree blob object suitable for linking

	into vmlinux. Device tree blobs linked into vmlinux are placed
@@ -1219,7 +1224,7 @@ When kbuild executes, the following steps are followed (roughly): 
	that may be shared between individual architectures.

	The recommended approach how to use a generic header file is

	to list the file in the Kbuild file.

	See "7.3 generic-y" for further info on syntax etc.

	See "7.2 generic-y" for further info on syntax etc.



--- 6.11 Post-link pass
@@ -1299,7 +1304,7 @@ See subsequent chapter for the syntax of the Kbuild file. 
			#arch/x86/include/asm/Kbuild

			generated-y += syscalls_32.h



	--- 7.5 mandatory-y

--- 7.4 mandatory-y



	mandatory-y is essentially used by include/uapi/asm-generic/Kbuild.asm

	to define the minimum set of headers that must be exported in