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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAPM=9tzjJZ_PCv-TT8xR0GEYOny9W6J72v-FLRDQrHr3phQRDg@mail.gmail.com>
Date:	Tue, 5 Jul 2016 09:59:16 +1000
From:	Dave Airlie <airlied@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Airlie <airlied@...ux.ie>, alsa-devel@...a-project.org,
	kernel@...inux.com,
	Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>,
	Arnaud Pouliquen <arnaud.pouliquen@...com>,
	LKML <linux-kernel@...r.kernel.org>,
	dri-devel <dri-devel@...ts.freedesktop.org>,
	Mark Brown <broonie@...nel.org>, Arnd Bergmann <arnd@...db.de>
Subject: Re: [PATCH] drm: sti: fix prototypes after API change

On 5 July 2016 at 09:46, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Hi Dave,
>
> On Mon, 4 Jul 2016 15:38:10 +0200 Mark Brown <broonie@...nel.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.

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.