Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Jason Gunthorpe <jgg@mellanox.com>
To:     Linus Torvalds <torvalds@linux-foundation.org>
CC:     Dave Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        dri-devel <dri-devel@lists.freedesktop.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Jerome Glisse <jglisse@redhat.com>,
        Thomas Hellstrom <thellstrom@vmware.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: DRM pull for v5.3-rc1
Thread-Topic: DRM pull for v5.3-rc1
Thread-Index: AQHVOwjxvOBTsCZDkEWbf47t9QeYFabL/LCAgAARAQA=
Date:   Mon, 15 Jul 2019 19:17:08 +0000
Message-ID: <20190715191702.GD5043@mellanox.com>
References: <CAPM=9tzJQ+26n_Df1eBPG1A=tXf4xNuVEjbG3aZj-aqYQ9nnAg@mail.gmail.com>
 <CAPM=9tx+CEkzmLZ-93GZmde9xzJ_rw3PJZxFu_pjZJc7KM5f-w@mail.gmail.com>
 <20190715122924.GA15202@mellanox.com>
 <CAHk-=wgEimwxXiDUdp9eSGZn4j6n8g-4KhdEG0kPVgKFQeAXgw@mail.gmail.com>
In-Reply-To: <CAHk-=wgEimwxXiDUdp9eSGZn4j6n8g-4KhdEG0kPVgKFQeAXgw@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-originating-ip: [156.34.55.100]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 4fd5f218-0210-433d-af5a-08d70959079b
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:VI1PR05MB3181;
x-ms-traffictypediagnostic: VI1PR05MB3181:
x-microsoft-antispam-prvs: <VI1PR05MB318153FF71C6D6DB6A19201ACFCF0@VI1PR05MB3181.eurprd05.prod.outlook.com>
x-ms-oob-tlc-oobclassifiers: OLM:10000;
x-forefront-prvs: 00997889E7
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(39860400002)(376002)(346002)(396003)(366004)(136003)(189003)(199004)(14444005)(256004)(66066001)(86362001)(316002)(14454004)(71200400001)(8936002)(71190400001)(66556008)(66476007)(64756008)(66446008)(6916009)(1076003)(5660300002)(54906003)(66946007)(446003)(4326008)(99286004)(102836004)(486006)(11346002)(2906002)(386003)(305945005)(7736002)(53936002)(6436002)(229853002)(52116002)(476003)(2616005)(68736007)(478600001)(6486002)(6512007)(25786009)(6506007)(53546011)(76176011)(33656002)(8676002)(6116002)(3846002)(186003)(81156014)(81166006)(36756003)(26005)(6246003);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR05MB3181;H:VI1PR05MB4141.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: mellanox.com does not designate
 permitted sender hosts)
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: 2Pm0du8sq6JH5OLOReQ0+d3KFOROuzLaxbyUOeN4bP41cAiJCLHro5ca0yJVUIzRNdozmHDVt9QMl0VfuxlsF22FvW9rAQ9BkFRMmYoqzXdS8WDDRtS/VSrbupU6jkwRnegSsmd3dTAYLeutD9R69syK4hRaznLpw3hwhRaRZfmWBsUWCV+VgY07G17nlEnxbxyIUgofvMyKU/ylJFwp8mM0ivR2NwJj2lWmTLbDsKoliHjjl6+riFuwkDlUzu+LxsMnh6dpV3jWN1HuiPDNCYIg40kN2fgVCPhwhrgEYpmsmLiqI9guxyMPS2xiPDqk1f9+qFA8g6rbYOKVCXOs04xIn7iqpzNj+RxRyBrxFddd4F+7PNgyx4XMYw0G/CiZu5SY1D3pWEd2V861zfTRtgww+IlkU6JMwsRZa79OIC8=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <31A30FDC27B98847BD0C7E4675A970D1@eurprd05.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: Mellanox.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4fd5f218-0210-433d-af5a-08d70959079b
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2019 19:17:08.2156
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: jgg@mellanox.com
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB3181
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Jul 15, 2019 at 11:16:11AM -0700, Linus Torvalds wrote:
> [ Ugh, I have three different threads about the drm pull because of
> the subject / html confusion. So now I'm replying in separate threads
> and I'm hoping the people involved have better threading than gmail
> does ;/ ]
>=20
> On Mon, Jul 15, 2019 at 5:29 AM Jason Gunthorpe <jgg@mellanox.com> wrote:
> >
> > The 'hmm' tree is something I ran to try and help workflow issues like
> > this, as it could be merged to DRM as a topic branch - maybe consider
> > this flow in future?
> >
> > Linus, do you have any advice on how best to handle sharing mm
> > patches?
>=20
> I don't have a lot of advice except for "very very carefully".
>=20
> I think the hmm tree worked really well this merge window, at least
> from my standpoint.
>=20
> But it is of course possible that my happiness about the hmm tree is a
> complete fluke and came about because pretty much all the patches were
> removing oddities and cleaning things up, and they weren't adding new
> odd things (or if they were, you hid it better ;^).

lol

Actually I think it was a lot of effort from many people to monitor
and stay on top of conflicts, and there was certainly a deliberate
effort to bring many people together.

About the only thing I could concretely suggest for working with -mm
is if there was some way the -mm quilt patches could participate in
'git merge' resolution at your level.

I only say this because the lowest point was when merging CH's series
to hmm.git caused Andrew to have to do a lot of work rebasing DanW's
series during rc7. Arguably that should have been my work preparing a
conflict resolution instruction, not his doing rebases.

.. and if we needed to revise hmm.git Dan's series would have been at
more risk. It kind of still is as I haven't seen him Ack Andrew's
rebase yet?

Thanks,
Jason