linux-kernel - Re: linux-next: manual merge of the drm tree with the kbuild tree

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 for Android: free password hash cracker in your pocket

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

Date:   Mon, 16 Sep 2019 23:18:52 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Nick Desaulniers <ndesaulniers@...gle.com>
Cc:     Alex Deucher <alexander.deucher@....com>,
        Sami Tolvanen <samitolvanen@...gle.com>,
        Sedat Dilek <sedat.dilek@...il.com>,
        Roman Li <Roman.Li@....com>,
        Bhawanpreet Lakha <Bhawanpreet.Lakha@....com>,
        Jun Lei <Jun.Lei@....com>,
        Dmytro Laktyushkin <Dmytro.Laktyushkin@....com>,
        Leo Li <sunpeng.li@....com>,
        Harry Wentland <harry.wentland@....com>,
        Dave Airlie <airlied@...ux.ie>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Xinpeng Liu <danielliu861@...il.com>
Subject: Re: linux-next: manual merge of the drm tree with the kbuild tree

On Mon, Sep 16, 2019 at 02:06:46PM -0700, Nick Desaulniers wrote:
> On Sun, Sep 15, 2019 at 2:47 PM Mark Brown <broonie@...nel.org> wrote:

> >   0f0727d971f6fdf ("drm/amd/display: readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP routines")

> ^ this patch is now broken due to the SHA above it.

Right, all the sites that didn't conflict are broken.  Like I say I
think there needs to be some coordination with the Kbuild changes here.

> b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> index 2b399cfa72e6..ddb8d5649e79 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> +++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile
> @@ -19,7 +19,7 @@ endif
>  CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse
> $(cc_stack_align)

I can't do anything with patches without signoffs so I'm not going to
apply this as a workaround.

> > + ifdef CONFIG_DRM_AMD_DC_DCN2_1
> >  -CFLAGS_display_mode_vba_21.o := $(dml_ccflags)
> >  -CFLAGS_display_rq_dlg_calc_21.o := $(dml_ccflags)
> >  -endif
> 
> ^ this endif should not be removed.

There's an endif left there?  Someone sent a patch, I'm going to apply
that.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)