Message ID | 20231123111005.432dfc56@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:6f03:b0:164:83eb:24d7 with SMTP id r3csp1588758rwn; Wed, 22 Nov 2023 16:10:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWrU5LTqaUvOAMf0UP2eELdYBWE+mCoCY59w7/4D7ZKI4GzwZTTWk8A1iRS7D+llbHKS6A X-Received: by 2002:a17:903:234c:b0:1cc:3de0:bcc4 with SMTP id c12-20020a170903234c00b001cc3de0bcc4mr4412524plh.44.1700698227518; Wed, 22 Nov 2023 16:10:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700698227; cv=none; d=google.com; s=arc-20160816; b=c80UDi8+b4c+ev/6upB3RQqsPPHwy8s9lafZx9eX8/2ad65o0Exd188hUsj+0WwKG0 6EaeG+O2+k1KCchQjK53PHZlYqtd2DejR8I63tu4AxuKsbRnE+XQ6o5Nd2FhDFsTlJtP HgiMN9UjoHulwEwiVB6KX+mBdm8V3krAWr04EOALRjp+ICWWx6jrpmifVMUEe/R/Unb4 OB/9aaJBOBrIcdYbhxg+vk95FHc3dva0uMCPJBZhYr/BXg/YF9yMipgHcCWtaP0rGYC/ pCCNL3Y3ZhATNvRZbbZYciKdHy7XKlDCwKYp7uyXiJaCxMzZOUR9jogG4YHEy5Nwe+3w kNJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=F3hUK3Y0jf6mS8cm4SBZe1aq3dM/e7j0/uTA65TSOTE=; fh=SUQdtlmfuzPLJj5vGnemAsk1JOkBy/eX5StFO+6YKmY=; b=bkUhz107FE4hRDQp+RcIiBNpu3/drVvNO1nAsjL/ZNPJML1HKVXZYbdRKeivBRQneW 3iid9yhkdfYTUgngx2S8PUyNXJWgSWSXpIdihklJ46XuF3QsIX3V6eKWZvINDKguz2uo V2DGqzPH0pmqENNJodOVe1aNnC8q7zyTpH95TLLEVQag96LO58sqT3r7q4xj3YU/AivV 8mgOoc/xmDD3JGYeTJgKzJ5FOj5M+GMRCzp/1NNcF9cAmRgsDh22oeahCO15trMhR/ul DNd3eqzimGi1uLRjPsL/GrtuuN7JImK7W3Skk/JtmdcWa23FT8einkn7sMGjLAuHS58Q gfaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PRll5c2A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id n15-20020a170902f60f00b001cf56ff28a4si532143plg.522.2023.11.22.16.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 16:10:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=PRll5c2A; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 5EC568303B23; Wed, 22 Nov 2023 16:10:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229535AbjKWAKM (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Wed, 22 Nov 2023 19:10:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjKWAKM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 22 Nov 2023 19:10:12 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5B72DD; Wed, 22 Nov 2023 16:10:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700698206; bh=F3hUK3Y0jf6mS8cm4SBZe1aq3dM/e7j0/uTA65TSOTE=; h=Date:From:To:Cc:Subject:From; b=PRll5c2AoJNykMGptGa6+/VDK3EWaqvRu1+ZgltEQee7Vhckm3AJji5OjOxetaOrD pg3B6YD6FMrE76APsslOa8b8oONNzVtjF7yTKjjJrVjNbaj67l5jzaLt4BzAVaV9hT J6JXLGr5VcZzVN9IxqcSI5X+l7UVpP3WBA8JsSTgDN/LQQbARhf+ERHWWd7QoHNn+H TO5WUnw5RCYcUH9nM9xE9yBKUjQaHErdLU3BB5fyDnRzTe7pE/ydGcbBjN5iNXXDLq noQamLNEI6k0eAMxFBGZT91M5d27ynztmohUeSzsMhyjEcax09fTiLAoTDgGhApITZ njTGh6y1uoXVw== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SbJQj6nrMz4wdB; Thu, 23 Nov 2023 11:10:05 +1100 (AEDT) Date: Thu, 23 Nov 2023 11:10:05 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Paul Moore <paul@paul-moore.com>, Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>, Namhyung Kim <namhyung@kernel.org> Cc: Casey Schaufler <casey@schaufler-ca.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the security tree with the perf-current tree Message-ID: <20231123111005.432dfc56@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ka_w7hWow747h/p/rsdKFwU"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 22 Nov 2023 16:10:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783311344313773892 X-GMAIL-MSGID: 1783311344313773892 |
Series |
linux-next: manual merge of the security tree with the perf-current tree
|
|
Commit Message
Stephen Rothwell
Nov. 23, 2023, 12:10 a.m. UTC
Hi all, Today's linux-next merge of the security tree got a conflict in: tools/perf/arch/s390/entry/syscalls/syscall.tbl between commit: d3968c974a24 ("tools/perf: Update tools's copy of s390 syscall table") from the perf-current tree and commit: 5f42375904b0 ("LSM: wireup Linux Security Module syscalls") from the security 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.
Comments
Hi all, On Thu, 23 Nov 2023 11:10:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the security tree got a conflict in: > > tools/perf/arch/s390/entry/syscalls/syscall.tbl > > between commit: > > d3968c974a24 ("tools/perf: Update tools's copy of s390 syscall table") > > from the perf-current tree and commit: > > 5f42375904b0 ("LSM: wireup Linux Security Module syscalls") > > from the security 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc tools/perf/arch/s390/entry/syscalls/syscall.tbl > index 86fec9b080f6,5a422443cb16..000000000000 > --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl > +++ b/tools/perf/arch/s390/entry/syscalls/syscall.tbl > @@@ -455,7 -455,6 +455,10 @@@ > 450 common set_mempolicy_home_node sys_set_mempolicy_home_node sys_set_mempolicy_home_node > 451 common cachestat sys_cachestat sys_cachestat > 452 common fchmodat2 sys_fchmodat2 sys_fchmodat2 > -453 common lsm_get_self_attr sys_lsm_get_self_attr sys_lsm_get_self_attr > -454 common lsm_set_self_attr sys_lsm_set_self_attr sys_lsm_set_self_attr > -455 common lsm_list_modules sys_lsm_list_modules sys_lsm_list_modules > +453 common map_shadow_stack sys_map_shadow_stack sys_map_shadow_stack > +454 common futex_wake sys_futex_wake sys_futex_wake > +455 common futex_wait sys_futex_wait sys_futex_wait > +456 common futex_requeue sys_futex_requeue sys_futex_requeue > ++459 common lsm_get_self_attr sys_lsm_get_self_attr sys_lsm_get_self_attr > ++460 common lsm_set_self_attr sys_lsm_set_self_attr sys_lsm_set_self_attr > ++461 common lsm_list_modules sys_lsm_list_modules sys_lsm_list_modules This is now a conflict between the security tree and Linus' tree.
diff --cc tools/perf/arch/s390/entry/syscalls/syscall.tbl index 86fec9b080f6,5a422443cb16..000000000000 --- a/tools/perf/arch/s390/entry/syscalls/syscall.tbl