[PATCH] staging: ion: remove from the tree

Shuah Khan skhan at linuxfoundation.org
Thu Aug 27 16:44:34 UTC 2020


On 8/27/20 6:36 AM, Greg Kroah-Hartman wrote:
> The ION android code has long been marked to be removed, now that we
> dma-buf support merged into the real part of the kernel.
> 
> It was thought that we could wait to remove the ion kernel at a later
> time, but as the out-of-tree Android fork of the ion code has diverged
> quite a bit, and any Android device using the ion interface uses that
> forked version and not this in-tree version, the in-tree copy of the
> code is abandonded and not used by anyone.
> 
> Combine this abandoned codebase with the need to make changes to it in
> order to keep the kernel building properly, which then causes merge
> issues when merging those changes into the out-of-tree Android code, and
> you end up with two different groups of people (the in-kernel-tree
> developers, and the Android kernel developers) who are both annoyed at
> the current situation.  Because of this problem, just drop the in-kernel
> copy of the ion code now, as it's not used, and is only causing problems
> for everyone involved.
> 
> Cc: "Arve Hjønnevåg" <arve at android.com>
> Cc: "Christian König" <christian.koenig at amd.com>
> Cc: Christian Brauner <christian at brauner.io>
> Cc: Christoph Hellwig <hch at infradead.org>
> Cc: Hridya Valsaraju <hridya at google.com>
> Cc: Joel Fernandes <joel at joelfernandes.org>
> Cc: John Stultz <john.stultz at linaro.org>
> Cc: Laura Abbott <laura at labbott.name>
> Cc: Martijn Coenen <maco at android.com>
> Cc: Shuah Khan <shuah at kernel.org>
> Cc: Sumit Semwal <sumit.semwal at linaro.org>
> Cc: Suren Baghdasaryan <surenb at google.com>
> Cc: Todd Kjos <tkjos at android.com>
> Cc: devel at driverdev.osuosl.org
> Cc: dri-devel at lists.freedesktop.org
> Cc: linaro-mm-sig at lists.linaro.org
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   MAINTAINERS                                   |  10 -
>   drivers/staging/android/Kconfig               |   2 -
>   drivers/staging/android/Makefile              |   2 -
>   drivers/staging/android/TODO                  |   5 -
>   drivers/staging/android/ion/Kconfig           |  27 -
>   drivers/staging/android/ion/Makefile          |   4 -
>   drivers/staging/android/ion/ion.c             | 649 ------------------
>   drivers/staging/android/ion/ion.h             | 302 --------
>   drivers/staging/android/ion/ion_cma_heap.c    | 138 ----
>   drivers/staging/android/ion/ion_heap.c        | 286 --------
>   drivers/staging/android/ion/ion_page_pool.c   | 155 -----
>   drivers/staging/android/ion/ion_system_heap.c | 377 ----------
>   drivers/staging/android/uapi/ion.h            | 127 ----
>   tools/testing/selftests/Makefile              |   3 +-
>   tools/testing/selftests/android/Makefile      |  39 --
>   tools/testing/selftests/android/config        |   5 -
>   .../testing/selftests/android/ion/.gitignore  |   4 -
>   tools/testing/selftests/android/ion/Makefile  |  20 -
>   tools/testing/selftests/android/ion/README    | 101 ---
>   tools/testing/selftests/android/ion/ion.h     | 134 ----
>   .../testing/selftests/android/ion/ion_test.sh |  58 --
>   .../selftests/android/ion/ionapp_export.c     | 127 ----
>   .../selftests/android/ion/ionapp_import.c     |  79 ---
>   .../selftests/android/ion/ionmap_test.c       | 136 ----
>   .../testing/selftests/android/ion/ionutils.c  | 253 -------
>   .../testing/selftests/android/ion/ionutils.h  |  55 --
>   .../testing/selftests/android/ion/ipcsocket.c | 227 ------
>   .../testing/selftests/android/ion/ipcsocket.h |  35 -
>   tools/testing/selftests/android/run.sh        |   3 -
>   29 files changed, 1 insertion(+), 3362 deletions(-)
>   delete mode 100644 drivers/staging/android/ion/Kconfig
>   delete mode 100644 drivers/staging/android/ion/Makefile
>   delete mode 100644 drivers/staging/android/ion/ion.c
>   delete mode 100644 drivers/staging/android/ion/ion.h
>   delete mode 100644 drivers/staging/android/ion/ion_cma_heap.c
>   delete mode 100644 drivers/staging/android/ion/ion_heap.c
>   delete mode 100644 drivers/staging/android/ion/ion_page_pool.c
>   delete mode 100644 drivers/staging/android/ion/ion_system_heap.c
>   delete mode 100644 drivers/staging/android/uapi/ion.h
>   delete mode 100644 tools/testing/selftests/android/Makefile
>   delete mode 100644 tools/testing/selftests/android/config
>   delete mode 100644 tools/testing/selftests/android/ion/.gitignore
>   delete mode 100644 tools/testing/selftests/android/ion/Makefile
>   delete mode 100644 tools/testing/selftests/android/ion/README
>   delete mode 100644 tools/testing/selftests/android/ion/ion.h
>   delete mode 100755 tools/testing/selftests/android/ion/ion_test.sh
>   delete mode 100644 tools/testing/selftests/android/ion/ionapp_export.c
>   delete mode 100644 tools/testing/selftests/android/ion/ionapp_import.c
>   delete mode 100644 tools/testing/selftests/android/ion/ionmap_test.c
>   delete mode 100644 tools/testing/selftests/android/ion/ionutils.c
>   delete mode 100644 tools/testing/selftests/android/ion/ionutils.h
>   delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.c
>   delete mode 100644 tools/testing/selftests/android/ion/ipcsocket.h
>   delete mode 100755 tools/testing/selftests/android/run.sh
> 
>

For selftest changes in this patch:

Acked-by: Shuah Khan <skhan at linuxfoundation.org>

thanks,
-- Shuah




More information about the devel mailing list