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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 788CCC433EF for ; Wed, 20 Jul 2022 02:45:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240107AbiGTCpc (ORCPT ); Tue, 19 Jul 2022 22:45:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240079AbiGTCpa (ORCPT ); Tue, 19 Jul 2022 22:45:30 -0400 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 834A7326E9; Tue, 19 Jul 2022 19:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=tfkq/jK6AMy8w3Sz1zvbcf2p9FS6/PjyhQElffDDPlE=; b=hQhvhsVmczeFcNZsANZnh4PpTQ MxiBKY327qnApGMu6Eh8xcRCKuKOhpnRHHnKhMpakR6mC4dR5tv9r39pIS8YoraYJaKTgGciRWIAZ 1hQ+eVnYUUZpuF1GTAxnjO4WGFoE5/ji35LxOGjcOWWYMbo8GQghO6W1axcG5vfmfYa7NtGXYPq1z aC/b4zsdQOOt79+n7vQEHwaoOBpRG+01XyzEUOUg9F9ugwPzIKrSk2pZNfzqXZ2bOPgIouFVegjm9 5Scfj6uMxr1bKXNSidua0scw7UiTnd7Ru9FGBFwhvozxtYAff2KKttOtuHgirIq0O7nEfHD+EoZ8M uBCdM1eA==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.95 #2 (Red Hat Linux)) id 1oDziC-00DxXc-BJ; Wed, 20 Jul 2022 02:45:20 +0000 Date: Wed, 20 Jul 2022 03:45:20 +0100 From: Al Viro To: Jens Axboe Cc: Stephen Rothwell , Keith Busch , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the block tree with the vfs tree Message-ID: References: <20220714120840.1e1f8c63@canb.auug.org.au> <0904ae71-972f-f183-f295-bce3b8518fcf@kernel.dk> <20220718125932.1ab89122@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: Al Viro Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Jul 19, 2022 at 10:52:12AM -0600, Jens Axboe wrote: > On 7/17/22 10:58 PM, Al Viro wrote: > > On Mon, Jul 18, 2022 at 12:59:32PM +1000, Stephen Rothwell wrote: > >> Hi Al, > >> > >> On Fri, 15 Jul 2022 02:04:02 +0100 Al Viro wrote: > >>> > >>> On Fri, Jul 15, 2022 at 01:52:25AM +0100, Al Viro wrote: > >>> > >>>> Ones from Keith's branch - #alignment-fixes-rebased in there. Looks like > >>>> one of the commits in it got changed since then - the difference in > >>>> __bio_iov_iter_get_pages() (unsigned int i initialization). > >>>> > >>>> Sigh... I'll rebase on top of that. > >>> > >>> Rebased and pushed out (with copy_pipe_to_iter() fix folded in as well) > >> > >> BTW, these still cause a conflict. As long as you are sharing patches > >> (and then adding changes to the same areas), there will be conflicts. > >> You need to share commits i.e. a shared branch. > > > > Sigh... That was (and is) a branch form Keith's tree. Commits in block > > tree are, AFAICS, cherry-picked from it, with lore links and Jens' s-o-b > > added. > > > > I'm fine with using that, just tell me how to refer to the branch in > > question. Jens? > > Are you fine with rebasing that one again? Seems the better approach > since it's all in one spot. The git location is: > > git://git.kernel.dk/linux-block for-5.20/block-iter > > which has all of them, and is the same base as the previous one. Do you > want a signed tag, or is the branch fine? Grabbed, rebased and force-pushed (identical tree object, so probably hadn't fucked it up...)