From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Apr 2020 18:01:37 +0000 (-0700)
Subject: Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo... 
X-Git-Tag: v5.15~4122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07d6f6dcc094dc732f9ac6c9b8e3553c692a0847;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 few PCMCIA odd fixes: removing a few spaces and useless casts,
  replacing snprintf() with scnprintf(), and replacing zero-length
  arrays with a flexible-array member"

* 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: remove some unused space characters
  pcmcia: soc_common.h: Replace zero-length array with flexible-array member
  pcmcia: cs_internal.h: Replace zero-length array with flexible-array member
  pcmcia: Use scnprintf() for avoiding potential buffer overflow
  pcmcia: omap: remove useless cast for driver.name
---

07d6f6dcc094dc732f9ac6c9b8e3553c692a0847