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=-0.9 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 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 92EFBC282DD for ; Wed, 8 Jan 2020 21:24:27 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 63271206DA for ; Wed, 8 Jan 2020 21:24:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=lists.sourceforge.net header.i=@lists.sourceforge.net header.b="jsO2ax7W"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="LOFNXLaS"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="Qs53t5fA"; dkim=neutral (0-bit key) header.d=google.com header.i=@google.com header.b="DDNcIote" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63271206DA Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=lists.sourceforge.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type:Cc: Reply-To:From:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:To:Message-ID:Date:In-Reply-To:References: MIME-Version:Sender:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ks4tglrAu3GkKayMzQJgXxXrIHoXao5FNjVM6LFvkKg=; b=jsO2ax7W44QxUz5Jhg1lv8H14C wLOqeWvLfEaW/HnxMKf64pGHCq42VStkOl6ifLBEoEdKN8OInKqAGUrKo5iDuYaX3aX6kCQXC9NsF AQ1W2ytGpnojy5gOc5slC4i6dzWW6IG2BxlTP7T4nCr7o1U0rheEEofNA3JusIGSfNyM=; Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1ipIoV-0001Dm-0k; Wed, 08 Jan 2020 21:24:27 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ipIoT-0001De-CH for linux-f2fs-devel@lists.sourceforge.net; Wed, 08 Jan 2020 21:24:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Sender:Reply-To:Content-Transfer-Encoding :Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MrgqnfuzWiyeoBisKfI9WUGDpT/I3A3pzpV2omGtkBc=; b=LOFNXLaSMTOA6fwMt3haZTMm9O u8lA8Z5C7oVpv3zKH/lRpmymCIXvaC3sQMeu65n7DCj60YN9nN2S0Tv+8FyapKzt/lkGC3G/iIgWx orkvF4jv5SZ3/aRnWJVtTht0ZmD79sD4o5h92fvTAOPSGw00gLiU544cUKZ/CB0x+cKE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To:References: MIME-Version:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=MrgqnfuzWiyeoBisKfI9WUGDpT/I3A3pzpV2omGtkBc=; b=Qs53t5fADK/FjUv3FnwtOIe07q ssJijdzemxJ5xUL47avkO+TntWFgaF+D1c8aQycKUdFPxJ9dLp8kNYLW8pt5mh4+46JaEZISbEFV4 GAfRFQylIMe4701lrEVocMzWbOvzsL8j0357KHamubrB9gWBsEx7znRZQoR7Oz4HXu1c=; Received: from mail-lj1-f194.google.com ([209.85.208.194]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1ipIoR-00DgSh-GV for linux-f2fs-devel@lists.sourceforge.net; Wed, 08 Jan 2020 21:24:25 +0000 Received: by mail-lj1-f194.google.com with SMTP id z22so4910362ljg.1 for ; Wed, 08 Jan 2020 13:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=MrgqnfuzWiyeoBisKfI9WUGDpT/I3A3pzpV2omGtkBc=; b=DDNcIoteefV8aBFRJqRjAYF8UmeDfEGuxO5aoHpC40ksghWZNn1vYOvHVH75utqX92 8pyR/nWuhn+vomgt79nK/sovZ1x7PhYhTnNXeT0womFAJ98oI98vJEh+zZtrLhhAsaiT xHAeO525OvgTSe1X+L3USeOsbOk+RWWtyuGny4uD91Ul8TIcjfd6L4XmBIrytt5zzyEs hQErb3i2mU9p3strf1rp4eW3q1/1zYZBB0VrVfwfyEPkEBvcTwGsqDvhRh9K2zjsT3ch 4bymw0ydHk1l0bLwoVhIPuVYIxoBXZ9csRffl8URhKARiRZg6AEOEEzGhtohlDS2x0zL xbtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MrgqnfuzWiyeoBisKfI9WUGDpT/I3A3pzpV2omGtkBc=; b=d5bQ3/oPCdB4eAxxE831qyNNUZd9ydb9lvg5NgeQV7qmaVnXLxxGhvjJThxYUxFjZ0 p01myL4WR8V2PCbaKd6T3oNEJKQYRpCWBbfnhsd2bnn8NF6IkbmoU/PDJ4jh8qf3yk5W DXXAnOn4zaN/fMe/j61f0nKJ+0XPm4jo70GKwfc2XKImVPHKkTQFsHdjlrHWols6gj/F wA++JkVCVBdxz1vBB6znVBJGEv4a0zl3RFBQZiqFZFKi7OmQSV62fOi2REvqk45Xkflf QlcTLWc5lfN4ls/LnWiHlKThNV4CaTJOd8yFA9Ru+KZFYkgoAUKS2clSDX8h9hODMJM2 jTnA== X-Gm-Message-State: APjAAAXUvmknzhq3i6YVfDRfEe3xpmmmrME+blwsfYmMJNWY9z2xqVhF MVE6e2lNQTCw28/P32gnQ6d7RRNmgtIHfiAJEQiTtQ== X-Google-Smtp-Source: APXvYqzIFAaH51EKKHEbmEN6pXokDd653dkwA7mvIiTffi1G/lQMFKNkhMpqs1Z3DU3Ocqxwmy/VJxTCWBZ8KPcs8nw= X-Received: by 2002:a05:651c:1049:: with SMTP id x9mr4073045ljm.233.1578518656460; Wed, 08 Jan 2020 13:24:16 -0800 (PST) MIME-Version: 1.0 References: <20200107051638.40893-1-drosen@google.com> <20200108185005.GE263696@mit.edu> In-Reply-To: <20200108185005.GE263696@mit.edu> Date: Wed, 8 Jan 2020 13:24:05 -0800 Message-ID: To: "Theodore Y. Ts'o" X-Headers-End: 1ipIoR-00DgSh-GV Subject: Re: [f2fs-dev] [PATCH v2 0/6] Support for Casefolding and Encryption X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Daniel Rosenberg via Linux-f2fs-devel Reply-To: Daniel Rosenberg Cc: Jonathan Corbet , kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Eric Biggers , linux-fscrypt@vger.kernel.org, Andreas Dilger , Alexander Viro , linux-fsdevel@vger.kernel.org, Jaegeuk Kim , linux-ext4@vger.kernel.org, Gabriel Krisman Bertazi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On Wed, Jan 8, 2020 at 10:50 AM Theodore Y. Ts'o wrote: > > On Mon, Jan 06, 2020 at 09:16:32PM -0800, Daniel Rosenberg wrote: > > changes: > > fscrypt moved to separate thread to rebase on fscrypt dev branch > > addressed feedback, plus some minor fixes > > What branch was this based on? There is no fscrypt dev branch, so I > took the fscrypt master branch, and then applied your fscrypt patches, > and then I tried to apply this patch series. I got patch conflicts > starting with the very first patch. > > Applying: TMP: fscrypt: Add support for casefolding with encryption > error: patch failed: fs/crypto/Kconfig:9 > error: fs/crypto/Kconfig: patch does not apply > error: patch failed: fs/crypto/fname.c:12 > error: fs/crypto/fname.c: patch does not apply > error: patch failed: fs/crypto/fscrypt_private.h:12 > error: fs/crypto/fscrypt_private.h: patch does not apply > error: patch failed: fs/crypto/keysetup.c:192 > error: fs/crypto/keysetup.c: patch does not apply > error: patch failed: fs/crypto/policy.c:67 > error: fs/crypto/policy.c: patch does not apply > error: patch failed: fs/inode.c:20 > error: fs/inode.c: patch does not apply > error: patch failed: include/linux/fscrypt.h:127 > error: include/linux/fscrypt.h: patch does not apply > Patch failed at 0001 TMP: fscrypt: Add support for casefolding with encryption > hint: Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > - Ted > > -- > To unsubscribe from this group and stop receiving emails from it, send an email to kernel-team+unsubscribe@android.com. > This is based off of ToT master. I put in a dummy fscrypt patch so you wouldn't need to rebase on top of fscrypt, but I could just do future patch sets all on top of fscrypt-dev. I guess my attempt to make it easier just made it more confusing :( _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel