Steps on the way to 6.0-rc1
Resolves merge conflicts with:
include/ufs/ufshcd.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifb6b6d3fefbce01620b120ccefd51acf252d72d5
In commit 2b4c206963 ("clk: sunxi: Limit legacy clocks to 32-bit ARM")
the CLK_SUNXI config symbol had the dependency properly fixed up, so we
no longer need to specify that we have this disabled, it's the default
for now. So remove it from the gki_defconfig file to fix the build up.
Fixes: 2b4c206963 ("clk: sunxi: Limit legacy clocks to 32-bit ARM")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib0b1fe3a716b8efa592d18b217cffedb27f6137d
Steps on the way to 6.0-rc1
Resolves merge conflict with:
include/linux/clk-provider.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifff54041c5978afe50c4ad777dec9dba3955eb62
In commit 3158e39aa5 ("phy: qcom-qmp: switch to new split QMP PHY
driver") the qcom-qmp driver got split up into smaller drivers, so
update the BUILD.bazel file so that the build can continue to work
properly.
Fixes: 3158e39aa5 ("phy: qcom-qmp: switch to new split QMP PHY driver")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I23da8f220c78a497d2a7d2406cbcca36c4637b6f
Signed-off-by: Will McVicker <willmcvicker@google.com>
In commit 1045a06724 ("remove CONFIG_ANDROID"), CONFIG_ANDROID was
removed, yet the xfrm networking code was doing some functionally
different things if this option was, or was not, enabled. Restore the
functionality by having the xfrm code check CONFIG_GKI_HACKS_TO_FIX
instead.
Fixes: 1045a06724 ("remove CONFIG_ANDROID")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib153d5ef8a6935f56e634bcac5afef5070ec9f51
In commit 1045a06724 ("remove CONFIG_ANDROID"), CONFIG_ANDROID was
removed, so also remove it from the gki_defconfig files to fix up the
build.
Fixes: 1045a06724 ("remove CONFIG_ANDROID")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If773c7903325f5b0c56f0815465eeefc4a2cbcca
In commit 1045a06724 ("remove CONFIG_ANDROID"), CONFIG_ANDROID is
removed, so fix up the CONFIG_ASHMEM build option to not require it to
be selected and built properly.
Fixes: 1045a06724 ("remove CONFIG_ANDROID")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If9cdf1350949cf98444c20d778d1ca1228a6cd6d
Steps on the way to 6.0-rc1
Resolves merge conflicts in:
drivers/android/Kconfig
drivers/android/binder.c
drivers/misc/Makefile
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ied4316f324d592bf13d257871d9a27114a59f783
The upstream commit 817819b27e ("media: Replace dependency on
VIDEO_V4L2_SUBDEV_API with select") made VIDEO_V4L2_SUBDEV_API hidden to
clean up the code. Since GKI wants to include this config without
including the specific vendor drivers that select this config, add it to
the GKI_HIDDEN_MEDIA_CONFIGS.
Fixes: 817819b27e ("media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select")
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3db3b4cb2de0a1e3a282c5bdb5b584892a8b1fcc
Steps on the way to 6.0-rc1
Resolves conflicts in:
drivers/md/Makefile
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia92bbc0301be0797b06a04a359ffdb6406364461
Changes in 6.0-rc1 broke the out-of-tree dm-table.c changes, so fix
things up to be able to build properly again.
Bug: 147209885
Bug: 160883266
Bug: 160883801
Fixes: fd35c92fc4 ("ANDROID: dm: add support for passing through derive_sw_secret")
Cc: Barani Muthukumaran <bmuthuku@codeaurora.org>
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1c66f45414083b3cc9fdb4d17dc9f87f2fd34eb0
Add vendor hook for hung task detect, so we can decide which
threads need to check, avoiding false alarms.
Bug: 188684133
Change-Id: I5d7dfeb071cbfda8121134c38a458202aaa3a8c6
Signed-off-by: Huang Yiwei <hyiwei@codeaurora.org>
This reverts commit 25de28e49e as it
conflicts with upstream kunit changes in 6.0-rc1.
If it is still needed, please submit it usptream as it is adding a new
user/kernel api for some unknown reason.
Bug: 231160619
Cc: Joe Fradley <joefradley@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I12650bf4ca232cf416969c1b032003df80125ffc
This reverts commit 39f5348cf7 as it
conflicts with upstream kunit changes in 6.0-rc1.
If this is still needed, please submit upstream.
Bug: 231160619
Cc: Joe Fradley <joefradley@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I17cc72883f87ab7647cc9e21e7770f79f5400a65
This export was removed by the upstream commit 6390383b67
("thermal/core: Remove unneeded EXPORT_SYMBOLS") since it's only used by
the thermal frameworks. Pixel 6 is using this symbol for it's external
thermal driver module and is needed for GKI testing.
Bug: 242078480
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: I5f704055f53816c1e3fdfd776c2d253dffbdab72
