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=-2.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_1 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 891CDC742D7 for ; Sat, 13 Jul 2019 04:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D5F7208E4 for ; Sat, 13 Jul 2019 04:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="XODvCtOp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725936AbfGMEHp (ORCPT ); Sat, 13 Jul 2019 00:07:45 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:42692 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725782AbfGMEHp (ORCPT ); Sat, 13 Jul 2019 00:07:45 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6D46fqx094060; Sat, 13 Jul 2019 04:07:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=vnKYntI7sF00JDhKZXOi05w0MftGqOYfOop5mleI+uI=; b=XODvCtOpjEKEpUeqfR2hWl41heoVpjOvtKyKkDEJyKdVQCbYvtrLk+NNn6oR0PJPMLtI 0E4QMiutlmIvp0BhdXLE6jOV66xWKgEXGayiztJP9ghuKMN8FxxtNMjwdBwuEvIBU1S0 g5zrSFZVz4S2QdLgzBO5OO0unZLA8wc5Cp4BuDu2l9M2F80l0lBO+DpCcl8gxSY9UA6i 1015OSng4gFvNiC8Em5Fg8sjORbcgpvkJ6YYFyHNZmKhNsKV6JUBl41Pw7BrCpZ9FS4X DyI2KcHrb4rhq8CaHGfl6wqk1V0f93KMqFfWBTSVKVVacxSJk83lbHJspeVCjmcQm6GV bg== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 2tq6qt835y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 13 Jul 2019 04:07:35 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x6D42XDV075742; Sat, 13 Jul 2019 04:07:34 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 2tq5bb1ng6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 13 Jul 2019 04:07:34 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x6D47UYA016736; Sat, 13 Jul 2019 04:07:30 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Jul 2019 21:07:30 -0700 Date: Fri, 12 Jul 2019 21:07:28 -0700 From: "Darrick J. Wong" To: Linus Torvalds Cc: "Darrick J. Wong" , linux-fsdevel , linux-xfs , Dave Chinner , Linux List Kernel Mailing , Eric Sandeen , Christoph Hellwig Subject: Re: [GIT PULL] xfs: new features for 5.3 Message-ID: <20190713040728.GB5347@magnolia> References: <20190712180205.GA5347@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9316 signatures=668688 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907130046 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9316 signatures=668688 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907130046 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Fri, Jul 12, 2019 at 05:27:15PM -0700, Linus Torvalds wrote: > On Fri, Jul 12, 2019 at 11:02 AM Darrick J. Wong wrote: > > > > The branch merges cleanly against this morning's HEAD and survived an > > overnight run of xfstests. The merge was completely straightforward, so > > please let me know if you run into anything weird. > > Hmm. I don't know what you merged against, but it got a (fairly > trivial) conflict for me due to > > 79d08f89bb1b ("block: fix .bi_size overflow") > > from the block merge (from Tuesday) touching a line next to one changed by > > a24737359667 ("xfs: simplify xfs_chain_bio") > > from this pull. > > So it wasn't an entirely clean merge for me. > > Was it a complex merge conflict? No. I'm just confused by the "merges > cleanly against this morning's HEAD", which makes me wonder what you > tried to merge against.. Doh, it turns out I was merging against the same HEAD as my last two pull requests because I forgot to re-pull. Sorry about that. It's been too long of a week. :/ --D > Linus