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>] [day] [month] [year] [list]
Message-ID: <20230515111851.73e4eda3@canb.auug.org.au>
Date:   Mon, 15 May 2023 11:18:51 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Alex Deucher <alexander.deucher@....com>,
        Iswara Nagulendran <Iswara.Nagulendran@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rodrigo Siqueira <Rodrigo.Siqueira@....com>
Subject: linux-next: manual merge of the amdgpu tree with the drm-misc tree

Hi all,

Today's linux-next merge of the amdgpu tree got a conflict in:

  include/drm/display/drm_dp.h

between commit:

  55b24786b748 ("drm/display: Add missing OLED Vesa brightnesses definitions")

from the drm-misc tree and commit:

  4d5f872dbc75 ("drm/amd/display: Adding support for VESA SCR")

from the amdgpu tree.

I fixed it up (the changes in the latter included the changes in the
former (apart from whitespace differences)) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ