From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Dec 2019 20:14:31 +0000 (-0800)
Subject: Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~4915
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6794862a16ef41f753abd75c03a152836e4c8028;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'for-5.5-rc1-kconfig-tag' of git://git./linux/kernel/git/kdave/linux

Pull btrfs Kconfig fix from David Sterba:
 "This adds the config dependency integrating the crypto code and btrfs
  support for blake2b (added in this dev cycle, via different trees).

  Without it the option had to be selected manually"

* tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: add Kconfig dependency for BLAKE2B
---

6794862a16ef41f753abd75c03a152836e4c8028