Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5bc6cd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c1221321 d8d28c8f

Documentation/acpi/enumeration.txt

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ If the driver needs to perform more complex initialization like getting and 
configuring GPIOs it can get its ACPI handle and extract this information

from ACPI tables.



Currently the kernel is not able to automatically determine from which ACPI

device it should make the corresponding platform device so we need to add

the ACPI device explicitly to acpi_platform_device_ids list defined in

drivers/acpi/acpi_platform.c. This limitation is only for the platform

devices, SPI and I2C devices are created automatically as described below.



DMA support

~~~~~~~~~~~

DMA controllers enumerated via ACPI should be registered in the system to

Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt

+4 −2
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined 
under node /cpus/cpu@0.



Required properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt

  for details

- None



Optional properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for

  details. OPPs *must* be supplied either via DT, i.e. this property, or

  populated at runtime.

- clock-latency: Specify the possible maximum transition latency for clock,

  in unit of nanoseconds.

- voltage-tolerance: Specify the CPU voltage tolerance in percentage.

Documentation/input/event-codes.txt

+13 −0
Original line number Diff line number Diff line
@@ -281,6 +281,19 @@ gestures can normally be extracted from it. 
If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT

device.



INPUT_PROP_TOPBUTTONPAD:

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

Some laptops, most notably the Lenovo *40 series provide a trackstick

device but do not have physical buttons associated with the trackstick

device. Instead, the top area of the touchpad is marked to show

visual/haptic areas for left, middle, right buttons intended to be used

with the trackstick.



If INPUT_PROP_TOPBUTTONPAD is set, userspace should emulate buttons

accordingly. This property does not affect kernel behavior.

The kernel does not provide button emulation for such devices but treats

them as any other INPUT_PROP_BUTTONPAD device.



Guidelines:

==========

The guidelines below ensure proper single-touch and multi-finger functionality.

Documentation/kernel-parameters.txt

+7 −1
Original line number Diff line number Diff line
@@ -2790,6 +2790,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			leaf rcu_node structure.  Useful for very large

			systems.



	rcutree.jiffies_till_sched_qs= [KNL]

			Set required age in jiffies for a

			given grace period before RCU starts

			soliciting quiescent-state help from

			rcu_note_context_switch().



	rcutree.jiffies_till_first_fqs= [KNL]

			Set delay from grace-period initialization to

			first attempt to force quiescent states.
@@ -3526,7 +3532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			the allocated input device; If set to 0, video driver

			will only send out the event without touching backlight

			brightness level.

			default: 0

			default: 1



	virtio_mmio.device=

			[VMMIO] Memory mapped virtio (platform) device.

MAINTAINERS

+17 −3
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ F: drivers/net/hamradio/6pack.c 


8169 10/100/1000 GIGABIT ETHERNET DRIVER

M:	Realtek linux nic maintainers <nic_swsd@realtek.com>

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/realtek/r8169.c
@@ -4511,8 +4510,7 @@ S: Supported 
F:	drivers/idle/i7300_idle.c



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Smirnov <alex.bluesman.smirnov@gmail.com>

M:	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -6958,6 +6956,12 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	drivers/pinctrl/pinctrl-at91.c



PIN CONTROLLER - RENESAS

M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>

L:	linux-sh@vger.kernel.org

S:	Maintained

F:	drivers/pinctrl/sh-pfc/



PIN CONTROLLER - SAMSUNG

M:	Tomasz Figa <t.figa@samsung.com>

M:	Thomas Abraham <thomas.abraham@linaro.org>
@@ -8021,6 +8025,16 @@ F: drivers/ata/ 
F:	include/linux/ata.h

F:	include/linux/libata.h



SERIAL ATA AHCI PLATFORM devices support

M:	Hans de Goede <hdegoede@redhat.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Supported

F:	drivers/ata/ahci_platform.c

F:	drivers/ata/libahci_platform.c

F:	include/linux/ahci_platform.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

L:	linux-scsi@vger.kernel.org