From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Bryant Mairs <bryant@mai.rs>, Hans de Goede <hdegoede@redhat.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Sam Ravnborg <sam@ravnborg.org> Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Date: Fri, 22 Oct 2021 11:53:36 +1100 [thread overview] Message-ID: <20211022115336.28e41185@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2198 bytes --] Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_panel_orientation_quirks.c between commit: def0c3697287 ("drm: panel-orientation-quirks: Add quirk for Aya Neo 2021") from the drm-misc-fixes tree and commits: 072e70d52372 ("drm: panel-orientation-quirks: Add quirk for the Chuwi Hi10 Pro") 63a4881572d7 ("drm: panel-orientation-quirks: Add quirk for the Chuwi HiBook") from the drm 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/drm_panel_orientation_quirks.c index 30c17a76f49a,62e8ccc7ab9c..000000000000 --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c @@@ -134,12 -140,20 +140,26 @@@ static const struct dmi_system_id orien DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* AYA NEO 2021 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYADEVICE"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYA NEO 2021"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Chuwi HiBook (CWI514) */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + /* Above matches are too generic, add bios-date match */ + DMI_MATCH(DMI_BIOS_DATE, "05/07/2016"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Chuwi Hi10 Pro (CWI529) */ + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"), [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Dave Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org> Cc: Bryant Mairs <bryant@mai.rs>, Hans de Goede <hdegoede@redhat.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Sam Ravnborg <sam@ravnborg.org> Subject: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree Date: Fri, 22 Oct 2021 11:53:36 +1100 [thread overview] Message-ID: <20211022115336.28e41185@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2198 bytes --] Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/drm_panel_orientation_quirks.c between commit: def0c3697287 ("drm: panel-orientation-quirks: Add quirk for Aya Neo 2021") from the drm-misc-fixes tree and commits: 072e70d52372 ("drm: panel-orientation-quirks: Add quirk for the Chuwi Hi10 Pro") 63a4881572d7 ("drm: panel-orientation-quirks: Add quirk for the Chuwi HiBook") from the drm 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/drm_panel_orientation_quirks.c index 30c17a76f49a,62e8ccc7ab9c..000000000000 --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c @@@ -134,12 -140,20 +140,26 @@@ static const struct dmi_system_id orien DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T103HAF"), }, .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* AYA NEO 2021 */ + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "AYADEVICE"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "AYA NEO 2021"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, + }, { /* Chuwi HiBook (CWI514) */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"), + /* Above matches are too generic, add bios-date match */ + DMI_MATCH(DMI_BIOS_DATE, "05/07/2016"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, + }, { /* Chuwi Hi10 Pro (CWI529) */ + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Hampoo"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Hi10 pro tablet"), + }, + .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* GPD MicroPC (generic strings, also match on bios date) */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Default string"), [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-22 0:53 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-22 0:53 Stephen Rothwell [this message] 2021-10-22 0:53 ` [Intel-gfx] linux-next: manual merge of the drm tree with the drm-misc-fixes tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2023-11-22 0:29 Stephen Rothwell 2023-11-22 0:29 ` Stephen Rothwell 2023-11-28 10:04 ` Geert Uytterhoeven 2023-11-28 10:04 ` Geert Uytterhoeven 2023-09-28 2:05 Stephen Rothwell 2023-09-28 2:05 ` Stephen Rothwell 2023-06-27 1:54 Stephen Rothwell 2023-06-27 1:54 ` Stephen Rothwell 2023-07-11 1:17 ` Stephen Rothwell 2023-07-11 1:17 ` Stephen Rothwell 2022-11-21 2:06 Stephen Rothwell 2022-11-21 2:06 ` Stephen Rothwell 2022-07-11 2:47 Stephen Rothwell 2022-07-11 2:47 ` Stephen Rothwell 2022-07-11 8:05 ` Christian König 2022-07-11 8:05 ` Christian König 2022-07-17 23:44 ` Stephen Rothwell 2022-07-17 23:44 ` Stephen Rothwell 2022-07-19 7:35 ` Geert Uytterhoeven 2022-07-19 7:35 ` Geert Uytterhoeven 2022-07-27 2:55 ` Stephen Rothwell 2022-07-27 2:55 ` Stephen Rothwell 2022-07-27 3:24 ` Dave Airlie 2022-07-27 3:24 ` Dave Airlie 2022-07-27 5:37 ` Stephen Rothwell 2022-07-27 5:37 ` Stephen Rothwell 2022-03-18 0:55 Stephen Rothwell 2022-03-18 0:55 ` Stephen Rothwell 2022-03-18 1:06 ` Stephen Rothwell 2022-03-18 1:06 ` Stephen Rothwell 2021-12-22 3:50 Stephen Rothwell 2021-12-22 3:50 ` Stephen Rothwell 2021-12-22 7:31 ` Christian König 2021-12-22 7:31 ` Christian König 2021-11-29 23:33 Stephen Rothwell 2021-11-29 23:33 ` Stephen Rothwell 2021-11-30 8:58 ` Maxime Ripard 2021-11-30 8:58 ` Maxime Ripard 2021-11-30 20:35 ` Stephen Rothwell 2021-11-30 20:35 ` Stephen Rothwell 2021-06-17 1:42 Stephen Rothwell 2021-06-17 1:42 ` Stephen Rothwell 2021-04-09 3:12 Stephen Rothwell 2021-04-09 3:12 ` Stephen Rothwell 2021-03-18 1:02 Stephen Rothwell 2021-03-18 1:02 ` Stephen Rothwell 2021-03-18 6:51 ` Tomi Valkeinen 2021-03-18 6:51 ` Tomi Valkeinen 2020-07-28 3:41 Stephen Rothwell 2020-07-28 3:41 ` Stephen Rothwell 2020-05-01 3:45 Stephen Rothwell 2020-05-01 3:45 ` Stephen Rothwell 2020-03-01 23:43 Stephen Rothwell 2020-03-01 23:43 ` Stephen Rothwell 2019-09-15 21:18 Mark Brown 2019-09-16 5:29 ` Vasily Khoruzhick 2019-09-17 2:43 ` Qiang Yu 2019-08-26 3:06 Stephen Rothwell 2019-08-29 10:11 ` james qian wang (Arm Technology China) 2019-08-29 10:11 ` james qian wang (Arm Technology China) 2018-11-26 2:37 Stephen Rothwell 2018-03-08 0:47 Stephen Rothwell 2017-12-13 23:59 Stephen Rothwell 2017-12-13 23:59 ` Stephen Rothwell 2017-01-17 0:59 Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211022115336.28e41185@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=airlied@linux.ie \ --cc=bryant@mai.rs \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=hdegoede@redhat.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=sam@ravnborg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.