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

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

drivers/net/ethernet/mellanox/mlx5/core/main.c
  b3388697 ("net/mlx5: Initialize flow steering during driver probe")
  40379a00 ("net/mlx5_fpga: Drop INNOVA TLS support")
  f2b41b32 ("net/mlx5: Remove ipsec_ops function table")
https://lore.kernel.org/all/20220519040345.6yrjromcdistu7vh@sx1/
  16d42d31 ("net/mlx5: Drain fw_reset when removing device")
  8324a02c ("net/mlx5: Add exit route when waiting for FW")
https://lore.kernel.org/all/20220519114119.060ce014@canb.auug.org.au/

tools/testing/selftests/net/mptcp/mptcp_join.sh
  e274f715 ("selftests: mptcp: add subflow limits test-cases")
  b6e074e1 ("selftests: mptcp: add infinite map testcase")
  5ac1d2d6 ("selftests: mptcp: Add tests for userspace PM type")
https://lore.kernel.org/all/20220516111918.366d747f@canb.auug.org.au/

net/mptcp/options.c
  ba2c89e0 ("mptcp: fix checksum byte order")
  1e39e5a3 ("mptcp: infinite mapping sending")
  ea66758c ("tcp: allow MPTCP to update the announced window")
https://lore.kernel.org/all/20220519115146.751c3a37@canb.auug.org.au/

net/mptcp/pm.c
  95d68651 ("mptcp: fix subflow accounting on close")
  4d25247d ("mptcp: bypass in-kernel PM restrictions for non-kernel PMs")
https://lore.kernel.org/all/20220516111435.72f35dca@canb.auug.org.au/

net/mptcp/subflow.c
  ae66fb2b ("mptcp: Do TCP fallback on early DSS checksum failure")
  0348c690 ("mptcp: add the fallback check")
  f8d4bcac ("mptcp: infinite mapping receiving")
https://lore.kernel.org/all/20220519115837.380bb8d4@canb.auug.org.au/



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

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>

Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Documentation/arm64/silicon-errata.rst

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo4xx Silver  | N/A             | ARM64_ERRATUM_1024718       |

+----------------+-----------------+-----------------+-----------------------------+

| Qualcomm Tech. | Kryo4xx Gold    | N/A             | ARM64_ERRATUM_1286807       |

+----------------+-----------------+-----------------+-----------------------------+



+----------------+-----------------+-----------------+-----------------------------+

| Fujitsu        | A64FX           | E#010001        | FUJITSU_ERRATUM_010001      |

+----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ patternProperties: 
          $ref: "/schemas/types.yaml#/definitions/string"

          enum: [ ADC0, ADC1, ADC10, ADC11, ADC12, ADC13, ADC14, ADC15, ADC2,

                  ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, BMCINT, EMMC, ESPI, ESPIALT,

                  FSI1, FSI2, FWSPIABR, FWSPID, FWSPIWP, GPIT0, GPIT1, GPIT2, GPIT3,

                  FSI1, FSI2, FWQSPI, FWSPIABR, FWSPID, FWSPIWP, GPIT0, GPIT1, GPIT2, GPIT3,

                  GPIT4, GPIT5, GPIT6, GPIT7, GPIU0, GPIU1, GPIU2, GPIU3, GPIU4, GPIU5,

                  GPIU6, GPIU7, I2C1, I2C10, I2C11, I2C12, I2C13, I2C14, I2C15, I2C16,

                  I2C2, I2C3, I2C4, I2C5, I2C6, I2C7, I2C8, I2C9, I3C3, I3C4, I3C5,
@@ -58,7 +58,7 @@ patternProperties: 
          $ref: "/schemas/types.yaml#/definitions/string"

          enum: [ ADC0, ADC1, ADC10, ADC11, ADC12, ADC13, ADC14, ADC15, ADC2,

                  ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, BMCINT, EMMCG1, EMMCG4,

                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWSPIABR, FWSPID, FWQSPID, FWSPIWP,

                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWQSPI, FWSPIABR, FWSPID, FWSPIWP,

                  GPIT0, GPIT1, GPIT2, GPIT3, GPIT4, GPIT5, GPIT6, GPIT7, GPIU0, GPIU1,

                  GPIU2, GPIU3, GPIU4, GPIU5, GPIU6, GPIU7, HVI3C3, HVI3C4, I2C1, I2C10,

                  I2C11, I2C12, I2C13, I2C14, I2C15, I2C16, I2C2, I2C3, I2C4, I2C5,

Documentation/process/embargoed-hardware-issues.rst

+4 −3
Original line number Diff line number Diff line
@@ -244,10 +244,11 @@ disclosure of a particular issue, unless requested by a response team or by 
an involved disclosed party. The current ambassadors list:



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

  ARM           Grant Likely <grant.likely@arm.com>

  AMD		Tom Lendacky <tom.lendacky@amd.com>

  IBM Z         Christian Borntraeger <borntraeger@de.ibm.com>

  Ampere	Darren Hart <darren@os.amperecomputing.com>

  ARM		Catalin Marinas <catalin.marinas@arm.com>

  IBM Power	Anton Blanchard <anton@linux.ibm.com>

  IBM Z		Christian Borntraeger <borntraeger@de.ibm.com>

  Intel		Tony Luck <tony.luck@intel.com>

  Qualcomm	Trilok Soni <tsoni@codeaurora.org>

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -5442,6 +5442,7 @@ F: net/ax25/sysctl_net_ax25.c 








DATA ACCESS MONITOR









M:	SeongJae Park <sj@kernel.org>









L:	damon@lists.linux.dev









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/ABI/testing/sysfs-kernel-mm-damon








@@ -14399,7 +14400,6 @@ F:	arch/arm/*omap*/*pm*







F:	drivers/cpufreq/omap-cpufreq.c

















OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT









M:	Rajendra Nayak <rnayak@codeaurora.org>









M:	Paul Walmsley <paul@pwsan.com>









L:	linux-omap@vger.kernel.org









S:	Maintained








@@ -15502,7 +15502,8 @@ F:	tools/perf/







PERFORMANCE EVENTS TOOLING ARM64









R:	John Garry <john.garry@huawei.com>









R:	Will Deacon <will@kernel.org>









R:	Mathieu Poirier <mathieu.poirier@linaro.org>









R:	James Clark <james.clark@arm.com>









R:	Mike Leach <mike.leach@linaro.org>









R:	Leo Yan <leo.yan@linaro.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported