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.1 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 59519C43387 for ; Fri, 11 Jan 2019 02:55:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1119A20879 for ; Fri, 11 Jan 2019 02:55:30 +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="cuP3YwmS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729286AbfAKCz3 (ORCPT ); Thu, 10 Jan 2019 21:55:29 -0500 Received: from ozlabs.org ([203.11.71.1]:56865 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727780AbfAKCz3 (ORCPT ); Thu, 10 Jan 2019 21:55:29 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43bSCd0rrtz9sCs; Fri, 11 Jan 2019 13:55:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1547175326; bh=4coEkcmIAnBv2XU15dyvSDbJnIsWHbFwxJO0EBOj3QA=; h=Date:From:To:Cc:Subject:From; b=cuP3YwmS8mDS+CKN2A+ap74e9/3ulWXR+0kFChsTsoYjwO0bJwLTb/xP/C1RyuyhF P9fBlBwHgRuL9lEmuXklAKm2CvRYVpnugF+uTHf+CtKIEeRFCbva0nAaw0wTqXKo93 TROsa90C5M9i4qNXlqjkgn8iEa7eoHiJ9TppXSgXKxhDAOVLZIa8E4nU/PZiMXhOTY +Gige/ffX9dpmADjxmox1MymFdcw7H2/X/DSfsgvRyiOkEt9MEArpBuMBcS0Wej5A2 XFXSLMbqe99bSq41tH1Fe2zr2bSZevlDPgrKIsVhOU8icXJbLESFtJ/9CuhPXHvh8o o9obllVfFqAbw== Date: Fri, 11 Jan 2019 13:55:24 +1100 From: Stephen Rothwell To: Andrew Morton , James Morris Cc: Linux Next Mailing List , Linux Kernel Mailing List , Casey Schaufler , Kees Cook , Kent Overstreet Subject: linux-next: manual merge of the akpm-current tree with the security tree Message-ID: <20190111135524.5e3cceda@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/DO8h4dLRcQhDbH0nPFNPl+N"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/DO8h4dLRcQhDbH0nPFNPl+N Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: security/selinux/ss/services.c between commit: 3d252529480c ("SELinux: Remove unused selinux_is_enabled") from the security tree and commit: dd4c293d6d4d ("selinux: convert to kvmalloc") from the akpm-current 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 security/selinux/ss/services.c index d6e7b4856d93,fac47b306b6b..000000000000 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@@ -49,7 -49,7 +49,6 @@@ #include #include #include - #include -#include #include #include =20 --Sig_/DO8h4dLRcQhDbH0nPFNPl+N Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlw4BZwACgkQAVBC80lX 0GxBJQf+LKof6Bjuuqe7LdWNnrMSkUtYVxLMnM0UvQzaQws7+9Y7+/4JP15++9YK wEJ2otXV1/nO64rzXPMggLbqKw7rmV/37ScBec0QV4H2bWDDdbQygyx2KVgxbo92 ES7p4DxOmwRa1SgStbUq4rz9OozH3+YhnEh1XD8gmL09NKYlWvnrNNC11qAvZFhN zvG/wxUMZz3ZO/NQOfjFKnBj4HgKN0cCtjV2SD8lZyB+RcJBcWAB2ZDRnztqwtkM tZlP/Ja17EY4mFGRUAlwuQi9YKE10pHXQSfaxmRynz528gCz/xaACSWTA3Orcx/9 oWK70WlCkH7itIRpH/OEvGdQdjGtGw== =nTsu -----END PGP SIGNATURE----- --Sig_/DO8h4dLRcQhDbH0nPFNPl+N--