Re: [PATCH] drm: sti: fix prototypes after API change

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: [PATCH] drm: sti: fix prototypes after API change
Date	2016-07-05 01:50 +0200
Message-ID	<rRlMJ-3AJ-9@gated-at.bofh.it> (permalink)
References	<rRbX4-63R-25@gated-at.bofh.it> <rRc6K-670-11@gated-at.bofh.it> <rRcgp-6ag-9@gated-at.bofh.it> <rRcgq-6ag-23@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Dave,

On Mon, 4 Jul 2016 15:38:10 +0200 Mark Brown <broonie@kernel.org> 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.

-- 
Cheers,
Stephen Rothwell

Thread

[PATCH] drm: sti: fix prototypes after API change Arnd Bergmann <arnd@arndb.de> - 2016-07-04 15:20 +0200
  Re: [PATCH] drm: sti: fix prototypes after API change Mark Brown <broonie@kernel.org> - 2016-07-04 15:40 +0200
    Re: [PATCH] drm: sti: fix prototypes after API change Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-05 01:50 +0200
      Re: [PATCH] drm: sti: fix prototypes after API change Dave Airlie <airlied@gmail.com> - 2016-07-05 02:00 +0200
        Re: [PATCH] drm: sti: fix prototypes after API change Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-05 02:30 +0200
  Re: [PATCH] drm: sti: fix prototypes after API change Arnd Bergmann <arnd@arndb.de> - 2016-07-04 15:40 +0200
  Re: [PATCH] drm: sti: fix prototypes after API change Mark Brown <broonie@kernel.org> - 2016-07-04 15:30 +0200
  Re: [PATCH] drm: sti: fix prototypes after API change Stephen Rothwell <sfr@canb.auug.org.au> - 2016-07-05 01:40 +0200

csiph-web