Re: linux-next: manual merge of the drm tree with the origin tree

From: Danilo Krummrich
Date: Thu Oct 02 2025 - 08:30:32 EST

Next message: Jason Gunthorpe: "Re: [PATCH 0/2] rust: pci: expose is_virtfn() and reject VFs in nova-core"
Previous message: Geert Uytterhoeven: "Re: [PATCH v3 2/7] dt-bindings: iio: adc: document RZ/T2H and RZ/N2H ADC"
In reply to: Mark Brown: "linux-next: manual merge of the drm tree with the origin tree"
Next in thread: Mark Brown: "linux-next: manual merge of the drm tree with the origin tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 10/2/25 2:05 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:

(I think this was a conflict between the DRM tree and the MM tree already before.)

The resolution looks good to me, thanks!

- Danilo

Next message: Jason Gunthorpe: "Re: [PATCH 0/2] rust: pci: expose is_virtfn() and reject VFs in nova-core"
Previous message: Geert Uytterhoeven: "Re: [PATCH v3 2/7] dt-bindings: iio: adc: document RZ/T2H and RZ/N2H ADC"
In reply to: Mark Brown: "linux-next: manual merge of the drm tree with the origin tree"
Next in thread: Mark Brown: "linux-next: manual merge of the drm tree with the origin tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]