summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'xarray-4.20-rc4' of git://git.infradead.org/users/willy/linux-daxLinus Torvalds2018-11-256-185/+387
|\
| * XArray tests: Add missing lockingMatthew Wilcox2018-11-191-0/+10
| * dax: Avoid losing wakeup in dax_lock_mapping_entryMatthew Wilcox2018-11-191-0/+1
| * dax: Fix huge page faultsMatthew Wilcox2018-11-171-8/+4
| * dax: Fix dax_unlock_mapping_entry for PMD pagesMatthew Wilcox2018-11-171-9/+8
| * dax: Reinstate RCU protection of inodeMatthew Wilcox2018-11-161-3/+19
| * dax: Make sure the unlocking entry isn't lockedMatthew Wilcox2018-11-161-0/+1
| * dax: Remove optimisation from dax_lock_mapping_entryMatthew Wilcox2018-11-161-5/+2
| * XArray tests: Correct some 64-bit assumptionsMatthew Wilcox2018-11-161-2/+2
| * XArray: Correct xa_store_rangeMatthew Wilcox2018-11-161-2/+3
| * XArray: Fix DocumentationMatthew Wilcox2018-11-053-8/+12
| * XArray: Handle NULL pointers differently for allocationMatthew Wilcox2018-11-052-12/+29
| * XArray: Unify xa_store and __xa_storeMatthew Wilcox2018-11-051-33/+25
| * XArray: Add xa_store_bh() and xa_store_irq()Matthew Wilcox2018-11-052-1/+56
| * XArray: Turn xa_erase into an exported functionMatthew Wilcox2018-11-052-17/+25
| * XArray: Unify xa_cmpxchg and __xa_cmpxchgMatthew Wilcox2018-11-052-85/+69
| * XArray: Regularise xa_reserveMatthew Wilcox2018-11-054-12/+105
| * nilfs2: Use xa_erase_irqMatthew Wilcox2018-11-051-3/+1
| * XArray: Export __xa_foo to non-GPL modulesMatthew Wilcox2018-11-051-3/+3
| * XArray: Fix xa_for_each with a single element at 0Matthew Wilcox2018-11-052-1/+31
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid...Linus Torvalds2018-11-2411-444/+159
|\ \
| * | Revert "Input: Add the `REL_WHEEL_HI_RES` event code"Benjamin Tissoires2018-11-222-20/+1
| * | Revert "HID: input: Create a utility class for counting scroll events"Benjamin Tissoires2018-11-222-73/+0
| * | Revert "HID: logitech: Add function to enable HID++ 1.0 "scrolling accelerati...Benjamin Tissoires2018-11-221-34/+13
| * | Revert "HID: logitech: Enable high-resolution scrolling on Logitech mice"Benjamin Tissoires2018-11-221-245/+4
| * | Revert "HID: logitech: Use LDJ_DEVICE macro for existing Logitech mice"Benjamin Tissoires2018-11-221-5/+10
| * | Revert "HID: logitech: fix a used uninitialized GCC warning"Benjamin Tissoires2018-11-221-3/+5
| * | Revert "HID: input: simplify/fix high-res scroll event handling"Benjamin Tissoires2018-11-221-21/+22
| * | HID: Add quirk for Primax PIXART OEM miceSebastian Parschauer2018-11-202-0/+4
| * | HID: i2c-hid: Disable runtime PM for LG touchscreenKai-Heng Feng2018-11-192-0/+3
| * | HID: multitouch: Add pointstick support for Cirque TouchpadKai-Heng Feng2018-11-192-0/+9
| * | HID: steam: remove input device when a hid client is running.Rodrigo Rivas Costa2018-11-191-64/+90
| * | Revert "HID: uhid: use strlcpy() instead of strncpy()"David Herrmann2018-11-191-6/+7
| * | HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privilegesEric Biggers2018-11-191-0/+12
| * | HID: input: Ignore battery reported by Symbol DS4308Benson Leung2018-11-122-0/+4
| * | HID: Add quirk for Microsoft PIXART OEM mouseSebastian Parschauer2018-11-082-0/+2
* | | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6...Linus Torvalds2018-11-242-3/+3
|\ \ \
| * | | arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD blockWill Deacon2018-11-231-1/+1
| * | | arm64: sysreg: fix sparse warningsSergey Matyukevich2018-11-231-2/+2
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2018-11-2467-335/+537
|\ \ \ \
| * | | | net: gemini: Fix copy/paste errorAndreas Fiedler2018-11-241-1/+1
| * | | | net: phy: mscc: fix deadlock in vsc85xx_default_configQuentin Schulz2018-11-241-9/+5
| * | | | dt-bindings: dsa: Fix typo in "probed"Fabio Estevam2018-11-241-1/+1
| * | | | net: thunderx: set tso_hdrs pointer to NULL in nicvf_free_snd_queueLorenzo Bianconi2018-11-241-1/+3
| * | | | net: amd: add missing of_node_put()Yangtao Li2018-11-241-1/+3
| * | | | team: no need to do team_notify_peers or team_mcast_rejoin when disabling portHangbin Liu2018-11-241-2/+0
| * | | | virtio-net: fail XDP set if guest csum is negotiatedJason Wang2018-11-231-2/+3
| * | | | virtio-net: disable guest csum during XDP setJason Wang2018-11-231-6/+2
| * | | | net/sched: act_police: add missing spinlock initializationDavide Caratti2018-11-231-0/+1
| * | | | net: don't keep lonely packets forever in the gro hashPaolo Abeni2018-11-231-2/+5