From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 May 2017 01:07:04 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v4.12-rc1~126
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7af4c727c7b6104f94f2ffc3d0899e75a9cc1e55?hp=-c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID subsystem updates from Jiri Kosina:

 - The need for HID_QUIRK_NO_INIT_REPORTS per-device quirk has been
   growing dramatically during past years, so the time has come to
   switch over the default, and perform the pro-active reading only in
   cases where it's really needed (multitouch, wacom).

   The only place where this behavior is (in some form) preserved is
   hiddev so that we don't introduce userspace-visible change of
   behavior.

   From Benjamin Tissoires

 - HID++ support for power_supply / baterry reporting.

   From Benjamin Tissoires and Bastien Nocera

 - Vast improvements / rework of DS3 and DS4 in Sony driver.

   From Roderick Colenbrander

 - Improvment (in terms of getting closer to the Microsoft's
   interpretation of slightly ambiguous specification) of logical range
   interpretation in case null-state is set in the rdesc.

   From Valtteri Heikkilä and Tomasz Kramkowski

 - A lot of newly supported device IDs and small assorted fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (71 commits)
  HID: usbhid: Add HID_QUIRK_NOGET for Aten CS-1758 KVM switch
  HID: asus: support backlight on USB keyboards
  HID: wacom: Move wacom_remote_irq and wacom_remote_status_irq
  HID: wacom: generic: sync pad events only for actual packets
  HID: sony: remove redundant check for -ve err
  HID: sony: Make sure to unregister sensors on failure
  HID: sony: Make DS4 bt poll interval adjustable
  HID: sony: Set proper bit flags on DS4 output report
  HID: sony: DS4 use brighter LED colors
  HID: sony: Improve navigation controller axis/button mapping
  HID: sony: Use DS3 MAC address as unique identifier on USB
  HID: logitech-hidpp: add a sysfs file to tell we support power_supply
  HID: logitech-hidpp: enable HID++ 1.0 battery reporting
  HID: logitech-hidpp: add support for battery status for the K750
  HID: logitech-hidpp: battery: provide CAPACITY_LEVEL
  HID: logitech-hidpp: rename battery level into capacity
  HID: logitech-hidpp: battery: provide ONLINE property
  HID: logitech-hidpp: notify battery on connect
  HID: logitech-hidpp: return an error if the queried feature is not present
  HID: logitech-hidpp: create the battery for all types of HID++ devices
  ...
---

7af4c727c7b6104f94f2ffc3d0899e75a9cc1e55
diff --combined Documentation/admin-guide/kernel-parameters.txt
index 8d676d2a48ac,0464a41cbf3b..e4c9e0e46b95
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -531,6 -531,7 +531,6 @@@
  			[ACPI] acpi_pm
  			[ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,
  				pxa_timer,timer3,32k_counter,timer0_1
 -			[AVR32] avr32
  			[X86-32] pit,hpet,tsc;
  				scx200_hrt on Geode; cyclone on IBM x440
  			[MIPS] MIPS
@@@ -988,7 -989,6 +988,7 @@@
  			earlyprintk=ttySn[,baudrate]
  			earlyprintk=dbgp[debugController#]
  			earlyprintk=pciserial,bus:device.function[,baudrate]
 +			earlyprintk=xdbc[xhciController#]
  
  			earlyprintk is useful when the kernel crashes before
  			the normal console is initialized. It is not enabled by
@@@ -1725,12 -1725,6 +1725,12 @@@
  			kernel and module base offset ASLR (Address Space
  			Layout Randomization).
  
 +	kasan_multi_shot
 +			[KNL] Enforce KASAN (Kernel Address Sanitizer) to print
 +			report on every invalid memory access. Without this
 +			parameter KASAN will print report only for the first
 +			invalid access.
 +
  	keepinitrd	[HW,ARM]
  
  	kernelcore=	[KNL,X86,IA-64,PPC]
@@@ -2425,7 -2419,7 +2425,7 @@@
  			osd-targets. Please see:
  			Documentation/filesystems/pnfs.txt for more explanations
  
 -	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take
 +	nmi_debug=	[KNL,SH] Specify one or more actions to take
  			when a NMI is triggered.
  			Format: [state][,regs][,debounce][,die]
  
@@@ -3178,12 -3172,6 +3178,12 @@@
  	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes
  			See Documentation/blockdev/ramdisk.txt.
  
 +	ras=option[,option,...]	[KNL] RAS-specific options
 +
 +		cec_disable	[X86]
 +				Disable the Correctable Errors Collector,
 +				see CONFIG_RAS_CEC help text.
 +
  	rcu_nocbs=	[KNL]
  			The argument is a cpu list, as described above.
  
@@@ -4127,6 -4115,9 +4127,9 @@@
  	usbhid.mousepoll=
  			[USBHID] The interval which mice are to be polled at.
  
+ 	usbhid.jspoll=
+ 			[USBHID] The interval which joysticks are to be polled at.
+ 
  	usb-storage.delay_use=
  			[UMS] The delay in seconds before a new device is
  			scanned for Logical Units (default 1).