From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Airlie <airlied@linux.ie>
Cc: alsa-devel@alsa-project.org, kernel@stlinux.com,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Arnaud Pouliquen <arnaud.pouliquen@st.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Mark Brown <broonie@kernel.org>, Arnd Bergmann <arnd@arndb.de>
Subject: Re: [PATCH] drm: sti: fix prototypes after API change
Date: Tue, 5 Jul 2016 09:46:37 +1000 [thread overview]
Message-ID: <20160705094637.5076b8a0@canb.auug.org.au> (raw)
In-Reply-To: <20160704133810.GF6247@sirena.org.uk>
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-07-04 23:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 13:16 [PATCH] drm: sti: fix prototypes after API change Arnd Bergmann
2016-07-04 13:22 ` Mark Brown
2016-07-04 13:27 ` Benjamin Gaignard
2016-07-04 13:36 ` Arnd Bergmann
2016-07-04 13:38 ` Mark Brown
2016-07-04 23:46 ` Stephen Rothwell [this message]
2016-07-04 23:59 ` Dave Airlie
2016-07-05 0:29 ` Stephen Rothwell
2016-07-04 23:38 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160705094637.5076b8a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.pouliquen@st.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=kernel@stlinux.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).