From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751918AbeDHHgI (ORCPT ); Sun, 8 Apr 2018 03:36:08 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45252 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751728AbeDHHgG (ORCPT ); Sun, 8 Apr 2018 03:36:06 -0400 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: <152296016916.31027.8912809030401942390.stgit@warthog.procyon.org.uk> To: Linus Torvalds Cc: dhowells@redhat.com, linux-fsdevel , linux-afs@lists.infradead.org, Linux Kernel Mailing List Subject: Re: [PATCH 00/20] afs: Fixes and development MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <7258.1523172965.1@warthog.procyon.org.uk> Date: Sun, 08 Apr 2018 08:36:05 +0100 Message-ID: <7259.1523172965@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds wrote: > Now, the conflicts really do look entirely trivial, and that's not the > problem, but the fact that you *didn't* re-send the AFS pull request > makes me wonder if you perhaps didn't want me to pull it after all? Sorry: Al pointed out that I was incorrectly using lookup_one_len(). I proposed a fix, but he decided that he wanted to rejig lookup_one_len() instead, so I was waiting for that. Al: Can you rebase your vfs/work.dcache branch on top of linus/master (I think the rest of your branch is pulled already)? Or should I just merge together the fscache patches with it and rebase my afs-next branch off of that? David