From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Sep 2021 18:58:24 +0000 (-0700)
Subject: Merge tag 'spi-fix-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6307
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bedf10b5797a4660c2acc6c3573376f7e5d1c97;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'spi-fix-v5.15-rc1' of git://git./linux/kernel/git/broonie/spi

Pull spi modalias fix from Mark Brown:
 "Fix modalias issues

  As reported by Russell King the change to use OF style modaliases for
  DT enumerated broke at least the spi-nor driver, the patch here
  reverts that change to fix the regression.

  Sadly this will mean that anything that started loading since the
  change to OF modaliases will run into issues, there doesn't seem to be
  any approach which doesn't cause some problems and thi seems like the
  least bad approach - gory details are in the commit log for the
  change.

  I'm currently working through the SPI drivers to add ID tables and
  missing IDs to tables which should address things from the other end,
  this seems more straightforward and robust than any other options"

* tag 'spi-fix-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: Revert modalias changes
---

9bedf10b5797a4660c2acc6c3573376f7e5d1c97