From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jan 2022 20:41:13 +0000 (-0800)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Tag: v6.1-rc5~2277
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4aa1b8257fba5931511a7e152bcbbb3dd673c6c1;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'pcmcia-next' of git://git./linux/kernel/git/brodo/linux

Pull pcmcia updates from Dominik Brodowski:
 "A number of odd cleanups and fixes, including one for a small race in
  the handling of the pccardd kernel thread"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: fix setting of kthread task states
  MAINTAINERS: update PCMCIA tree
  pcmcia: use sysfs_emit{,_at} for sysfs output
  pcmcia: make pcmcia_release_io() void, as no-one is interested in return value
  pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in nonstatic_find_mem_region()
  pcmcia: rsrc_nonstatic: Fix a NULL pointer dereference in __nonstatic_find_io_region()
  pcmcia: comment out unused exca_readw() function
  pcmcia: Make use of the helper macro SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()
  pcmcia: clean up dead drivers for CompuLab CM-X255/CM-X270 boards
---

4aa1b8257fba5931511a7e152bcbbb3dd673c6c1