Commit 4c7d3d79 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR.

No conflicts, no adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3ec8d757 d20f6b3d

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com> 
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>

André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>

Andy Adamson <andros@citi.umich.edu>

Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>

Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>

Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>

Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
@@ -217,6 +219,7 @@ Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com> 
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <tanggeliang@kylinos.cn>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

Documentation/admin-guide/mm/transhuge.rst

+2 −2
Original line number Diff line number Diff line
@@ -467,11 +467,11 @@ anon_fault_fallback_charge 
	instead falls back to using huge pages with lower orders or

	small pages even though the allocation was successful.



anon_swpout

swpout

	is incremented every time a huge page is swapped out in one

	piece without splitting.



anon_swpout_fallback

swpout_fallback

	is incremented if a huge page has to be split before swapout.

	Usually because failed to allocate some continuous swap space

	for the huge page.

Documentation/cdrom/cdrom-standard.rst

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ current *struct* is:: 
		int (*media_changed)(struct cdrom_device_info *, int);

		int (*tray_move)(struct cdrom_device_info *, int);

		int (*lock_door)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, int);

		int (*select_speed)(struct cdrom_device_info *, unsigned long);

		int (*get_last_session) (struct cdrom_device_info *,

					 struct cdrom_multisession *);

		int (*get_mcn)(struct cdrom_device_info *, struct cdrom_mcn *);
@@ -396,7 +396,7 @@ action need be taken, and the return value should be 0. 


::



	int select_speed(struct cdrom_device_info *cdi, int speed)

	int select_speed(struct cdrom_device_info *cdi, unsigned long speed)



Some CD-ROM drives are capable of changing their head-speed. There

are several reasons for changing the speed of a CD-ROM drive. Badly

Documentation/devicetree/bindings/input/elan,ekth6915.yaml

+14 −5
Original line number Diff line number Diff line
@@ -18,9 +18,12 @@ allOf: 


properties:

  compatible:

    enum:

      - elan,ekth6915

      - ilitek,ili2901

    oneOf:

      - items:

          - enum:

              - elan,ekth5015m

          - const: elan,ekth6915

      - const: elan,ekth6915



  reg:

    const: 0x10
@@ -33,6 +36,12 @@ properties: 
  reset-gpios:

    description: Reset GPIO; not all touchscreens using eKTH6915 hook this up.



  no-reset-on-power-off:

    type: boolean

    description:

      Reset line is wired so that it can (and should) be left deasserted when

      the power supply is off.



  vcc33-supply:

    description: The 3.3V supply to the touchscreen.
@@ -58,8 +67,8 @@ examples: 
      #address-cells = <1>;

      #size-cells = <0>;



      ap_ts: touchscreen@10 {

        compatible = "elan,ekth6915";

      touchscreen@10 {

        compatible = "elan,ekth5015m", "elan,ekth6915";

        reg = <0x10>;



        interrupt-parent = <&tlmm>;

Documentation/devicetree/bindings/input/ilitek,ili2901.yaml

0 → 100644
+66 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/input/ilitek,ili2901.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Ilitek ILI2901 touchscreen controller



maintainers:

  - Jiri Kosina <jkosina@suse.com>



description:

  Supports the Ilitek ILI2901 touchscreen controller.

  This touchscreen controller uses the i2c-hid protocol with a reset GPIO.



allOf:

  - $ref: /schemas/input/touchscreen/touchscreen.yaml#



properties:

  compatible:

    enum:

      - ilitek,ili2901



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  panel: true



  reset-gpios:

    maxItems: 1



  vcc33-supply: true



  vccio-supply: true



required:

  - compatible

  - reg

  - interrupts

  - vcc33-supply



additionalProperties: false



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/irq.h>



    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      touchscreen@41 {

        compatible = "ilitek,ili2901";

        reg = <0x41>;



        interrupt-parent = <&tlmm>;

        interrupts = <9 IRQ_TYPE_LEVEL_LOW>;



        reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;

        vcc33-supply = <&pp3300_ts>;

      };

    };