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

Commit 063e0477 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/urgent 



Merge back Linus's latest branch so that we pick up the uprobes changes.

( I tested this branch locally and while it's one from the middle of the
  merge window it's a good one to base further work off. )

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 59cd358a 731a7378

Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533

0 → 100644
+15 −0
Original line number Diff line number Diff line 
What:		/sys/bus/i2c/devices/.../output_hvled[n]

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the controlling backlight device for high-voltage current

		sink HVLED[n] (n = 1, 2) (0, 1).



What:		/sys/bus/i2c/devices/.../output_lvled[n]

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the controlling led device for low-voltage current sink

		LVLED[n] (n = 1..5) (0..3).

Documentation/ABI/testing/sysfs-class-backlight-driver-lm3533

0 → 100644
+48 −0
Original line number Diff line number Diff line 
What:		/sys/class/backlight/<backlight>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the ALS output channel used as input in

		ALS-current-control mode (0, 1), where



		0 - out_current0 (backlight 0)

		1 - out_current1 (backlight 1)



What:		/sys/class/backlight/<backlight>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/backlight/<backlight>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this backlight (0, 1).



What:		/sys/class/backlight/<backlight>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/backlight/<backlight>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/ABI/testing/sysfs-class-led-driver-lm3533

0 → 100644
+65 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/<led>/als_channel

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the ALS output channel to use as input in

		ALS-current-control mode (1, 2), where



		1 - out_current1

		2 - out_current2



What:		/sys/class/leds/<led>/als_en

Date:		May 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Enable ALS-current-control mode (0, 1).



What:		/sys/class/leds/<led>/falltime

What:		/sys/class/leds/<led>/risetime

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the pattern generator fall and rise times (0..7), where



		0 - 2048 us

		1 - 262 ms

		2 - 524 ms

		3 - 1.049 s

		4 - 2.097 s

		5 - 4.194 s

		6 - 8.389 s

		7 - 16.78 s



What:		/sys/class/leds/<led>/id

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Get the id of this led (0..3).



What:		/sys/class/leds/<led>/linear

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the brightness-mapping mode (0, 1), where



		0 - exponential mode

		1 - linear mode



What:		/sys/class/leds/<led>/pwm

Date:		April 2012

KernelVersion:	3.5

Contact:	Johan Hovold <jhovold@gmail.com>

Description:

		Set the PWM-input control mask (5 bits), where



		bit 5 - PWM-input enabled in Zone 4

		bit 4 - PWM-input enabled in Zone 3

		bit 3 - PWM-input enabled in Zone 2

		bit 2 - PWM-input enabled in Zone 1

		bit 1 - PWM-input enabled in Zone 0

		bit 0 - PWM-input enabled

Documentation/ABI/testing/sysfs-driver-wacom

+8 −7
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ Contact: linux-input@vger.kernel.org 
Description:

		Attribute group for control of the status LEDs and the OLEDs.

		This attribute group is only available for Intuos 4 M, L,

		and XL (with LEDs and OLEDs) and Cintiq 21UX2 and Cintiq 24HD

		(LEDs only). Therefore its presence implicitly signifies the

		presence of said LEDs and OLEDs on the tablet device.

		and XL (with LEDs and OLEDs), Intuos 5 (LEDs only), and Cintiq

		21UX2 and Cintiq 24HD (LEDs only). Therefore its presence

		implicitly signifies the presence of said LEDs and OLEDs on the

		tablet device.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance

Date:		August 2011
@@ -48,10 +49,10 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0 
Date:		August 2011

Contact:	linux-input@vger.kernel.org

Description:

		Writing to this file sets which one of the four (for Intuos 4)

		or of the right four (for Cintiq 21UX2 and Cintiq 24HD) status

		LEDs is active (0..3). The other three LEDs on the same side are

		always inactive.

		Writing to this file sets which one of the four (for Intuos 4

		and Intuos 5) or of the right four (for Cintiq 21UX2 and Cintiq

		24HD) status LEDs is active (0..3). The other three LEDs on the

		same side are always inactive.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select

Date:		September 2011

Documentation/DocBook/media/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ IOCTLS = \ 
	VIDIOC_SUBDEV_ENUM_MBUS_CODE \

	VIDIOC_SUBDEV_ENUM_FRAME_SIZE \

	VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL \

	VIDIOC_SUBDEV_G_SELECTION \

	VIDIOC_SUBDEV_S_SELECTION \



TYPES = \

	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \
@@ -193,7 +195,7 @@ DVB_DOCUMENTED = \ 
#



install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_OBJ_DIR)/media_api

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api



$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@