Commit 0e55546b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

include/linux/netdevice.h
net/core/dev.c
  6510ea97 ("net: Use this_cpu_inc() to increment net->core_stats")
  794c24e9 ("net-core: rx_otherhost_dropped to core_stats")
https://lore.kernel.org/all/20220428111903.5f4304e0@canb.auug.org.au/

drivers/net/wan/cosa.c
  d48fea84 ("net: cosa: fix error check return value of register_chrdev()")
  89fbca33 ("net: wan: remove support for COSA and SRP synchronous serial boards")
https://lore.kernel.org/all/20220428112130.1f689e5e@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f3412b38 249aca0d

Documentation/devicetree/bindings/dma/qcom,gpi.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
  interrupts:

    description:

      Interrupt lines for each GPI instance

    minItems: 1

    maxItems: 13



  "#dma-cells":

Documentation/devicetree/bindings/regulator/richtek,rt5190a-regulator.yaml

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ properties: 
        type: object

        $ref: regulator.yaml#

        description: |

          regulator description for buck1 and buck4.

          regulator description for buck1 to buck4, and ldo.



        properties:

          regulator-allowed-modes:

Documentation/filesystems/ext4/attributes.rst

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ The beginning of an extended attribute block is in 
     - Checksum of the extended attribute block.

   * - 0x14

     - \_\_u32

     - h\_reserved[2]

     - h\_reserved[3]

     - Zero.



The checksum is calculated against the FS UUID, the 64-bit block number

Documentation/filesystems/f2fs.rst

+0 −70
Original line number Diff line number Diff line
@@ -235,12 +235,6 @@ offgrpjquota Turn off group journalled quota. 
offprjjquota		 Turn off project journalled quota.

quota			 Enable plain user disk quota accounting.

noquota			 Disable all plain disk quota option.

whint_mode=%s		 Control which write hints are passed down to block

			 layer. This supports "off", "user-based", and

			 "fs-based".  In "off" mode (default), f2fs does not pass

			 down hints. In "user-based" mode, f2fs tries to pass

			 down hints given by users. And in "fs-based" mode, f2fs

			 passes down hints with its policy.

alloc_mode=%s		 Adjust block allocation policy, which supports "reuse"

			 and "default".

fsync_mode=%s		 Control the policy of fsync. Currently supports "posix",
@@ -751,70 +745,6 @@ In order to identify whether the data in the victim segment are valid or not, 
F2FS manages a bitmap. Each bit represents the validity of a block, and the

bitmap is composed of a bit stream covering whole blocks in main area.



Write-hint Policy

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



1) whint_mode=off. F2FS only passes down WRITE_LIFE_NOT_SET.



2) whint_mode=user-based. F2FS tries to pass down hints given by

users.



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

User                  F2FS                     Block

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

N/A                   META                     WRITE_LIFE_NOT_SET

N/A                   HOT_NODE                 "

N/A                   WARM_NODE                "

N/A                   COLD_NODE                "

ioctl(COLD)           COLD_DATA                WRITE_LIFE_EXTREME

extension list        "                        "



-- buffered io

WRITE_LIFE_EXTREME    COLD_DATA                WRITE_LIFE_EXTREME

WRITE_LIFE_SHORT      HOT_DATA                 WRITE_LIFE_SHORT

WRITE_LIFE_NOT_SET    WARM_DATA                WRITE_LIFE_NOT_SET

WRITE_LIFE_NONE       "                        "

WRITE_LIFE_MEDIUM     "                        "

WRITE_LIFE_LONG       "                        "



-- direct io

WRITE_LIFE_EXTREME    COLD_DATA                WRITE_LIFE_EXTREME

WRITE_LIFE_SHORT      HOT_DATA                 WRITE_LIFE_SHORT

WRITE_LIFE_NOT_SET    WARM_DATA                WRITE_LIFE_NOT_SET

WRITE_LIFE_NONE       "                        WRITE_LIFE_NONE

WRITE_LIFE_MEDIUM     "                        WRITE_LIFE_MEDIUM

WRITE_LIFE_LONG       "                        WRITE_LIFE_LONG

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



3) whint_mode=fs-based. F2FS passes down hints with its policy.



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

User                  F2FS                     Block

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

N/A                   META                     WRITE_LIFE_MEDIUM;

N/A                   HOT_NODE                 WRITE_LIFE_NOT_SET

N/A                   WARM_NODE                "

N/A                   COLD_NODE                WRITE_LIFE_NONE

ioctl(COLD)           COLD_DATA                WRITE_LIFE_EXTREME

extension list        "                        "



-- buffered io

WRITE_LIFE_EXTREME    COLD_DATA                WRITE_LIFE_EXTREME

WRITE_LIFE_SHORT      HOT_DATA                 WRITE_LIFE_SHORT

WRITE_LIFE_NOT_SET    WARM_DATA                WRITE_LIFE_LONG

WRITE_LIFE_NONE       "                        "

WRITE_LIFE_MEDIUM     "                        "

WRITE_LIFE_LONG       "                        "



-- direct io

WRITE_LIFE_EXTREME    COLD_DATA                WRITE_LIFE_EXTREME

WRITE_LIFE_SHORT      HOT_DATA                 WRITE_LIFE_SHORT

WRITE_LIFE_NOT_SET    WARM_DATA                WRITE_LIFE_NOT_SET

WRITE_LIFE_NONE       "                        WRITE_LIFE_NONE

WRITE_LIFE_MEDIUM     "                        WRITE_LIFE_MEDIUM

WRITE_LIFE_LONG       "                        WRITE_LIFE_LONG

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



Fallocate(2) Policy

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

Documentation/vm/page_owner.rst

+3 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ Usage 
   If you want to sort by the page nums of buf, use the ``-m`` parameter.

   The detailed parameters are:



   fundamental function:

   fundamental function::



	Sort:

		-a		Sort by memory allocation time.
@@ -122,7 +122,7 @@ Usage 
		-s		Sort by stack trace.

		-t		Sort by times (default).



   additional function:

   additional function::



	Cull:

		--cull <rules>
@@ -153,6 +153,7 @@ Usage 


STANDARD FORMAT SPECIFIERS

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

::



	KEY		LONG		DESCRIPTION

	p		pid		process ID