On Mon, May 08, 2023 at 11:25:13PM +0100, Conor Dooley wrote: > On Mon, May 08, 2023 at 11:45:26AM +0200, Greg Kroah-Hartman wrote: > > From: Dhruva Gole <d-gole@xxxxxx> > > > > [ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] > > > > Get rid of conditional compilation based on CONFIG_PM_SLEEP because > > it may introduce build issues with certain configs where it maybe disabled > > This is because if above config is not enabled the suspend-resume > > functions are never part of the code but the bcm63xx_spi_pm_ops struct > > still inits them to non-existent suspend-resume functions. > > > > Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") > > > > Signed-off-by: Dhruva Gole <d-gole@xxxxxx> > > Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@xxxxxx > > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > This breaks the build on RISC-V. > > Seems to be messing around happening on the same patch in 6.1 w/ a fixup > patch, but sounds like the fixup didn't apply properly either: > https://lore.kernel.org/stable/2023050845-pancreas-postage-5769@gregkh/ Ok, let me drop this patch, and the add-on one, from all branches now and push out a -rc2. thanks, greg k-h