Commit c55526a1 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge branch 'i2c/for-current' into i2c/for-mergewindow

parents a2fd6f6b d58071a8

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ properties: 
    oneOf:

      - enum:

          - fsl,imx7ulp-lpi2c

          - fsl,imx8qm-lpi2c

      - items:

          - const: fsl,imx8qxp-lpi2c

          - enum:

              - fsl,imx8qxp-lpi2c

              - fsl,imx8qm-lpi2c

          - const: fsl,imx7ulp-lpi2c



  reg:

Documentation/filesystems/cifs/ksmbd.rst

+5 −5
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ Each layer 
2. Enable one of components (smb, auth, vfs, oplock, ipc, conn, rdma)

	# sudo ksmbd.control -d "smb"



3. Show what prints are enable.

3. Show what prints are enabled.

	# cat /sys/class/ksmbd-control/debug

	  [smb] auth vfs oplock ipc conn [rdma]

Documentation/i2c/smbus-protocol.rst

+8 −6
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ Key to symbols 


=============== =============================================================

S               Start condition

Sr              Repeated start condition, used to switch from write to

                read mode.

P               Stop condition

Rd/Wr (1 bit)   Read/Write bit. Rd equals 1, Wr equals 0.

A, NA (1 bit)   Acknowledge (ACK) and Not Acknowledge (NACK) bit
@@ -100,7 +102,7 @@ Implemented by i2c_smbus_read_byte_data() 
This reads a single byte from a device, from a designated register.

The register is specified through the Comm byte::



  S Addr Wr [A] Comm [A] S Addr Rd [A] [Data] NA P

  S Addr Wr [A] Comm [A] Sr Addr Rd [A] [Data] NA P



Functionality flag: I2C_FUNC_SMBUS_READ_BYTE_DATA
@@ -114,7 +116,7 @@ This operation is very like Read Byte; again, data is read from a 
device, from a designated register that is specified through the Comm

byte. But this time, the data is a complete word (16 bits)::



  S Addr Wr [A] Comm [A] S Addr Rd [A] [DataLow] A [DataHigh] NA P

  S Addr Wr [A] Comm [A] Sr Addr Rd [A] [DataLow] A [DataHigh] NA P



Functionality flag: I2C_FUNC_SMBUS_READ_WORD_DATA
@@ -164,7 +166,7 @@ This command selects a device register (through the Comm byte), sends 
16 bits of data to it, and reads 16 bits of data in return::



  S Addr Wr [A] Comm [A] DataLow [A] DataHigh [A]

                               S Addr Rd [A] [DataLow] A [DataHigh] NA P

                              Sr Addr Rd [A] [DataLow] A [DataHigh] NA P



Functionality flag: I2C_FUNC_SMBUS_PROC_CALL
@@ -181,7 +183,7 @@ of data is specified by the device in the Count byte. 
::



  S Addr Wr [A] Comm [A]

             S Addr Rd [A] [Count] A [Data] A [Data] A ... A [Data] NA P

            Sr Addr Rd [A] [Count] A [Data] A [Data] A ... A [Data] NA P



Functionality flag: I2C_FUNC_SMBUS_READ_BLOCK_DATA
@@ -212,7 +214,7 @@ This command selects a device register (through the Comm byte), sends 
1 to 31 bytes of data to it, and reads 1 to 31 bytes of data in return::



  S Addr Wr [A] Comm [A] Count [A] Data [A] ...

                               S Addr Rd [A] [Count] A [Data] ... A P

                              Sr Addr Rd [A] [Count] A [Data] ... A P



Functionality flag: I2C_FUNC_SMBUS_BLOCK_PROC_CALL
@@ -300,7 +302,7 @@ This command reads a block of bytes from a device, from a 
designated register that is specified through the Comm byte::



  S Addr Wr [A] Comm [A]

             S Addr Rd [A] [Data] A [Data] A ... A [Data] NA P

            Sr Addr Rd [A] [Data] A [Data] A ... A [Data] NA P



Functionality flag: I2C_FUNC_SMBUS_READ_I2C_BLOCK

Documentation/networking/ipvs-sysctl.rst

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ conn_reuse_mode - INTEGER 


	0: disable any special handling on port reuse. The new

	connection will be delivered to the same real server that was

	servicing the previous connection. This will effectively

	disable expire_nodest_conn.

	servicing the previous connection.



	bit 1: enable rescheduling of new connections when it is safe.

	That is, whenever expire_nodest_conn and for TCP sockets, when

Documentation/networking/timestamping.rst

+2 −2
Original line number Diff line number Diff line
@@ -486,8 +486,8 @@ of packets. 
Drivers are free to use a more permissive configuration than the requested

configuration. It is expected that drivers should only implement directly the

most generic mode that can be supported. For example if the hardware can

support HWTSTAMP_FILTER_V2_EVENT, then it should generally always upscale

HWTSTAMP_FILTER_V2_L2_SYNC_MESSAGE, and so forth, as HWTSTAMP_FILTER_V2_EVENT

support HWTSTAMP_FILTER_PTP_V2_EVENT, then it should generally always upscale

HWTSTAMP_FILTER_PTP_V2_L2_SYNC, and so forth, as HWTSTAMP_FILTER_PTP_V2_EVENT

is more generic (and more useful to applications).



A driver which supports hardware time stamping shall update the struct