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=-1.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS 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 38F76C5CFFE for ; Mon, 10 Dec 2018 23:24:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F373920855 for ; Mon, 10 Dec 2018 23:24:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="C8d+JWVx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F373920855 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730152AbeLJXYc (ORCPT ); Mon, 10 Dec 2018 18:24:32 -0500 Received: from ozlabs.org ([203.11.71.1]:43337 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729403AbeLJXYb (ORCPT ); Mon, 10 Dec 2018 18:24:31 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43DK0V0yKXz9s4s; Tue, 11 Dec 2018 10:24:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1544484269; bh=iMkv0YgdsAJD2Z5BsKb7PYIrWaYDZZemTp1NdmGIZvg=; h=Date:From:To:Cc:Subject:From; b=C8d+JWVxE4W9FNztcvEhVkb+gn4+d89ZvNgap+sM545PoKlpipbL8ALq8sglGGN/p kJp2RQlVSSihIDwfQLLNRN6jQil53Hi8LIEBfUW8/IZ0dhhXpbMaakC/JgRVzdB+ZK iFruJ10Od53b/tzS7u+BF/qRYy4ES2sZKRiTEZssxszIOH758CJ0yvH6ixzHuVe8aD d+Qk37pxmCrHxnLaZKDdnkH/ggIOJmvxgi2Io6p+GYUZ+M81UzE3KIp4RwWWppkyYh iWvDxut+BUncn42Ntaiintxd+TYNjW5NtAqivn7ZfesgIJJ8QKW0Ih05BXUKJZrcD5 U4dCyJ05sIEzQ== Date: Tue, 11 Dec 2018 10:24:25 +1100 From: Stephen Rothwell To: Artem Bityutskiy , Theodore Ts'o Cc: Linux Next Mailing List , Linux Kernel Mailing List , Chandan Rajendra , Geert Uytterhoeven , Richard Weinberger Subject: linux-next: manual merge of the ubifs tree with the fscrypt tree Message-ID: <20181211102425.7019f0a7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/qQcqP08b_uPJnFcH_vmeX+6"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/qQcqP08b_uPJnFcH_vmeX+6 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the ubifs tree got a conflict in: fs/ubifs/Kconfig between commit: 6956097c429a ("fscrypt: remove filesystem specific build config option") from the fscrypt tree and commit: 1341551f1e2a ("ubifs: CONFIG_UBIFS_FS_AUTHENTICATION should depend on UBI= FS_FS") from the ubifs tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc fs/ubifs/Kconfig index ff7ea6f04555,bc1e082d921d..000000000000 --- a/fs/ubifs/Kconfig +++ b/fs/ubifs/Kconfig @@@ -65,9 -60,20 +62,9 @@@ config UBIFS_FS_XATT =20 If unsure, say Y. =20 -config UBIFS_FS_ENCRYPTION - bool "UBIFS Encryption" - depends on UBIFS_FS_XATTR && BLOCK - select FS_ENCRYPTION - default n - help - Enable encryption of UBIFS files and directories. This - feature is similar to ecryptfs, but it is more memory - efficient since it avoids caching the encrypted and - decrypted pages in the page cache. - config UBIFS_FS_SECURITY bool "UBIFS Security Labels" - depends on UBIFS_FS && UBIFS_FS_XATTR + depends on UBIFS_FS_XATTR default y help Security labels provide an access control facility to support Linux --Sig_/qQcqP08b_uPJnFcH_vmeX+6 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwO9akACgkQAVBC80lX 0GyGbgf8CLWZGlV8J9ZBbK1QuRaPR7q2rzhrIiTbo6KelMCuYJo0mhzCDceAOTQA LqndlGl6i3lBL4NAuH76RBbUWsvmTHrXR2Mhvb/o/fodQX0u7nYuuETmY3pKwB9d 98DIW3BpFOoLN3tqaf7QxFiESKXlprHEbQ+2nBcPEjXMnGYkdbQJRQ9Io6dt5z/C j8b6L/c/2LMQO/AMY9+ErkpG1+FJURYASbsYaR4Jash6/VBnenFHMfDWojRSq8M8 laKNdN0ci5o/aEOopFHFAca+xS7yOK8SQlgZI6bzwrTsS7YgWIrwD+7JA+GowT86 7F1Th4PjRVWsSaaYv1r0y4N8ClPW/w== =xNnl -----END PGP SIGNATURE----- --Sig_/qQcqP08b_uPJnFcH_vmeX+6--