From patchwork Thu Jul 18 16:18:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11049335 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 833A7912 for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 729C128802 for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6122F2874B; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10E082874B for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730256AbfGRQS0 (ORCPT ); Thu, 18 Jul 2019 12:18:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:34882 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727685AbfGRQSZ (ORCPT ); Thu, 18 Jul 2019 12:18:25 -0400 Received: from localhost (c-67-169-218-210.hsd1.or.comcast.net [67.169.218.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 94C4321850; Thu, 18 Jul 2019 16:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563466704; bh=MSb37xjaCMaGDFM4ve1baXDv5W8YHm0nchnq58zBZkc=; h=Date:From:To:Cc:Subject:From; b=iR2EvuCfyIr0/+yRJX9kLrPyaRPOrjzmxrwW0XecBCF3TDc1NE3n417pkcByR075N syRZ/N+v2YpY3/zQivkfAJFUArdzJ3NyYdQ7oe6O9i4OgZOW62cHteM/jyLoKD4RjZ OHk1oOSEhOwbMCID/0tNfcEkol6fZpvzxhTn4a9k= Date: Thu, 18 Jul 2019 09:18:24 -0700 From: "Darrick J. Wong" To: Linus Torvalds Cc: "Darrick J. Wong" , linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, david@fromorbit.com, linux-kernel@vger.kernel.org, sandeen@sandeen.net, hch@lst.de Subject: [GIT PULL] xfs: cleanups for 5.3 Message-ID: <20190718161824.GE7093@magnolia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, We had a few more lateish cleanup patches come in for 5.3 -- a couple of syncups with the userspace libxfs code and a conversion of the XFS administrator's guide to ReST format. The branch does /not/ merge cleanly against this morning's HEAD due to a conflict in Documentation/admin-guide/index.rst. The conflict can be resolved by adding the "xfs" line after "binderfs". The series survived an overnight run of xfstests. Please let me know if you run into anything weird, I promise I drank two cups of coffee this time around. :) --D The following changes since commit 488ca3d8d088ec4658c87aaec6a91e98acccdd54: xfs: chain bios the right way around in xfs_rw_bdev (2019-07-10 10:04:16 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.3-merge-13 for you to fetch changes up to 89b408a68b9dd163b2705b6f73d8e3cc3579b457: Documentation: filesystem: Convert xfs.txt to ReST (2019-07-15 09:15:09 -0700) ---------------------------------------------------------------- Also new for 5.3: - Bring fs/xfs/libxfs/xfs_trans_inode.c in sync with userspace libxfs. - Convert the xfs administrator guide to rst and move it into the official admin guide under Documentation ---------------------------------------------------------------- Eric Sandeen (2): xfs: move xfs_trans_inode.c to libxfs/ xfs: sync up xfs_trans_inode with userspace Sheriff Esseson (1): Documentation: filesystem: Convert xfs.txt to ReST Documentation/admin-guide/index.rst | 1 + .../{filesystems/xfs.txt => admin-guide/xfs.rst} | 132 ++++++++++----------- Documentation/filesystems/dax.txt | 2 +- MAINTAINERS | 3 +- fs/xfs/Makefile | 4 +- fs/xfs/{ => libxfs}/xfs_trans_inode.c | 4 + 6 files changed, 73 insertions(+), 73 deletions(-) rename Documentation/{filesystems/xfs.txt => admin-guide/xfs.rst} (80%) rename fs/xfs/{ => libxfs}/xfs_trans_inode.c (96%)