moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge fecfd01539 ("Merge tag 'leds-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds") into android-mainline

Browse Source 
Steps on the way to 5.12-rc1

Resolves merge conflicts in:
	drivers/dma-buf/dma-heap.c
	drivers/dma-buf/heaps/cma_heap.c
	drivers/dma-buf/heaps/system_heap.c
	include/linux/dma-heap.h

Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibb32dbdba5183c9e19f5d1e94016cc1ae9616173
This commit is contained in:
Greg Kroah-Hartman
2021-03-06 20:20:35 +01:00
parent 3db2a71497 fecfd01539
commit 14f1854cdb
600 changed files with 19612 additions and 5745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mm/mlock.c
View File

@@ -622,7 +622,7 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm,
vma = find_vma(mm, start);
if (vma == NULL)
vma = mm->mmap;
return 0;
for (; vma ; vma = vma->vm_next) {
if (start >= vma->vm_end)