From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the v4l-dvb-next tree with the vfs tree Date: Mon, 11 Dec 2017 11:28:54 +1100 Message-ID: <20171211112854.42a7a70a@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:47409 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbdLKA24 (ORCPT ); Sun, 10 Dec 2017 19:28:56 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: Mauro Carvalho Chehab , Al Viro Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Sean Young Hi Mauro, Today's linux-next merge of the v4l-dvb-next tree got a conflict in: drivers/staging/media/lirc/lirc_zilog.c between commit: c23e0cb81e40 ("media: annotate ->poll() instances") from the vfs tree and commit: 28032a347ed0 ("media: staging: remove lirc_zilog driver") from the v4l-dvb-next tree. I fixed it up (I just removed the file) 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