summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
Commit message (Expand)AuthorAgeFilesLines
* drivers:staging:android:ashmem: Changing return type from int to loff_tRohit Kumar2018-03-191-1/+1
* staging: android: ion: Update wording in drivers/staging/android/ion/KconfigPhillip Potter2018-03-191-1/+1
* Merge 4.16-rc6 into staging-nextGreg Kroah-Hartman2018-03-191-13/+10
|\
| * staging: android: ashmem: Fix possible deadlock in ashmem_ioctlYisheng Xie2018-03-061-5/+3
| * staging: android: ashmem: Fix lockdep issue during llseekJoel Fernandes2018-03-011-8/+7
* | Merge 4.16-rc3 into staging-nextGreg Kroah-Hartman2018-02-262-8/+28
|\|
| * staging: android: ion: Zero CMA allocated memoryLiam Mark2018-02-161-0/+17
| * staging: android: ashmem: Fix a race condition in pin ioctlsBen Hutchings2018-02-161-8/+11
* | staging: android: ion: Remove check of idev->debug_rootYisheng Xie2018-02-221-3/+0
* | staging: android: ion: Remove check of debug_fileYisheng Xie2018-02-221-7/+2
* | staging: android: ion: Initialize dma_address of new sg listLiam Mark2018-02-201-1/+1
* | staging: android: ion: Combine cache and uncache poolsYisheng Xie2018-02-164-83/+16
* | staging: android: ion: Cleanup ion_page_pool_alloc_pagesYisheng Xie2018-02-161-6/+2
* | staging: android: ion: Return void instead of intYisheng Xie2018-02-161-2/+1
* | staging: android: ion: Remove dead code in ion_page_pool_freeYisheng Xie2018-02-161-5/+1
* | staging: android: ion: Remove lable debugfs_doneYisheng Xie2018-02-161-4/+1
* | staging: android: ion: Avoid NULL point in error pathYisheng Xie2018-02-161-7/+3
* | staging: android: ion: Nuke ion_page_pool_initYisheng Xie2018-02-161-7/+0
* | staging: android: ion: Remove unused include files for ion_page_pool.cYisheng Xie2018-02-161-4/+0
* | staging: android: ion: Remove unused declaration ion_buffer_fault_user_mappingsYisheng Xie2018-02-161-9/+0
|/
* Merge tag 'staging-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2018-02-0113-130/+65
|\
| * staging: android: ion: Switch from WARN to pr_warnLaura Abbott2018-01-091-1/+3
| * staging: android: ion: Add __GFP_NOWARN for system contig heapLaura Abbott2018-01-091-1/+1
| * staging: android: check the return value of register_shrinkerXiongwei Song2018-01-081-1/+7
| * staging: android: check for error from register_shrinker in ion_heap_init_shr...Xiongwei Song2018-01-083-5/+10
| * staging: android: ashmem: add procfs fdinfo helperZhai Zhaoxuan2018-01-081-0/+19
| * Merge 4.15-rc6 into staging-nextGreg Kroah-Hartman2018-01-023-7/+14
| |\
| * | staging: android: add identifiers to function parametersAshish Kalra2017-12-061-1/+2
| * | staging: android: Fix checkpatch.pl errorAshish Kalra2017-12-061-3/+3
| * | staging: ion: reorder includeBenjamin Gaignard2017-11-281-7/+7
| * | staging: android: Remove redundant license textGreg Kroah-Hartman2017-11-2811-111/+0
| * | staging: android: add SPDX identifiers to all android driver filesGreg Kroah-Hartman2017-11-2813-0/+13
* | | staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctlViktor Slavkovic2018-01-091-0/+2
| |/ |/|
* | staging: android: ion: Fix dma direction for dma_sync_sg_for_cpu/deviceSushmita Susheelendra2017-12-191-2/+2
* | staging: ion: Fix ion_cma_heap allocationsJohn Stultz2017-12-192-5/+12
|/
* Merge tag 'staging-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2017-11-134-10/+6
|\
| * staging: android: Fix checkpatch.pl errorSidong Yang2017-11-061-1/+1
| * staging: ion: simplify ioctl args checking functionBenjamin Gaignard2017-11-021-6/+5
| * staging: android: ion: remove redundant variable tableColin Ian King2017-11-021-2/+0
| * staging: android: TODO: Removing an invalid issueJoaquin Garmendia Cabrera2017-10-031-1/+0
| * staging: Android: follow coding guidlinesKeerthi Reddy2017-09-181-1/+1
* | License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseGreg Kroah-Hartman2017-11-021-0/+1
|/
* Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2017-09-141-21/+8
|\
| * ashmem: switch to ->read_iterChristoph Hellwig2017-09-041-21/+8
* | Staging: android: use BIT macroMateusz Nowotyński2017-07-161-2/+2
* | Staging: android: Fix code alignment issueMateusz Nowotyński2017-07-161-4/+4
* | Staging: android: Remove unnecessary blank linesMateusz Nowotyński2017-07-161-2/+0
* | Staging: android: fix sizeof style issueMateusz Nowotyński2017-07-161-1/+1
* | Staging: android: remove unnecessary blank linesMateusz Nowotyński2017-07-161-1/+0
* | staging: android: ion: statify __ion_add_cma_heapsKamal Heib2017-07-161-1/+1
|/