[git pull] drm for 6.12-rc1

[Simona Vetter]

On Thu, Sep 19, 2024 at 10:12:39AM +0200, Linus Torvalds wrote:
> On Thu, 19 Sept 2024 at 09:48, Dave Airlie <airlied at gmail.com> wrote:
> >
> > There are some minor conflicts with your tree but none seemed too
> > difficult to solve, let me know if there is any problems on your end.
> 
> Christ. One of them is due to you guys being horrible at merging.
> 
> Your tree had
> 
>     drm/xe/gt: Remove double include
> 
> which removed (surprise surprise) a double instance of
> 
>   #include <generated/xe_wa_oob.h>
> 
> but then in merge commit 4461e9e5c374 ("Merge v6.11-rc5 into
> drm-next") it got added back in!
> 
> Please be more careful with your merges. You can't just look at the
> file contents, you have to look at the actual history of it to see
> what the *cause* of the conflict is.

Uh yeah not sure how I managed to butcher this one. I do check the history
with gitk --merge and then the result by both looking at the merge diff
and the new --remerge-diff output, and that merge looks like nonsense in
all but the last one. Which means I was asleep at the wheel when I did
that :-/
-Sima
-- 
Simona Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch