summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2017-05-0330-359/+1547
|\
| * Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model...Jiri Kosina2017-05-0130-354/+1540
| |\
| | * livepatch: Cancel transition a safe way for immediate patchesPetr Mladek2017-04-111-20/+0
| | * livepatch: make klp_mutex proper part of APIJiri Kosina2017-03-083-2/+8
| | * livepatch: allow removal of a disabled patchJosh Poimboeuf2017-03-085-53/+96
| | * livepatch: add /proc/<pid>/patch_stateJosh Poimboeuf2017-03-082-0/+33
| | * livepatch: change to a per-task consistency modelJosh Poimboeuf2017-03-0814-49/+947
| | * livepatch: store function sizesJosh Poimboeuf2017-03-082-0/+19
| | * livepatch: use kstrtobool() in enabled_store()Josh Poimboeuf2017-03-081-8/+5
| | * livepatch: move patching functions into patch.cJosh Poimboeuf2017-03-084-202/+247
| | * livepatch: remove unnecessary object loaded checkJosh Poimboeuf2017-03-081-3/+0
| | * livepatch: separate enabled and patched statesJosh Poimboeuf2017-03-082-47/+42
| | * livepatch/s390: add TIF_PATCH_PENDING thread flagMiroslav Benes2017-03-082-1/+32
| | * livepatch/s390: reorganize TIF thread flag bitsJiri Slaby2017-03-081-8/+14
| | * livepatch/powerpc: add TIF_PATCH_PENDING thread flagJosh Poimboeuf2017-03-082-1/+7
| | * livepatch/x86: add TIF_PATCH_PENDING thread flagJosh Poimboeuf2017-03-082-4/+9
| | * livepatch: create temporary klp_update_patch_state() stubJosh Poimboeuf2017-03-082-1/+7
| | * x86/entry: define _TIF_ALLWORK_MASK flags explicitlyJosh Poimboeuf2017-03-081-6/+5
| | * stacktrace/x86: add function for detecting reliable stack tracesJosh Poimboeuf2017-03-087-6/+126
| * | livepatch: add missing printk newlinesJosh Poimboeuf2017-04-161-4/+4
| * | livepatch: Reduce the time of finding module symbolsZhou Chengming2017-03-301-1/+4
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2017-05-0330-1129/+2490
|\ \
| * \ Merge branch 'for-4.12/asus' into for-linusJiri Kosina2017-05-029348-178294/+412295
| |\ \
| | * | HID: asus: support backlight on USB keyboardsCarlo Caione2017-04-122-1/+183
| | * | HID: asus: change mapping from KEY_WLAN to KEY_RFKILLMatjaz Hegedic2017-03-301-1/+1
| | * | HID: asus: ignore declared dummy usagesMatjaz Hegedic2017-03-301-2/+21
| | * | HID: asus: fix and generalize ambiguous preprocessor macrosMatjaz Hegedic2017-03-303-23/+23
| | * | HID: asus: support Republic of Gamers special keysChris Chiu2017-03-304-1/+46
| | * | HID: asus: drop dependency on I2C_HIDDaniel Drake2017-03-301-1/+0
| * | | Merge branch 'for-4.12/sony' into for-linusJiri Kosina2017-05-023-814/+876
| |\ \ \
| | * | | HID: sony: remove redundant check for -ve errColin Ian King2017-04-061-3/+0
| | * | | HID: sony: Make sure to unregister sensors on failureRoderick Colenbrander2017-04-061-3/+2
| | * | | HID: sony: Make DS4 bt poll interval adjustableRoderick Colenbrander2017-04-061-10/+69
| | * | | HID: sony: Set proper bit flags on DS4 output reportRoderick Colenbrander2017-04-061-2/+2
| | * | | HID: sony: DS4 use brighter LED colorsRoderick Colenbrander2017-04-061-4/+4
| | * | | HID: sony: Improve navigation controller axis/button mappingRoderick Colenbrander2017-04-061-101/+85
| | * | | HID: sony: Use DS3 MAC address as unique identifier on USBRoderick Colenbrander2017-04-061-0/+6
| | * | | HID: sony: Perform duplicate device check earlier onRoderick Colenbrander2017-03-211-4/+4
| | * | | HID: sony: Expose DS3 motion sensors through separate deviceRoderick Colenbrander2017-03-211-25/+105
| | * | | HID: sony: Print error on failure to active DS3 / Navigation controllersRoderick Colenbrander2017-03-211-0/+12
| | * | | HID: sony: DS3 comply to Linux gamepad specRoderick Colenbrander2017-03-211-95/+81
| | * | | HID: sony: Mark DS4 touchpad device as a pointerRoderick Colenbrander2017-03-211-1/+1
| | * | | HID: sony: Support motion sensor calibration on dongleRoderick Colenbrander2017-03-211-7/+89
| | * | | HID: sony: Make work handling more genericRoderick Colenbrander2017-03-211-11/+19
| | * | | HID: sony: Treat the ds4 dongle as a separate deviceRoderick Colenbrander2017-03-211-48/+51
| | * | | HID: sony: Remove report descriptor fixup for DS4Roderick Colenbrander2017-03-211-202/+59
| | * | | HID: sony: Report hardware timestamp for DS4 sensor valuesRoderick Colenbrander2017-03-211-0/+27
| | * | | HID: sony: Calibrate DS4 motion sensorsRoderick Colenbrander2017-03-211-28/+184
| | * | | HID: sony: Report DS4 motion sensors through a separate deviceRoderick Colenbrander2017-03-213-296/+117
| | * | | HID: sony: Use LED_CORE_SUSPENDRESUMEFrank Praznik2017-03-061-30/+15