Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/Kconfig.debug
between commit:
fcbb8461fd23 ("kbuild: remove header compile test")
from the kbuild tree and commit:
d30213e533fa ("drm/i915: Fix Kconfig indentation")
from the drm tree.
I fixed it
On Mon, Sep 16, 2019 at 02:06:46PM -0700, Nick Desaulniers wrote:
> On Sun, Sep 15, 2019 at 2:47 PM Mark Brown 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
On Sun, Sep 15, 2019 at 2:47 PM Mark Brown wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/display/dc/dml/Makefile
>
> between commit:
>
> 54b8ae66ae1a345 ("kbuild: change *FLAGS_.o to take the path
> relative to $(obj)")
>
> from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/dml/Makefile
between commit:
54b8ae66ae1a345 ("kbuild: change *FLAGS_.o to take the path
relative to $(obj)")
from the kbuild tree and commits:
0f0727d971f6fdf ("drm/amd/display: readd -m
On Tue, Sep 3, 2019 at 11:46 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm tree got conflicts in:
>
> drivers/gpu/drm/amd/display/dc/calcs/Makefile
> drivers/gpu/drm/amd/display/dc/dml/Makefile
> drivers/gpu/drm/amd/display/dc/dsc/Makefile
>
> between commit:
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/amd/display/dc/calcs/Makefile
drivers/gpu/drm/amd/display/dc/dml/Makefile
drivers/gpu/drm/amd/display/dc/dsc/Makefile
between commit:
30851871d5ab ("kbuild: change *FLAGS_.o to take the path relative
to
Hi all,
On Wed, 19 Jun 2019 14:19:49 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/Makefile.header-test
>
> between commit:
>
> e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained")
>
> from
On Wed, 19 Jun 2019, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/Makefile.header-test
>
> between commit:
>
> e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained")
>
> from the kbuild tree and
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/Makefile.header-test
between commit:
e846f0dc57f4 ("kbuild: add support for ensuring headers are self-contained")
from the kbuild tree and commits:
112ed2d31a46 ("drm/i915: Move GraphicsTechnology f
