linux-kernel - Re: [PATCH 0/9] drm: remove deprecated functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACRpkdYmBSVKBvu=YOV87zWK8WCC+pcn9ux_W4VEYwzRzexQ_A@mail.gmail.com>
Date:   Thu, 29 Nov 2018 15:45:33 +0100
From:   Linus Walleij <linus.walleij@...aro.org>
To:     greenfoo@...egarage.com,
        "open list:DRM PANEL DRIVERS" <dri-devel@...ts.freedesktop.org>,
        Maarten Lankhorst <maarten.lankhorst@...ux.intel.com>,
        Maxime Ripard <maxime.ripard@...tlin.com>, sean@...rly.run,
        Dave Airlie <airlied@...ux.ie>,
        Jonathan Corbet <corbet@....net>, abrodkin@...opsys.com,
        Boris Brezillon <boris.brezillon@...tlin.com>,
        Nicolas Ferre <nicolas.ferre@...rochip.com>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Ludovic Desroches <ludovic.desroches@...rochip.com>,
        Gerd Hoffmann <kraxel@...hat.com>,
        Archit Taneja <architt@...eaurora.org>,
        Andrzej Hajda <a.hajda@...sung.com>,
        Laurent Pinchart <Laurent.pinchart@...asonboard.com>,
        Lucas Stach <l.stach@...gutronix.de>,
        linux+etnaviv@...linux.org.uk,
        Christian Gmeiner <christian.gmeiner@...il.com>,
        Marek Vasut <marex@...x.de>, Stefan Agner <stefan@...er.ch>,
        kieran.bingham+renesas@...asonboard.com,
        Shawn Guo <shawnguo@...nel.org>,
        Julia Lawall <Julia.Lawall@...6.fr>,
        Gilles Muller <Gilles.Muller@...6.fr>,
        Nicolas Palix <nicolas.palix@...g.fr>, michal.lkml@...kovi.net,
        Haneen Mohammed <hamohammed.sa@...il.com>,
        linux-doc@...r.kernel.org,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>,
        virtualization@...ts.linux-foundation.org,
        etnaviv@...ts.freedesktop.org,
        Linux-Renesas <linux-renesas-soc@...r.kernel.org>,
        cocci@...teme.lip6.fr
Subject: Re: [PATCH 0/9] drm: remove deprecated functions

On Mon, Nov 26, 2018 at 3:12 PM Daniel Vetter <daniel@...ll.ch> wrote:
> On Sat, Nov 24, 2018 at 10:17:13PM +0100, Linus Walleij wrote:

> > It was especially scary.
> >
> > But I think I managed to apply the patches and push the
> > branch now.
>
> Except when you're racing with someone else you should only see conflicts
> with stuff you've just pushed. Or if someone forgot to fix up their mess.
> What was the conflict?

dim push-branches was complaining that one of the commits was
missing the proper committer sign-off, it was the bottom commit under
mine (IIRC "drm/atomic-helper: WARN if fake_commit->hw_done is not
completed as expected")
and dim update-branches seemed to rebase and fix up my patches
and then everything was fine.

I just felt slightly out of control :D

Yours,
Linus Walleij