Commit 8859a44e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Conflicts:

MAINTAINERS
 - keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 - simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
 - trivial
include/linux/ethtool.h
 - trivial, fix kdoc while at it
include/linux/skmsg.h
 - move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
 - add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
 - trivial

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6c5e6b4c 4e04e751

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Optional node properties: 
- "#thermal-sensor-cells" Used to expose itself to thermal fw.



Read more about iio bindings at

	Documentation/devicetree/bindings/iio/iio-bindings.txt

	https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/



Example:

	ncp15wb473@0 {

Documentation/devicetree/bindings/iio/adc/ingenic,adc.yaml

+3 −2
Original line number Diff line number Diff line
@@ -14,8 +14,9 @@ description: > 
  Industrial I/O subsystem bindings for ADC controller found in

  Ingenic JZ47xx SoCs.



  ADC clients must use the format described in iio-bindings.txt, giving

  a phandle and IIO specifier pair ("io-channels") to the ADC controller.

  ADC clients must use the format described in

  https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml,

  giving a phandle and IIO specifier pair ("io-channels") to the ADC controller.



properties:

  compatible:

Documentation/devicetree/bindings/input/adc-joystick.yaml

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ properties: 
    description: >

      List of phandle and IIO specifier pairs.

      Each pair defines one ADC channel to which a joystick axis is connected.

      See Documentation/devicetree/bindings/iio/iio-bindings.txt for details.

      See

      https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

      for details.



  '#address-cells':

    const: 1

Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,10 @@ Required properties: 
 - compatible: must be "resistive-adc-touch"

The device must be connected to an ADC device that provides channels for

position measurement and optional pressure.

Refer to ../iio/iio-bindings.txt for details

Refer to

https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

for details



 - iio-channels: must have at least two channels connected to an ADC device.

These should correspond to the channels exposed by the ADC device and should

have the right index as the ADC device registers them. These channels

Documentation/devicetree/bindings/mfd/ab8500.txt

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ Required child device properties: 
                                               pwm|regulator|rtc|sysctrl|usb]";



  A few child devices require ADC channels from the GPADC node. Those follow the

  standard bindings from iio/iio-bindings.txt and iio/adc/adc.txt

  standard bindings from

  https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml

  and Documentation/devicetree/bindings/iio/adc/adc.yaml



  abx500-temp		 : io-channels "aux1" and "aux2" for measuring external

			   temperatures.