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=-15.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_PASS,USER_AGENT_MUTT autolearn=ham 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 EBDF1C43387 for ; Sun, 6 Jan 2019 17:52:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4EBD20859 for ; Sun, 6 Jan 2019 17:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546797133; bh=lmxsL7fbFAo9PNGoSMzHaDt9ZGJmwHn7cRoFeg7jAVs=; h=Date:From:To:Subject:References:In-Reply-To:List-ID:From; b=JjMSCDktOsya0ZG5ZCWSLy3Xuv7v94fRWIShGxQcXbFwuiwVpu/bEACmUMEQVicny MiWsnz32VN8191HP3I/Lxb9cM5jBvpd9nMQ3qb792MM/jkOizta+BuZ7TL/cmqXGXS tYxX4CreAvdWxbU4iXvx6ss0LR3LzExXzOY9ARKE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726090AbfAFRwM (ORCPT ); Sun, 6 Jan 2019 12:52:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:35162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726014AbfAFRwM (ORCPT ); Sun, 6 Jan 2019 12:52:12 -0500 Received: from sol.localdomain (c-24-23-143-129.hsd1.ca.comcast.net [24.23.143.129]) (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 6BC4620859; Sun, 6 Jan 2019 17:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546797131; bh=lmxsL7fbFAo9PNGoSMzHaDt9ZGJmwHn7cRoFeg7jAVs=; h=Date:From:To:Subject:References:In-Reply-To:From; b=oWl92swfutZGJYBORKPOTW9y0AJvcOFraGadCYQmmoUOoJVrKUNiUvpGZE9eKzBLw RYhkG1h7XbPu5AY6rs0EyqtLN4ZiaUk4NteeVHzvDa5567F4SPjUhUNcKNjFuvDW5G lWQz+B/oCtzVPIGLsGBXXHhy933ZXveB3z9foruQ= Date: Sun, 6 Jan 2019 09:52:10 -0800 From: Eric Biggers To: "Theodore Y. Ts'o" , Linus Torvalds , linux-kernel@vger.kernel.org, linux-fscrypt@vger.kernel.org Subject: Re: [GIT PULL] fscrypt update for 4.21 Message-ID: <20190106175209.GB699@sol.localdomain> References: <20190106134912.GA27028@mit.edu> <20190106172005.GA699@sol.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190106172005.GA699@sol.localdomain> User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jan 06, 2019 at 09:20:07AM -0800, Eric Biggers wrote: > On Sun, Jan 06, 2019 at 08:49:12AM -0500, Theodore Y. Ts'o wrote: > > The following changes since commit 7beb01f74415c56f5992922b5b902b45d365e694: > > > > f2fs: clean up f2fs_sb_has_##feature_name (2018-11-26 15:53:55 -0800) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git tags/fscrypt_for_linus > > > > for you to fetch changes up to 8094c3ceb21ad93896fd4d238e8ba41911932eaf: > > > > fscrypt: add Adiantum support (2019-01-06 08:36:21 -0500) > > > > ---------------------------------------------------------------- > > Add Adiantum support for fscrypt > > > > ---------------------------------------------------------------- > > Eric Biggers (1): > > fscrypt: add Adiantum support > > > > Documentation/filesystems/fscrypt.rst | 179 ++++++++++++--------- > > fs/crypto/crypto.c | 28 ++-- > > fs/crypto/fname.c | 22 +-- > > fs/crypto/fscrypt_private.h | 67 +++++++- > > fs/crypto/keyinfo.c | 351 ++++++++++++++++++++++++++++++++---------- > > fs/crypto/policy.c | 5 +- > > include/uapi/linux/fs.h | 4 +- > > 7 files changed, 468 insertions(+), 188 deletions(-) > > Hi Ted, that tag is still on an old commit. Probably you forgot to push. > Fixed now, so either Ted pushed or I screwed something up. > Also, FYI Linus - the reason this is so late in the merge window is that this > patch was in the fscrypt tree which also had the fsverity stuff, which had > concerns raised. But this patch is independent and has been in linux-next since > Dec 4 (albeit under a different commit ID since it was applied after the > fsverity stuff), and also tested on some Android devices. > Also I forgot: last month I switched my personal desktop (which I'm sending this email from) over to use an Adiantum encrypted home directory :-) - Eric