From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Dec 2024 17:27:07 +0000 (-0800)
Subject: Merge tag 'staging-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v6.13-rc3~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=3de4f6d919195678fa400c4da2bb5fda4a124632;p=linux-2.6-block.git

Merge tag 'staging-6.13-rc3' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
 "Here are some small staging gpib driver build and bugfixes for issues
  that have been much-reported (should finally fix Guenter's build
  issues). There are more of these coming in later -rc releases, but for
  now this should fix the majority of the reported problems.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: gpib: Fix i386 build issue
  staging: gpib: Fix faulty workaround for assignment in if
  staging: gpib: Workaround for ppc build failure
  staging: gpib: Make GPIB_NI_PCI_ISA depend on HAS_IOPORT
---

3de4f6d919195678fa400c4da2bb5fda4a124632