linux-next: manual merge of the drm-intel tree with Linus' tree

Stephen Rothwell
2022-11-13T23:23:40Z

[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]

Hi all,

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

drivers/gpu/drm/i915/display/intel_backlight.c

between commit:

b1d36e73cc1c ("drm/i915: Don't register backlight when another backlight should be used (v2)")

from Linus' tree and commit:

801543b2593b ("drm/i915: stop including i915_irq.h from i915_trace.h")

from the drm-intel 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/i915/display/intel_backlight.c
index beba39a38c87,0438071f58cf..000000000000
--- a/drivers/gpu/drm/i915/display/intel_backlight.c
+++ b/drivers/gpu/drm/i915/display/intel_backlight.c
@@@ -8,8 -8,7 +8,9 @@@
#include <linux/pwm.h>
#include <linux/string_helpers.h>

+#include <acpi/video.h>
+
+ #include "i915_reg.h"
#include "intel_backlight.h"
#include "intel_backlight_regs.h"
#include "intel_connector.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]