linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree

Hi all, Today's linux-next merge of the v4l-dvb tree got a conflict in: drivers/media/platform/marvell-ccic/mmp-driver.c between commit: e6fcf468c51d ("media: media/platform/marvell-ccic: fix warnings when CONFIG_PM is not enabled") from the v4l-dvb-fixes tree and commit: 009e3b8d9e28

linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree

Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in: include/media/cec-notifier.h between commit: e94c32818d86 ("[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER") from the v4l-dvb-fixes tree and commit: 79eddc992ea4 ("[media] cec-notifier.h: handle unreachabl