Commit 42b16d3a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v6.11' into for-6.12/block 

Merge in 6.11 final to get the fix for preventing deadlocks on an
elevator switch, as there's a fixup for that patch.

* tag 'v6.11': (1788 commits)
  Linux 6.11
  Revert "KVM: VMX: Always honor guest PAT on CPUs that support self-snoop"
  pinctrl: pinctrl-cy8c95x0: Fix regcache
  cifs: Fix signature miscalculation
  mm: avoid leaving partial pfn mappings around in error case
  drm/xe/client: add missing bo locking in show_meminfo()
  drm/xe/client: fix deadlock in show_meminfo()
  drm/xe/oa: Enable Xe2+ PES disaggregation
  drm/xe/display: fix compat IS_DISPLAY_STEP() range end
  drm/xe: Fix access_ok check in user_fence_create
  drm/xe: Fix possible UAF in guc_exec_queue_process_msg
  drm/xe: Remove fence check from send_tlb_invalidation
  drm/xe/gt: Remove double include
  net: netfilter: move nf flowtable bpf initialization in nf_flow_table_module_init()
  PCI: Fix potential deadlock in pcim_intx()
  workqueue: Clear worker->pool in the worker thread context
  net: tighten bad gso csum offset check in virtio_net_hdr
  netlink: specs: mptcp: fix port endianness
  net: dpaa: Pad packets to ETH_ZLEN
  mptcp: pm: Fix uaf in __timer_delete_sync
  ...
parents 4208c562 98f7e32f

.mailmap

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ Amit Nischal <quic_anischal@quicinc.com> <anischal@codeaurora.org> 
Andi Kleen <ak@linux.intel.com> <ak@suse.de>

Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>

Andreas Herrmann <aherrman@de.ibm.com>

Andreas Hindborg <a.hindborg@kernel.org> <a.hindborg@samsung.com>

Andrej Shadura <andrew.shadura@collabora.co.uk>

Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>

Andrew Morton <akpm@linux-foundation.org>
@@ -166,6 +167,7 @@ Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com> 
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>

David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -268,6 +270,7 @@ James Ketrenos <jketreno@io.(none)> 
Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>

Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>

Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>
@@ -353,6 +356,8 @@ Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org> 
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>
@@ -524,6 +529,7 @@ Pavankumar Kondeti <quic_pkondeti@quicinc.com> <pkondeti@codeaurora.org> 
Peter A Jonsson <pj@ludd.ltu.se>

Peter Oruba <peter.oruba@amd.com>

Peter Oruba <peter@oruba.de>

Pierre-Louis Bossart <pierre-louis.bossart@linux.dev> <pierre-louis.bossart@linux.intel.com>

Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>

Praveen BP <praveenbp@ti.com>

Pradeep Kumar Chitrapu <quic_pradeepc@quicinc.com> <pradeepc@codeaurora.org>
@@ -613,6 +619,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Sriram Yagnaraman <sriram.yagnaraman@ericsson.com> <sriram.yagnaraman@est.tech>

Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu

+3 −3
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ Description: (RW) The front button on the Turris Omnia router can be 
		interrupt.



		This file switches between these two modes:

		- "mcu" makes the button press event be handled by the MCU to

		 - ``mcu`` makes the button press event be handled by the MCU to

		   change the LEDs panel intensity.

		- "cpu" makes the button press event be handled by the CPU.

		 - ``cpu`` makes the button press event be handled by the CPU.



		Format: %s.

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

+2 −1
Original line number Diff line number Diff line
@@ -562,7 +562,8 @@ Description: Control Symmetric Multi Threading (SMT) 
			 ================ =========================================



			 If control status is "forceoff" or "notsupported" writes

			 are rejected.

			 are rejected. Note that enabling SMT on PowerPC skips

			 offline cores.



What:		/sys/devices/system/cpu/cpuX/power/energy_perf_bias

Date:		March 2019

Documentation/ABI/testing/sysfs-timecard

+18 −13
Original line number Diff line number Diff line
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED 
		the estimated point where the FPGA latches the PHC time.  This

		value may be changed by writing an unsigned integer.



What:		/sys/class/timecard/ocpN/ttyGNSS

What:		/sys/class/timecard/ocpN/ttyGNSS2

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty

Date:		August 2024

Contact:	Vadim Fedorenko <vadim.fedorenko@linux.dev>

Description:	(RO) Directory containing the sysfs nodes for TTY attributes



What:		/sys/class/timecard/ocpN/tty/ttyGNSS

What:		/sys/class/timecard/ocpN/tty/ttyGNSS2

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	These optional attributes link to the TTY serial ports

		associated with the GNSS devices.

Description:	(RO) These optional attributes contain names of the TTY serial

		ports associated with the GNSS devices.



What:		/sys/class/timecard/ocpN/ttyMAC

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyMAC

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		associated with the Miniature Atomic Clock.

Description:	(RO) This optional attribute contains name of the TTY serial

		port associated with the Miniature Atomic Clock.



What:		/sys/class/timecard/ocpN/ttyNMEA

Date:		September 2021

What:		/sys/class/timecard/ocpN/tty/ttyNMEA

Date:		August 2024

Contact:	Jonathan Lemon <jonathan.lemon@gmail.com>

Description:	This optional attribute links to the TTY serial port

		which outputs the PHC time in NMEA ZDA format.

Description:	(RO) This optional attribute contains name of the TTY serial

		port which outputs the PHC time in NMEA ZDA format.



What:		/sys/class/timecard/ocpN/utc_tai_offset

Date:		September 2021

Documentation/admin-guide/cgroup-v2.rst

+4 −3
Original line number Diff line number Diff line
@@ -1717,9 +1717,10 @@ The following nested keys are defined. 
	entries fault back in or are written out to disk.



  memory.zswap.writeback

	A read-write single value file. The default value is "1". The

	initial value of the root cgroup is 1, and when a new cgroup is

	created, it inherits the current value of its parent.

	A read-write single value file. The default value is "1".

	Note that this setting is hierarchical, i.e. the writeback would be

	implicitly disabled for child cgroups if the upper hierarchy

	does so.



	When this is set to 0, all swapping attempts to swapping devices

	are disabled. This included both zswap writebacks, and swapping due