Linus Torvalds
8de29a35dc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid ...
Pull HID updates from Jiri Kosina:
- quite a few firmware fixes for RMI driver by Andrew Duggan
- huion and uclogic drivers have been substantially overlaping in
functionality laterly. This redundancy is fixed by hid-huion driver
being merged into hid-uclogic; work done by Benjamin Tissoires and
Nikolai Kondrashov
- i2c-hid now supports ACPI GPIO interrupts; patch from Mika Westerberg
- Some of the quirks, that got separated into individual drivers, have
historically had EXPERT dependency. As HID subsystem matured (as
well as the individual drivers), this made less and less sense. This
dependency is now being removed by patch from Jean Delvare
- Logitech lg4ff driver received a couple of improvements for mode
switching, by Michal Malý
- multitouch driver now supports clickpads, patches by Benjamin
Tissoires and Seth Forshee
- hid-sensor framework received a substantial update; namely support
for Custom and Generic pages is being added; work done by Srinivas
Pandruvada
- wacom driver received substantial update; it now supports
i2c-conntected devices (Mika Westerberg), Bamboo PADs are now
properly supported (Benjamin Tissoires), much improved battery
reporting (Jason Gerecke) and pen proximity cleanups (Ping Cheng)
- small assorted fixes and device ID additions
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (68 commits)
HID: sensor: Update document for custom sensor
HID: sensor: Custom and Generic sensor support
HID: debug: fix error handling in hid_debug_events_read()
Input - mt: Fix input_mt_get_slot_by_key
HID: logitech-hidpp: fix error return code
HID: wacom: Add support for Cintiq 13HD Touch
HID: logitech-hidpp: add a module parameter to keep firmware gestures
HID: usbhid: yet another mouse with ALWAYS_POLL
HID: usbhid: more mice with ALWAYS_POLL
HID: wacom: set stylus_in_proximity before checking touch_down
HID: wacom: use wacom_wac_finger_count_touches to set touch_down
HID: wacom: remove hardcoded WACOM_QUIRK_MULTI_INPUT
HID: pidff: effect can't be NULL
HID: add quirk for PIXART OEM mouse used by HP
HID: add HP OEM mouse to quirk ALWAYS_POLL
HID: wacom: ask for a in-prox report when it was missed
HID: hid-sensor-hub: Fix sparse warning
HID: hid-sensor-hub: fix attribute read for logical usage id
HID: plantronics: fix Kconfig default
HID: pidff: support more than one concurrent effect
...
2015-04-14 09:25:26 -07:00
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
libceph: tcp_nodelay support
2015-02-19 13:31:40 +03:00
clk: omap: compile legacy omap3 clocks conditionally
2015-02-03 11:06:11 -08:00
fsl /bestcomm
iio: add support for hardware fifo
2015-03-29 16:17:10 +01:00
irqchip core change for v4.1 (round 3)
2015-04-11 11:17:28 +02:00
USB patches for 4.1-rc1
2015-04-13 17:07:21 -07:00
net/mlx4_core: Fix wrong mask and error flow for the update-qp command
2015-03-02 15:27:19 -05:00
mmc: dw_mmc: fix fifo ordering in big endian
2015-04-09 09:08:15 +02:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
SCSI misc on 20150209
2015-02-11 10:28:45 -08:00
Revert "pinctrl: consumer: use correct retval for placeholder functions"
2015-03-05 10:08:14 +01:00
ARM: OMAP2: HSMMC: explicit fields to declare cover/card detect pin
2015-03-27 12:19:37 +01:00
power: max17042_battery: Use reg type instead of chip type
2015-04-06 17:46:27 +02:00
Merge remote-tracking branches 'regulator/topic/mode', 'regulator/topic/notifier', 'regulator/topic/palmas', 'regulator/topic/qcom' and 'regulator/topic/stw481x' into regulator-next
2015-04-10 19:16:03 +01:00
rtc: add driver for DS1685 family of real time clocks
2015-02-16 17:56:05 -08:00
soc /ti
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/pl022', 'spi/topic/pm' and 'spi/topic/pxa2xx' into spi-next
2015-04-11 23:09:18 +01:00
sunrpc: make debugfs file creation failure non-fatal
2015-03-31 14:15:08 -04:00
Merge 4.0-rc7 into usb-next
2015-04-07 11:17:34 +02:00
uwb: Remove umc bus legacy suspend/resume support
2015-03-18 17:27:03 +01:00
ACPI: Add interfaces to parse IOAPIC ID for IOAPIC hotplug
2015-02-05 15:09:26 +01:00
libata: Implement support for sense data reporting
2015-03-27 11:59:22 -04:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
block: merge __bio_map_user_iov into bio_map_user_iov
2015-02-05 09:30:43 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
Defer processing of REQ_PREEMPT requests for blocked devices
2015-04-08 09:41:41 -07:00
block: remove unused function blk_bio_map_sg
2015-02-11 11:24:14 -07:00
clk: Add __clk_hw_set_clk helper function
2015-02-18 09:40:07 -08:00
clk: introduce clk_is_match
2015-03-11 15:56:59 -07:00
clockevents: Cleanup dead cpu explicitely
2015-04-03 08:44:37 +02:00
clocksource: Rename __clocksource_updatefreq_*() to __clocksource_update_freq_*()
2015-03-13 08:07:08 +01:00
mm/compaction: add tracepoint to observe behaviour of compaction defer
2015-02-11 17:06:04 -08:00
compiler: introduce __alias(symbol) shortcut
2015-02-13 21:21:40 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
locking: Remove atomicy checks from {READ,WRITE}_ONCE
2015-03-27 09:42:01 +01:00
coresight: remove the unnecessary function coresight_is_bit_set()
2015-02-04 10:42:55 -08:00
cpuidle: remove state_count field from struct cpuidle_device
2015-04-03 13:15:50 +02:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
VFS: Split DCACHE_FILE_TYPE into regular and special types
2015-02-22 11:38:38 -05:00
debugfs: Provide a file creation function that also takes an initial size
2015-02-17 12:21:51 -05:00
dm snapshot: suspend merging snapshot when doing exception handover
2015-02-27 14:53:16 -05:00
device: Add dev_of_node() accessor
2015-03-25 14:53:58 +01:00
Merge branch 'topic/rcar' into for-linus
2015-02-02 16:55:43 -08:00
include/linux/dmapool.h: declare struct device
2015-04-07 16:45:33 -07:00
x86/efi: Add a "debug" option to the efi= cmdline
2015-04-01 12:46:22 +01:00
exportfs: add methods for block layout exports
2015-02-05 14:35:17 +01:00
f2fs: introduce macros to convert bytes and blocks in f2fs
2015-02-11 17:04:48 -08:00
fix mremap() vs. ioctx_kill() race
2015-04-06 17:50:59 -04:00
fsnotify: fix handling of renames in audit
2015-02-10 14:30:28 -08:00
The updates included in this pull request for ftrace are:
2015-02-12 08:37:41 -08:00
mm/mempolicy.c: merge alloc_hugepage_vma to alloc_pages_vma
2015-02-11 17:06:04 -08:00
genirq: Provide disable_hardirq()
2015-02-18 15:08:33 +01:00
Merge branch 'for-4.1/sensor-hub' into for-linus
2015-04-13 23:43:34 +02:00
HID: hid-sensor-hub: Add support for application collection
2015-02-23 15:11:52 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2015-04-14 09:25:26 -07:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
mm/hugetlb: take page table lock in follow_huge_pmd()
2015-02-11 17:06:01 -08:00
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-02-21 12:41:50 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-05 14:33:28 -08:00
init.h: Clean up the __setup()/early_param() macros
2015-03-05 09:23:12 +01:00
kasan: enable stack instrumentation
2015-02-13 21:21:41 -08:00
genirq: Allow the irqchip state of an IRQ to be save/restored
2015-04-08 23:28:28 +02:00
ipv6: pull cork initialization into its own function.
2015-02-02 19:28:04 -08:00
irqchip core change for v4.1 (round 3)
2015-04-11 11:17:28 +02:00
irq_work: Fix build failure when CONFIG_IRQ_WORK is not defined
2015-03-23 10:55:21 +01:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
irqflags: Fix (at least latent) code generation issue
2015-02-19 01:08:42 +01:00
jump_label: Allow jump labels to be used in assembly
2015-04-09 09:40:24 +02:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
kdb: Avoid printing KERN_ levels to consoles
2015-02-19 12:39:02 -06:00
kernel.h: remove ancient __FUNCTION__ hack
2015-02-12 18:54:13 -08:00
kernfs: remove KERNFS_STATIC_NAME
2015-02-13 21:21:36 -08:00
kexec: add IND_FLAGS macro
2015-02-17 14:34:51 -08:00
KVM: x86: BSP in MSR_IA32_APICBASE is writable
2015-04-08 10:47:02 +02:00
block: fix blk_stack_limits() regression due to lcm() change
2015-03-31 09:45:50 -06:00
lguest: remove NOTIFY call and eventfd facility.
2015-02-11 16:47:46 +10:30
Merge branch 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2015-04-13 16:42:16 -07:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
livepatch: rename config to CONFIG_LIVEPATCH
2015-02-04 11:25:51 +01:00
list_lru: introduce per-memcg lists
2015-02-12 18:54:09 -08:00
mm: numa: do not dereference pmd outside of the lock during NUMA hinting fault
2015-02-12 18:54:08 -08:00
mm: allow page fault handlers to perform the COW
2015-02-16 17:56:03 -08:00
mm: account pmd page tables to the process
2015-02-11 17:06:04 -08:00
mm: move zone lock to a different cache line than order-0 free page lists
2015-04-07 16:45:33 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
2015-03-18 10:46:39 -07:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
netdev: introduce new NETIF_F_HW_SWITCH_OFFLOAD feature flag for switch device offloads
2015-02-01 23:16:33 -08:00
ipv6: protect skb->sk accesses from recursive dereference inside the stack
2015-04-06 16:12:49 -04:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
NFS: Fix a regression in the read() syscall
2015-03-03 13:02:29 -05:00
nfsv3: introduce nfs3_set_ds_client
2015-02-03 11:06:34 -08:00
pnfs/flexfiles: Add the FlexFile Layout Driver
2015-02-03 11:06:52 -08:00
nfs: add mirroring support to pgio layer
2015-02-03 11:06:45 -08:00
NFSv4.1: Clean up bind_conn_to_session
2015-02-18 13:11:09 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
NVMe: Fix potential corruption during shutdown
2015-02-19 16:15:37 -07:00
of: Move of_dma_configure() to device.c to help re-use
2015-03-03 14:42:56 -06:00
of: iommu: Add ptr to OF node arg to of_iommu_configure()
2015-03-03 14:42:55 -06:00
of/pci: Add of_pci_dma_configure() to update DMA configuration
2015-03-03 14:42:57 -06:00
of/platform: Fix sparc:allmodconfig build
2015-03-13 09:45:24 -05:00
oom, PM: make OOM detection in the freezer path raceless
2015-02-11 17:06:03 -08:00
mm: page_counter: pull "-1" handling out of page_counter_memparse()
2015-02-11 17:06:02 -08:00
mm/page_owner.c: remove unnecessary stack_trace field
2015-02-11 17:06:07 -08:00
PCI/ACPI: Optimize device state transition delays
2015-04-08 16:25:25 -05:00
PCI: Don't clear ASPM bits when the FADT declares it's unsupported
2015-04-09 14:20:11 -05:00
Merge branch 'pci/misc' into next
2015-04-10 08:27:18 -05:00
usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h
2015-03-10 15:33:23 -05:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 14:58:12 -08:00
PM: Convert dev_pm_put_subsys_data() into a void function
2015-02-03 22:59:25 +01:00
PM / Domains: Eliminate the mutex for the generic_pm_domain_data
2015-02-03 22:56:53 +01:00
PNP: Allow console to override ACPI device sleep
2015-02-02 10:11:25 -08:00
power_supply: Add power_supply_put for decrementing device reference counter
2015-03-13 23:15:52 +01:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
lib/rbtree.c: fix typo in comment
2015-02-17 14:34:52 -08:00
resources: Move struct resource_list_entry from ACPI into resource core
2015-02-05 15:09:25 +01:00
rhashtable: remove indirection for grow/shrink decision functions
2015-02-27 16:06:02 -05:00
vfs: remove get_xip_mem
2015-02-16 17:56:03 -08:00
drivers/rtc: Provide y2038 safe rtc_class_ops.set_mmss() replacement
2015-04-03 08:18:24 +02:00
Merge branch 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-04-13 16:47:11 -07:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
locking: Remove ACCESS_ONCE() usage
2015-02-24 08:44:16 +01:00
serial: 8250: Use canary to restart console after suspend
2015-02-02 10:11:27 -08:00
serial: uapi: Declare all userspace-visible io types
2015-03-07 03:39:55 +01:00
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
xps: must clear sender_cpu before forwarding
2015-03-11 23:51:18 -04:00
mm: slub: add kernel address sanitizer support for slub allocator
2015-02-13 21:21:41 -08:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
net: bury net/core/iovec.c - nothing in there is used anymore
2015-02-04 01:34:15 -05:00
include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header
2015-03-17 09:25:28 +01:00
mm/util: add kstrdup_const
2015-02-13 21:21:35 -08:00
libstring_helpers.c:string_get_size(): return void
2015-02-12 18:54:13 -08:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
swap: remove unused mem_cgroup_uncharge_swapcache declaration
2015-02-11 17:06:00 -08:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
sysfs: Document struct attribute_group
2015-03-25 13:28:58 +01:00
tcp: mitigate ACK loops for connections as tcp_timewait_sock
2015-02-08 01:03:13 -08:00
thermal: Introduce dummy functions when thermal is not defined
2015-02-24 14:40:42 -04:00
ti-st: clean up data types (fix harmless memory corruption)
2015-02-03 15:48:51 -08:00
clockevents: Cleanup dead cpu explicitely
2015-04-03 08:44:37 +02:00
time: Add timerkeeper::tkr_raw
2015-03-27 09:45:07 +01:00
time, drivers/rtc: Don't bother with rtc_resume() for the nonstop clocksource
2015-04-03 08:18:34 +02:00
tracing: Add condition check to RCU lockdep checks
2015-02-07 19:34:25 -05:00
tty: Remove external interface for tty_set_termios()
2015-02-02 10:11:28 -08:00
linux/types.h: Always use unsigned long for pgoff_t
2015-02-12 18:54:13 -08:00
new helper: dup_iter()
2015-02-17 22:21:11 -05:00
usb: define a generic USB_RESUME_TIMEOUT macro
2015-04-07 12:58:35 -05:00
include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header
2015-03-17 09:25:28 +01:00
kasan, module, vmalloc: rework shadow allocation for modules
2015-03-12 18:46:08 -07:00
staging: vme: mmap() support for vme_user
2015-03-06 17:03:22 -08:00
vmci: propagate msghdr all way down to __qp_memcpy_to_queue()
2015-02-04 01:34:14 -05:00
vt_buffer: drop console buffer copying optimisations
2015-02-02 10:09:54 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
workqueue: dump workqueues on sysrq-t
2015-03-09 09:22:28 -04:00
fs: add dirtytime_expire_seconds sysctl
2015-03-17 12:23:32 -04:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
