From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbdFECDV (ORCPT ); Sun, 4 Jun 2017 22:03:21 -0400 Received: from ozlabs.org ([103.22.144.67]:39077 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751281AbdFECDO (ORCPT ); Sun, 4 Jun 2017 22:03:14 -0400 Date: Mon, 5 Jun 2017 12:03:11 +1000 From: Stephen Rothwell To: Mauro Carvalho Chehab Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans Verkuil , Arnd Bergmann Subject: linux-next: manual merge of the v4l-dvb tree with the v4l-dvb-fixes tree Message-ID: <20170605120311.0edff177@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 unreachable CONFIG_CEC_CORE") from the v4l-dvb tree. I fixed it up (I just used the former version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell