Commit 93d5404e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



drivers/net/ipa/ipa_main.c
  8afc7e47 ("net: ipa: separate disabling setup from modem stop")
  76b5fbcd ("net: ipa: kill ipa_modem_init()")

Duplicated include, drop one.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents af22d055 c5c17547

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.com> 
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+6 −6
Original line number Diff line number Diff line
@@ -1520,15 +1520,15 @@ This sysfs attribute controls the keyboard "face" that will be shown on the 
Lenovo X1 Carbon 2nd gen (2014)'s adaptive keyboard. The value can be read

and set.



- 1 = Home mode

- 2 = Web-browser mode

- 3 = Web-conference mode

- 4 = Function mode

- 5 = Layflat mode

- 0 = Home mode

- 1 = Web-browser mode

- 2 = Web-conference mode

- 3 = Function mode

- 4 = Layflat mode



For more details about which buttons will appear depending on the mode, please

review the laptop's user guide:

http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles_pdf/x1carbon_2_ug_en.pdf



Battery charge control

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

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/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