Commit db402985 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Conflicts:

net/xdp/xsk.c
  0ebc27a4 ("xsk: avoid data corruption on cq descriptor number")
  8da7bea7 ("xsk: add indirect call for xsk_destruct_skb")
  30ed05ad ("xsk: use a smaller new lock for shared pool case")
https://lore.kernel.org/20251127105450.4a1665ec@canb.auug.org.au
https://lore.kernel.org/eb4eee14-7e24-4d1b-b312-e9ea738fefee@kernel.org



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 73f784b2 1f5e808a

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -691,6 +691,8 @@ Sachin Mokashi <sachin.mokashi@intel.com> <sachinx.mokashi@intel.com> 
Sachin P Sant <ssant@in.ibm.com>

Sai Prakash Ranjan <quic_saipraka@quicinc.com> <saiprakash.ranjan@codeaurora.org>

Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>

Sam Protsenko <semen.protsenko@linaro.org>

Sam Protsenko <semen.protsenko@linaro.org> <semen.protsenko@globallogic.com>

Sam Ravnborg <sam@mars.ravnborg.org>

Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>

Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml

+14 −12
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ patternProperties: 
      groups:

        description:

          Name of the pin group to use for the functions.

        $ref: /schemas/types.yaml#/definitions/string

        items:

          enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,

                 i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,

                 spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
@@ -62,6 +62,8 @@ patternProperties: 
                 pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,

                 pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,

                 pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]

        minItems: 1

        maxItems: 8



      drive-strength:

        enum: [2, 4, 6, 8, 16, 24, 32]

Documentation/devicetree/bindings/pinctrl/xlnx,versal-pinctrl.yaml

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ patternProperties: 


      '^conf':

        type: object

        unevaluatedProperties: false

        description:

          Pinctrl node's client devices use subnodes for pin configurations,

          which in turn use the standard properties below.

Documentation/input/event-codes.rst

+18 −7
Original line number Diff line number Diff line
@@ -400,19 +400,30 @@ can report through the rotational axes (absolute and/or relative rx, ry, rz). 
All other axes retain their meaning. A device must not mix

regular directional axes and accelerometer axes on the same event node.



INPUT_PROP_HAPTIC_TOUCHPAD

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

INPUT_PROP_PRESSUREPAD

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



The INPUT_PROP_PRESSUREPAD property indicates that the device provides

simulated haptic feedback (e.g. a vibrator motor situated below the surface)

instead of physical haptic feedback (e.g. a hinge). This property is only set

if the device:



The INPUT_PROP_HAPTIC_TOUCHPAD property indicates that device:

- supports simple haptic auto and manual triggering

- can differentiate between at least 5 fingers

- uses correct resolution for the X/Y (units and value)

- reports correct force per touch, and correct units for them (newtons or grams)

- follows the MT protocol type B



If the simulated haptic feedback is controllable by userspace the device must:



- support simple haptic auto and manual triggering, and

- report correct force per touch, and correct units for them (newtons or grams), and

- provide the EV_FF FF_HAPTIC force feedback effect.



Summing up, such devices follow the MS spec for input devices in

Win8 and Win8.1, and in addition support the Simple haptic controller HID table,

and report correct units for the pressure.

Win8 and Win8.1, and in addition may support the Simple haptic controller HID

table, and report correct units for the pressure.



Where applicable, this property is set in addition to INPUT_PROP_BUTTONPAD, it

does not replace that property.



Guidelines

==========

Documentation/wmi/driver-development-guide.rst

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ to matching WMI devices using a struct wmi_device_id table: 
::



  static const struct wmi_device_id foo_id_table[] = {

         /* Only use uppercase letters! */

         { "936DA01F-9ABD-4D9D-80C7-02AF85C822A8", NULL },

         { }

  };