From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77CA7C4CECE for ; Thu, 19 Sep 2019 06:40:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FDCB21928 for ; Thu, 19 Sep 2019 06:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388422AbfISGkK (ORCPT ); Thu, 19 Sep 2019 02:40:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33658 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725320AbfISGkK (ORCPT ); Thu, 19 Sep 2019 02:40:10 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2855910CC1ED; Thu, 19 Sep 2019 06:40:10 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-125-72.rdu2.redhat.com [10.10.125.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id A04E05D6B0; Thu, 19 Sep 2019 06:40:08 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: References: <16147.1568632167@warthog.procyon.org.uk> To: Linus Torvalds Cc: dhowells@redhat.com, YueHaibing , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel , Linux Kernel Mailing List Subject: Re: [GIT PULL afs: Development for 5.4 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <28367.1568875207.1@warthog.procyon.org.uk> Date: Thu, 19 Sep 2019 07:40:07 +0100 Message-ID: <28368.1568875207@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Thu, 19 Sep 2019 06:40:10 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds wrote: > However, I was close to unpulling it again. It has a merge commit with > this merge message: > > Merge remote-tracking branch 'net/master' into afs-next > > and that simply is not acceptable. Apologies - I meant to rebase that away. There was a bug fix to rxrpc in net/master that didn't get pulled into your tree until Saturday. David