| commit | 6794862a16ef41f753abd75c03a152836e4c8028 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 09 12:14:31 2019 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Dec 09 12:14:31 2019 -0800 |
| tree | 979c1cabe2988276cbeb0409ea4e1b36996068ca | |
| parent | 184b8f7f91ca7938c09533df83ce84817e682975 [diff] | |
| parent | 78f926f72e43e4b974f69688593a9b682089e82a [diff] |
Merge tag 'for-5.5-rc1-kconfig-tag' of git://git.kernel.org/pub/scm/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