Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify