Rebase of [1] on with Andy's latest for-next branch and fixing a few merge conflicts in the process. I also dropped the 3rd patch as it had some disagreement as to how useful it was. [1] https://patchwork.kernel.org/cover/10656189/ Jordan Crouse (2): qcom: soc: llcc-slice: Clear the global drv_data pointer on error qcom: soc: llcc-slice: Consolidate some code drivers/soc/qcom/llcc-sdm845.c | 6 ++ drivers/soc/qcom/llcc-slice.c | 101 +++++++++++++++++++---------- include/linux/soc/qcom/llcc-qcom.h | 6 ++ 3 files changed, 80 insertions(+), 33 deletions(-) -- 2.18.0
