Commit 342123d6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'timers-v6.11-rc7' of... 

Merge tag 'timers-v6.11-rc7' of https://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull clocksource driver fixes from Daniel Lezcano:

  - Remove percpu irq related code in the timer-of initialization
    routine as it is broken but also unused (Daniel Lezcano)

  - Fix return -ETIME when delta exceeds INT_MAX and the next event not
    taking effect sometimes (Jacky Bai)

Link: https://lore.kernel.org/all/d0e93dbd-b796-4726-b38c-089b685591c9@linaro.org
parents 5916be8a 3d5c2f8e

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -166,6 +166,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>
@@ -353,6 +354,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>
@@ -613,6 +616,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/admin-guide/cifs/usage.rst

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ SecurityFlags Flags which control security negotiation and 
			  may use NTLMSSP               		0x00080

			  must use NTLMSSP           			0x80080

			  seal (packet encryption)			0x00040

			  must seal (not implemented yet)               0x40040

			  must seal                                     0x40040



cifsFYI			If set to non-zero value, additional debug information

			will be logged to the system error log.  This field

Documentation/admin-guide/device-mapper/dm-crypt.rst

+8 −7
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ iv_large_sectors 




Module parameters::



   max_read_size

   max_write_size

      Maximum size of read or write requests. When a request larger than this size