On 5 July 2016 at 09:46, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Dave, > > On Mon, 4 Jul 2016 15:38:10 +0200 Mark Brown <broonie@xxxxxxxxxx> wrote: >> >> On Mon, Jul 04, 2016 at 03:36:57PM +0200, Arnd Bergmann wrote: >> > On Monday, July 4, 2016 3:22:30 PM CEST Mark Brown wrote: >> >> > > I sent a pull request for the API change to the DRM people which might >> > > be easier given that it's a single commit topic branch rather than the >> > > whole of DRM. >> >> > Agreed, that is probably the best way forward. Does your pull request >> > also contain an equivalent of my two patches? >> >> No, I just sent a pull request for the API change - I don't have the new >> patches in my tree. > > So to be very clear, what you would need to do is merge the one commit > branch that Mark sent you a pull request for: > > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-hdmi-codec-pdata > > and as part of the merge commit (so e.g. "git apply <patch>; git commit > --amend" on top of the merge), add the two patches we are talking about: > > "drm: sti: fix prototypes after API change" > "drm: mediatek: fix prototypes after API change" > > Then any further conflicts can hopefully be fixed up as they appear in > your tree (if any). Or be avoided by people developing against your > tree. Thanks Stephen, I think I've done it correctly, I've just pushed out drm-next with the pull and the two changes amended into the merge. Dave. _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
