Commit 33331a72 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge tag 'v6.0' into rdma.git for-next 

Trvial merge conflicts against rdma.git for-rc resolved matching
linux-next:
            drivers/infiniband/hw/hns/hns_roce_hw_v2.c
            drivers/infiniband/hw/hns/hns_roce_main.c

https://lore.kernel.org/r/20220929124005.105149-1-broonie@kernel.org



Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 8ad891ed 4fe89d07

.get_maintainer.ignore

+2 −0
Original line number Diff line number Diff line 
Alan Cox <alan@lxorguk.ukuu.org.uk>

Alan Cox <root@hraefn.swansea.linux.org.uk>

Christoph Hellwig <hch@lst.de>

Marc Gonzalez <marc.w.gonzalez@free.fr>

.mailmap

+8 −2
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ Ben M Cahill <ben.m.cahill@intel.com> 
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>

Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>

Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>

Bjorn Andersson <andersson@kernel.org> <bjorn@kryo.se>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@linaro.org>

Bjorn Andersson <andersson@kernel.org> <bjorn.andersson@sonymobile.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
@@ -98,8 +101,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> 
Christian Marangi <ansuelsmth@gmail.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

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

Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>

Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -150,6 +152,8 @@ Greg Kroah-Hartman <gregkh@suse.de> 
Greg Kroah-Hartman <greg@kroah.com>

Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@linux.vnet.ibm.com>

Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@canonical.com>

Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>

Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>
@@ -253,6 +257,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>
@@ -313,6 +318,7 @@ Morten Welinder <welinder@troll.com> 
Mythri P K <mythripk@ti.com>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>

Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort

		/sys/devices/system/cpu/vulnerabilities/itlb_multihit

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

		/sys/devices/system/cpu/vulnerabilities/retbleed

Date:		January 2018

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	Information about CPU vulnerabilities

Documentation/admin-guide/README.rst

+15 −15
Original line number Diff line number Diff line 
.. _readme:



Linux kernel release 5.x <http://kernel.org/>

Linux kernel release 6.x <http://kernel.org/>

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



These are the release notes for Linux version 5.  Read them carefully,

These are the release notes for Linux version 6.  Read them carefully,

as they tell you what this is all about, explain how to install the

kernel, and what to do if something goes wrong.
@@ -63,7 +63,7 @@ Installing the kernel source 
   directory where you have permissions (e.g. your home directory) and

   unpack it::



     xz -cd linux-5.x.tar.xz | tar xvf -

     xz -cd linux-6.x.tar.xz | tar xvf -



   Replace "X" with the version number of the latest kernel.
@@ -72,12 +72,12 @@ Installing the kernel source 
   files.  They should match the library, and not get messed up by

   whatever the kernel-du-jour happens to be.



 - You can also upgrade between 5.x releases by patching.  Patches are

 - You can also upgrade between 6.x releases by patching.  Patches are

   distributed in the xz format.  To install by patching, get all the

   newer patch files, enter the top level directory of the kernel source

   (linux-5.x) and execute::

   (linux-6.x) and execute::



     xz -cd ../patch-5.x.xz | patch -p1

     xz -cd ../patch-6.x.xz | patch -p1



   Replace "x" for all versions bigger than the version "x" of your current

   source tree, **in_order**, and you should be ok.  You may want to remove
@@ -85,13 +85,13 @@ Installing the kernel source 
   that there are no failed patches (some-file-name# or some-file-name.rej).

   If there are, either you or I have made a mistake.



   Unlike patches for the 5.x kernels, patches for the 5.x.y kernels

   Unlike patches for the 6.x kernels, patches for the 6.x.y kernels

   (also known as the -stable kernels) are not incremental but instead apply

   directly to the base 5.x kernel.  For example, if your base kernel is 5.0

   and you want to apply the 5.0.3 patch, you must not first apply the 5.0.1

   and 5.0.2 patches. Similarly, if you are running kernel version 5.0.2 and

   want to jump to 5.0.3, you must first reverse the 5.0.2 patch (that is,

   patch -R) **before** applying the 5.0.3 patch. You can read more on this in

   directly to the base 6.x kernel.  For example, if your base kernel is 6.0

   and you want to apply the 6.0.3 patch, you must not first apply the 6.0.1

   and 6.0.2 patches. Similarly, if you are running kernel version 6.0.2 and

   want to jump to 6.0.3, you must first reverse the 6.0.2 patch (that is,

   patch -R) **before** applying the 6.0.3 patch. You can read more on this in

   :ref:`Documentation/process/applying-patches.rst <applying_patches>`.



   Alternatively, the script patch-kernel can be used to automate this
@@ -114,7 +114,7 @@ Installing the kernel source 
Software requirements

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



   Compiling and running the 5.x kernels requires up-to-date

   Compiling and running the 6.x kernels requires up-to-date

   versions of various software packages.  Consult

   :ref:`Documentation/process/changes.rst <changes>` for the minimum version numbers

   required and how to get updates for these packages.  Beware that using
@@ -132,12 +132,12 @@ Build directory for the kernel 
   place for the output files (including .config).

   Example::



     kernel source code: /usr/src/linux-5.x

     kernel source code: /usr/src/linux-6.x

     build directory:    /home/name/build/kernel



   To configure and build the kernel, use::



     cd /usr/src/linux-5.x

     cd /usr/src/linux-6.x

     make O=/home/name/build/kernel menuconfig

     make O=/home/name/build/kernel

     sudo make O=/home/name/build/kernel modules_install install

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

+14 −0
Original line number Diff line number Diff line
@@ -230,6 +230,20 @@ The possible values in this file are: 
     * - 'Mitigation: Clear CPU buffers'

       - The processor is vulnerable and the CPU buffer clearing mitigation is

         enabled.

     * - 'Unknown: No mitigations'

       - The processor vulnerability status is unknown because it is

	 out of Servicing period. Mitigation is not attempted.



Definitions:

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



Servicing period: The process of providing functional and security updates to

Intel processors or platforms, utilizing the Intel Platform Update (IPU)

process or other similar mechanisms.



End of Servicing Updates (ESU): ESU is the date at which Intel will no

longer provide Servicing, such as through IPU or other similar update

processes. ESU dates will typically be aligned to end of quarter.



If the processor is vulnerable then the following information is appended to

the above information: