[git pull] drm for 5.15-rc1

[Linus Torvalds]

On Mon, Aug 30, 2021 at 10:53 PM Dave Airlie <airlied at gmail.com> wrote:
>
> There are a bunch of conflicts with your tree, but none of them seem
> too serious, but I might have missed something.

No worries. I enjoyed seeing the AMD code-names in the conflicts, they
are using positively kernel-level naming.

That said, I wonder why AMD people can't use consistent formatting,
mixing ALL-CAPS with underscores, spaces, whatever:

        /* Sienna_Cichlid */
        /* Yellow Carp */
        /* Navy_Flounder */
        /* DIMGREY_CAVEFISH */
        /* Aldebaran */
        /* CYAN_SKILLFISH */
        /* BEIGE_GOBY */

which shows a distinct lack of professionalism and caring in the silly naming.

             Linus