From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philipp Zabel Subject: Re: linux-next: manual merge of the drm tree with the v4l-dvb tree Date: Fri, 17 Apr 2015 19:12:31 +0200 Message-ID: <1429290751.3130.52.camel@pengutronix.de> References: <20150415133309.24f0a36a@canb.auug.org.au> <1429088942.3480.6.camel@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:43919 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932630AbbDQRMu (ORCPT ); Fri, 17 Apr 2015 13:12:50 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Dave Airlie Cc: Stephen Rothwell , Mauro Carvalho Chehab , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Laurent Pinchart , Hans Verkuil , Hyun Kwon Am Freitag, den 17.04.2015, 04:07 +0100 schrieb Dave Airlie: > > Am Mittwoch, den 15.04.2015, 13:33 +1000 schrieb Stephen Rothwell: > > > Hi Dave, > > > > > > Today's linux-next merge of the drm tree got a conflict in > > > Documentation/DocBook/media/v4l/subdev-formats.xml between commit > > > 7b0fd4568bee ("[media] v4l: Add RBG and RGB 8:8:8 media bus formats on > > > 24 and 32 bit busses") and e8b2d7a565ae ("[media] v4l: Sort YUV formats > > > of v4l2_mbus_pixelcode") from the v4l-dvb tree and commits 08c38458be7e > > > ("Add BGR888_1X24 and GBR888_1X24 media bus formats"), 0fc63eb104d7 > > > ("Add YUV8_1X24 media bus format") and 203508ef52e3 ("Add > > > RGB666_1X24_CPADHI media bus format") from the drm tree. > > > > > > I fixed it up (almost certainly incorrectly - see below) and can carry > > > the fix as necessary. Please sort out who "owns" this file and try to > > > coordinate updates to it. > > > > Together with the corresponding fixup for include/uapi/linux/media-bus-format.h, > > how about this: > > This should never have gone into my tree if there wasn't someone in the > v4l tree who knew it was coming, > > In future please merge the media-bus-formats through both tree, providing > a stable git tree to both maintainers to pull from, though this may not > avoid all bad cases, it hopefully will avoid this sort of mess. I'll try this next time. > I'm not really sure how best to clean this one up, I think I'd want > patches to my tree that just use the correect values, then it would just > be a normal conflict on merging, instead of renumbering userspace visible > values, So far the media tree has added formats 0x100e 0x100f and 0x2024, so I will send a patch for drm-next that moves these three out of the way, leaving them unused for the merge. The merge conflict resolution will still have to take care of the ordering in media-bus-format.h and the conflicts in subdev-formats.xml are still non-trivial, but at leasts the constant values won't move around anymore. regards Philipp