On Thu, Mar 13, 2025 at 04:25:13PM +0200, Andy Shevchenko wrote: > On Thu, Mar 13, 2025 at 02:12:29PM +0000, Mark Brown wrote: > > On Thu, Mar 13, 2025 at 04:01:49PM +0200, Andy Shevchenko wrote: > > > On Thu, Mar 13, 2025 at 12:47:32PM +0000, Mark Brown wrote: > > > > > > This doesn't apply against current code, please check and resend. > > > > > Hmm... It's based on the spi/for-next. Should I use another branch? > > > > I did try to apply it against that in case there were fixes that needed > > merging up, it didn't apply. Are you sure you're using an up to date > > copy? I have ebd50ac3cd97ecae231f92b2d64b68d3c66b3474. > > 87a228960033 spi: Use inclusive language > 0d9a21198453 defconfig: enable SERIAL_MULTI_INSTANTIATE > 90485ebfb4b3 defconfig: enable SPI_TOPCLIFF_PCH > 6d91e1fce386 defconfig: enable EEPROM_AT24 and EEPROM_AT25 > 331ffc354c53 defconfig: enable GPIO_PCH > d519315d6bed Merge remote-tracking branch 'spi/for-next' into HEAD > ebd50ac3cd97 (spi/for-next) Merge remote-tracking branch 'spi/for-6.15' into spi-next > > Yes, the base where it was merged to is eds-acpi branch of my public GH [1], > which has no SPI stuff in there. > [1]: https://github.com/andy-shev/linux/commits/eds-acpi/ $ git checkout -b test-spi-mrg spi/for-next $ git cherry-pick -1 87a228960033 [test-spi-mrg 8a11d1063109] spi: Use inclusive language Date: Fri Dec 8 19:02:54 2023 +0200 2 files changed, 64 insertions(+), 66 deletions(-) In any case there is a v2, please try that one. -- With Best Regards, Andy Shevchenko