Fixup conflicts for CUDA 11.0.2 and GCC (#19035)
Fixup conflicts for CUDA 11.0.2 and GCC (#19035)

* Fixup conflicts for CUDA 11.0.2 and GCC
* Updates for ppc64le
* Fix missing "or newer"

Co-authored-by: Axel Huebl <02c4e323bbd7725166599555105b52ee0948d12d@plasma.ninja>
iulian787/spack,iulian787/spack,LLNL/spack,iulian787/spack,iulian787/spack,LLNL/spack,LLNL/spack,LLNL/spack,LLNL/spack,iulian787/spack