Commit 0ce096db authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v6.1-rc6' into x86/core, to resolve conflicts 



Resolve conflicts between these commits in arch/x86/kernel/asm-offsets.c:

 # upstream:
 debc5a1e ("KVM: x86: use a separate asm-offsets.c file")

 # retbleed work in x86/core:
 5d821386 ("x86/retbleed: Add SKL return thunk")

... and these commits in include/linux/bpf.h:

  # upstram:
  18acb7fa ("bpf: Revert ("Fix dispatcher patchable function entry to 5 bytes nop")")

  # x86/core commits:
  931ab636 ("x86/ibt: Implement FineIBT")
  bea75b33 ("x86/Kconfig: Introduce function padding")

The latter two modify BPF_DISPATCHER_ATTRIBUTES(), which was removed upstream.

 Conflicts:
	arch/x86/kernel/asm-offsets.c
	include/linux/bpf.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2d08a893 eb708140

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Christoph Hellwig <hch@lst.de> 
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

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

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>

Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
@@ -353,7 +354,8 @@ Peter Oruba <peter@oruba.de> 
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
@@ -414,6 +416,7 @@ TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org> 
TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>

Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

CREDITS

+9 −0
Original line number Diff line number Diff line
@@ -918,6 +918,11 @@ S: Ottawa, Ontario 
S: K1N 6Z9

S: CANADA



N: Vivien Didelot

E: vivien.didelot@gmail.com

D: DSA framework and MV88E6XXX driver

S: Montreal, Quebec, Canada



N: Jeff Dike

E: jdike@karaya.com

W: http://user-mode-linux.sourceforge.net
@@ -2447,6 +2452,10 @@ S: 482 Shadowgraph Dr. 
S: San Jose, CA  95110

S: USA



N: Michal Marek

E: michal.lkml@markovi.net

D: Kbuild Maintainer 2009-2017



N: Martin Mares

E: mj@ucw.cz

W: http://www.ucw.cz/~mj/

Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Description: A collection of all the memory tiers allocated. 




What:		/sys/devices/virtual/memory_tiering/memory_tierN/

		/sys/devices/virtual/memory_tiering/memory_tierN/nodes

		/sys/devices/virtual/memory_tiering/memory_tierN/nodelist

Date:		August 2022

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	Directory with details of a specific memory tier
@@ -21,5 +21,5 @@ Description: Directory with details of a specific memory tier 
		A smaller value of N implies a higher (faster) memory tier in the

		hierarchy.



		nodes: NUMA nodes that are part of this memory tier.

		nodelist: NUMA nodes that are part of this memory tier.

Documentation/admin-guide/acpi/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ the Linux ACPI support. 
   :maxdepth: 1



   initrd_table_override

   dsdt-override

   ssdt-overlays

   cppc_sysfs

   fan_performance_states

Documentation/admin-guide/device-mapper/verity.rst

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ root_hash_sig_key_desc <key_description> 
    also gain new certificates at run time if they are signed by a certificate

    already in the secondary trusted keyring.



try_verify_in_tasklet

    If verity hashes are in cache, verify data blocks in kernel tasklet instead

    of workqueue. This option can reduce IO latency.



Theory of operation

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