linux-kernel - linux-next: manual merge of the pci tree with Linus' 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20170626105154.27dbca9d@canb.auug.org.au>
Date:   Mon, 26 Jun 2017 10:51:54 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@...gle.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Alex Deucher <alexander.deucher@....com>
Subject: linux-next: manual merge of the pci tree with Linus' tree

Hi Bjorn,

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

  drivers/gpu/drm/radeon/radeon_device.c

between commit:

  4eb59793cca0 ("drm/radeon: add a PX quirk for another K53TK variant")

from Linus' tree and commit:

  22c21de73087 ("drm/radeon: make MacBook Pro d3_delay quirk more generic")

from the pci tree.

I fixed it up (see below) 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

diff --cc drivers/gpu/drm/radeon/radeon_device.c
index 0a6444d72000,aecaafbc8417..000000000000
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@@ -136,12 -135,6 +135,10 @@@ static struct radeon_px_quirk radeon_px
  	 * https://bugzilla.kernel.org/show_bug.cgi?id=51381
  	 */
  	{ PCI_VENDOR_ID_ATI, 0x6840, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
 +	/* Asus K53TK laptop with AMD A6-3420M APU and Radeon 7670m GPU
 +	 * https://bugs.freedesktop.org/show_bug.cgi?id=101491
 +	 */
 +	{ PCI_VENDOR_ID_ATI, 0x6741, 0x1043, 0x2122, RADEON_PX_QUIRK_DISABLE_PX },
- 	/* macbook pro 8.2 */
- 	{ PCI_VENDOR_ID_ATI, 0x6741, PCI_VENDOR_ID_APPLE, 0x00e2, RADEON_PX_QUIRK_LONG_WAKEUP },
  	{ 0, 0, 0, 0, 0 },
  };