From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jun 2018 21:27:09 +0000 (-0700)
Subject: Merge tag 'affs-for-4.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.19~935
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3a44fd7e63321338f652714c20a4c75bed9f60b;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'affs-for-4.18-tag' of git://git./linux/kernel/git/kdave/linux

Pull affs fix from David Sterba:
 "A potential memory leak fix for AFFS"

* tag 'affs-for-4.18-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  affs: fix potential memory leak when parsing option 'prefix'
---

e3a44fd7e63321338f652714c20a4c75bed9f60b