tree 1d48cb7f7d13e4799e316b70593bd785a180510a
parent f6bfcb34b30c2384b6f261f65c090e2483ade5a4
parent b6a7828502dc769e1a5329027bc5048222fa210a
author Greg Kroah-Hartman <gregkh@google.com> 1685375145 +0000
committer Greg Kroah-Hartman <gregkh@google.com> 1685375173 +0000

Merge b6a7828502dc ("Merge tag 'modules-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux") into android-mainline

Steps on the way to 6.4-rc1

Resolves merge conflicts in:
        drivers/dma-buf/heaps/cma_heap.c
        drivers/dma-buf/heaps/system_heap.c
        kernel/module/Makefile
        kernel/module/main.c

Change-Id: Id4e81a702254c7a1ece3bf3a34824997e5d26965
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>