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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, 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 C54B0C352A4 for ; Wed, 12 Feb 2020 23:03:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99A2B2168B for ; Wed, 12 Feb 2020 23:03:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore-com.20150623.gappssmtp.com header.i=@paul-moore-com.20150623.gappssmtp.com header.b="z4SEjtUq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729186AbgBLXDw (ORCPT ); Wed, 12 Feb 2020 18:03:52 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42206 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728447AbgBLXDw (ORCPT ); Wed, 12 Feb 2020 18:03:52 -0500 Received: by mail-ed1-f68.google.com with SMTP id e10so4384791edv.9 for ; Wed, 12 Feb 2020 15:03:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mANb3MJ7SwHX/aisyLGjfvCuzvNAyVJWEC7aYrPPn4M=; b=z4SEjtUqoddOGb7EzSuAze78E9C1koF7GGUUxNrvWFK4BPdFQOHuadZP0VwtVjhzoY k7Kw2mWca9vpTu7twrNgPVvOjWO48Pwoaw+O32A7w1COMa3qbIF7HCBDjI1PnLQLgudx XaHtHygp12xeRMhMxsvTRWGTzGyczlgTKFczi01pY3G82adPfTDoCfTDRi7Kdu7U6P7w hATb1n9sYp8ipK+4pXMylM4Rm9LP7yRKxkssY5tuUyO4uEJ4bunabOQ+GYh3hwcCSCci TjVuYyQHD2+3INBGlro+aHtH/5jB+3RQJf5fWOQnHdDC2XAhTB/Dv5O474IYaLywNtxx Oyeg== 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=mANb3MJ7SwHX/aisyLGjfvCuzvNAyVJWEC7aYrPPn4M=; b=piF3MGlrFyaShOMlWqStoKRQEijdkbZCl5tuQdyBVA+F8cv97hLOIUVwBOIfOMqyWt SlUNluvTWrvPHSjx3MXgQ7+Hwh6TEQgOSOIoHVxxWvGdslsktTNuMnf80e6n6c2ZLr0f pRfH4I9y6lHRTo8qpX3c9Z8oif0Tkj6jbhkSSnfuNwoXtNNAr90wuCMQ/dlunNjGj96x 1Q2A1GUSUhA34nruhfYBsJzTipfS11WVYVgz/LtjOoguq3wB45Sd67h6jM6rYelNjSI2 yN8httLw+Kz9uxx6ml2TlB1LXvOLDb9tyILvtlV8FpGNf9PcGs8jebMvxapdfJmI1y3x Z8vg== X-Gm-Message-State: APjAAAUa0nU8mvfUk+wcTzIU0vWMgXirJ1ouQA11i2tJtVhQDQqnHIOv CHujohrg59UjRyo3rg7EBvNjZzPKLdPS899bV0Gc X-Google-Smtp-Source: APXvYqzy0QEr2aSzOfpdxGyokni+yy+P+S72lAI7lUMjop0zSoKQdAuHHzO3m1E+hsqnujAyqfCmQ1CaxLrxqWl+hj4= X-Received: by 2002:a05:6402:61a:: with SMTP id n26mr11930215edv.135.1581548629957; Wed, 12 Feb 2020 15:03:49 -0800 (PST) MIME-Version: 1.0 References: <20200213094844.6bafd9e1@canb.auug.org.au> In-Reply-To: <20200213094844.6bafd9e1@canb.auug.org.au> From: Paul Moore Date: Wed, 12 Feb 2020 18:03:39 -0500 Message-ID: Subject: Re: linux-next: manual merge of the selinux tree with Linus' tree To: Stephen Rothwell Cc: Linux Next Mailing List , Linux Kernel Mailing List , Hridya Valsaraju , "Connor O'Brien" Content-Type: text/plain; charset="UTF-8" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Feb 12, 2020 at 5:48 PM Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the selinux tree got a conflict in: > > security/selinux/hooks.c > > between commit: > > a20456aef80f ("selinux: fix typo in filesystem name") > > from Linus' tree and commit: > > 4ca54d3d3022 ("security: selinux: allow per-file labeling for bpffs") > > from the selinux 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. Yes, I ran into the same problem this morning. That is the correct fix, thanks Stephen. > diff --cc security/selinux/hooks.c > index ae891d712800,44f6f4e20cba..000000000000 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@@ -698,7 -701,8 +701,8 @@@ static int selinux_set_mnt_opts(struct > > if (!strcmp(sb->s_type->name, "debugfs") || > !strcmp(sb->s_type->name, "tracefs") || > - !strcmp(sb->s_type->name, "binderfs") || > + !strcmp(sb->s_type->name, "binder") || > + !strcmp(sb->s_type->name, "bpf") || > !strcmp(sb->s_type->name, "pstore")) > sbsec->flags |= SE_SBGENFS; > -- paul moore www.paul-moore.com