Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2020 12:19:48 +0000 (14:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Sep 2020 12:19:48 +0000 (14:19 +0200)
Sync with Linus' branch in order to be able to apply fixups
of more recent patches.

1  2 
kernel/printk/printk_safe.c
lib/bitmap.c

Simple merge
diff --cc lib/bitmap.c
Simple merge