From: broonie@kernel•org
To: Greg KH <greg@kroah•com>
Cc: "Arthur Grillo" <arthur.grillo@usp•br>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
"Javier Martinez Canillas" <javierm@redhat•com>,
"Jim Cromie" <jim.cromie@gmail•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Maíra Canal" <maira.canal@usp•br>
Subject: linux-next: manual merge of the driver-core tree with the drm tree
Date: Mon, 26 Sep 2022 22:11:02 +0100 [thread overview]
Message-ID: <20220926211102.684323-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/gpu/drm/Kconfig
between commits:
ba8f16cd08190 ("drm: selftest: convert drm_damage_helper selftest to KUnit")
fc8d29e298cf4 ("drm: selftest: convert drm_mm selftest to KUnit")
from the drm tree and commit:
84ec67288c10f ("drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro")
from the driver-core 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.
diff --cc drivers/gpu/drm/Kconfig
index 198ba846d34bf,2438e0dccfa16..0000000000000
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@@ -51,9 -50,22 +51,21 @@@ config DRM_DEBUG_M
If in doubt, say "N".
+ config DRM_USE_DYNAMIC_DEBUG
+ bool "use dynamic debug to implement drm.debug"
+ default y
+ depends on DRM
+ depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE
+ depends on JUMP_LABEL
+ help
+ Use dynamic-debug to avoid drm_debug_enabled() runtime overheads.
+ Due to callsite counts in DRM drivers (~4k in amdgpu) and 56
+ bytes per callsite, the .data costs can be substantial, and
+ are therefore configurable.
+
-config DRM_DEBUG_SELFTEST
- tristate "kselftests for DRM"
- depends on DRM
- depends on DEBUG_KERNEL
+config DRM_KUNIT_TEST
+ tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
+ depends on DRM && KUNIT
select PRIME_NUMBERS
select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HELPER
next reply other threads:[~2022-09-26 21:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 21:11 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-07-24 5:56 linux-next: manual merge of the driver-core tree with the drm tree Stephen Rothwell
2014-07-24 6:23 ` Greg KH
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=20220926211102.684323-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=arthur.grillo@usp$(echo .)br \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=javierm@redhat$(echo .)com \
--cc=jim.cromie@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maira.canal@usp$(echo .)br \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox