From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 May 2021 18:08:50 +0000 (-0700)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~7270
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=38182162b50aa4e970e5997df0a0c4288147a153;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull pcmcia updates from Dominik Brodowski:
 "A number of patches fixing W=1 kernel build warnings, and one patch
  removing an always-false NULL check"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: rsrc_nonstatic: Fix call-back function as reference formatting
  pcmcia: pcmcia_resource: Fix some kernel-doc formatting/disparities and demote others
  pcmcia: ds: Fix function name disparity in header
  pcmcia: pcmcia_cis: Demote non-conforming kernel-doc headers to standard kernel-doc
  pcmcia: cistpl: Demote non-conformant kernel-doc headers to standard comments
  pcmcia: rsrc_nonstatic: Demote kernel-doc abuses
  pcmcia: ds: Remove if with always false condition
---

38182162b50aa4e970e5997df0a0c4288147a153