Merge branch 'master' into for-next

Sync with Linus' branch in order to be able to apply fixups
of more recent patches.

diff --cc kernel/printk/printk_safe.c
Simple merge

diff --cc lib/bitmap.c
Simple merge