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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 105A9C27C49 for ; Sat, 28 Oct 2023 15:30:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229592AbjJ1PaL (ORCPT ); Sat, 28 Oct 2023 11:30:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229446AbjJ1PaJ (ORCPT ); Sat, 28 Oct 2023 11:30:09 -0400 Received: from mail-yb1-xb2f.google.com (mail-yb1-xb2f.google.com [IPv6:2607:f8b0:4864:20::b2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A20ACE for ; Sat, 28 Oct 2023 08:30:06 -0700 (PDT) Received: by mail-yb1-xb2f.google.com with SMTP id 3f1490d57ef6-d9a398f411fso2342106276.3 for ; Sat, 28 Oct 2023 08:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1698507005; x=1699111805; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=1Psx6DPhn5gxaHro7LZdui2z8lsRiXQ6XuCVBNwp93o=; b=FQwPt5Ttw9BXvnq99rCJEYLloHy7oNEMaeeiLmj4/WPjlz0j4kRlePwQlU1dG6h5NR 5xskqJbhLdagtUsx1QIRQUS01gSQnTi8fRJ4k2ewsb+iChYQvr86wdHp3RAbqZHfKdFc VQT/uH5YhPr8y6b4N9nZNBO29S9xkFsuRsof+ks+VjF6Jzyl1iEa48ekHUaRsGZFFbHN vAOyvNzMUbdCXsza1uJTUj6dNrJ4gUyALF1RLkfA5tikQibSnrUYyLoNGq2LhY2W8tgp Lt6YnurGQIGnQ/zZacT2rKtQYXwdrheL9TzD9HNCsNDCNmE5npl7YpDvh5Jw/Cz73wdB /hLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698507005; x=1699111805; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Psx6DPhn5gxaHro7LZdui2z8lsRiXQ6XuCVBNwp93o=; b=qV2TjEn0IzQPH2V+AhuYNH842qRt7F6/ZnSk1AKkEJoLPMlKkxuocJ3I5pYFTTp6fo x0yXaZgHe0qcQUG6jAlQkEoCHoU6G42+2T86rFAIXLiBHg0Nt1V5x95Cd0RLU7iItV1U ESmG7PFMfr1hUgziv/6cRG9TVaqVHCf3EZBagbUMxQ30zwQsceY3uFipL6DEcxHlk3LZ o4XfhX6suzDaesCnU46botZq4LcWXp/YjyVs+vGUD6gLdfZS/NULb0bFo7ZDNVqslSsh PHhVBh3Mp8arRWmr0mXy7kj2eiyZ9GEtQn/JXrSWQB92nj9xQ5rEFx7u/pNRgc7EbcQD ib0A== X-Gm-Message-State: AOJu0Yxq3l5oBRN3skLf3/MQ3L8EyB95fUKaHjhVSIamF+JvzCpe1ZyC A+mzSaw/zeHGxZoEfGYhoD0SiCLoQVUeDMXrxU0u X-Google-Smtp-Source: AGHT+IEH5S31wyF+i8YcOAao48lWfba1CZpnonABBuK3wxFhHmGlkVHkfd9M3udft7lQXT58hALwDBQtw48cYG5sros= X-Received: by 2002:a25:f828:0:b0:d78:26a0:ab8b with SMTP id u40-20020a25f828000000b00d7826a0ab8bmr5450048ybd.55.1698507005308; Sat, 28 Oct 2023 08:30:05 -0700 (PDT) MIME-Version: 1.0 References: <20231027125006.58d5e94f@canb.auug.org.au> In-Reply-To: <20231027125006.58d5e94f@canb.auug.org.au> From: Paul Moore Date: Sat, 28 Oct 2023 11:29:54 -0400 Message-ID: Subject: Re: linux-next: manual merge of the security tree with the asm-generic, block and tip trees To: Stephen Rothwell Cc: Arnd Bergmann , Jens Axboe , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Casey Schaufler , Linux Kernel Mailing List , Linux Next Mailing List , Sohil Mehta Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Oct 26, 2023 at 9:50=E2=80=AFPM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the security tree got conflicts in: > > arch/alpha/kernel/syscalls/syscall.tbl > arch/arm/tools/syscall.tbl > arch/arm64/include/asm/unistd.h > arch/arm64/include/asm/unistd32.h > arch/m68k/kernel/syscalls/syscall.tbl > arch/microblaze/kernel/syscalls/syscall.tbl > arch/mips/kernel/syscalls/syscall_n32.tbl > arch/mips/kernel/syscalls/syscall_n64.tbl > arch/mips/kernel/syscalls/syscall_o32.tbl > arch/parisc/kernel/syscalls/syscall.tbl > arch/powerpc/kernel/syscalls/syscall.tbl > arch/s390/kernel/syscalls/syscall.tbl > arch/sh/kernel/syscalls/syscall.tbl > arch/sparc/kernel/syscalls/syscall.tbl > arch/x86/entry/syscalls/syscall_32.tbl > arch/x86/entry/syscalls/syscall_64.tbl > arch/xtensa/kernel/syscalls/syscall.tbl > include/uapi/asm-generic/unistd.h > > between commits: > > 2fd0ebad27bc ("arch: Reserve map_shadow_stack() syscall number for all = architectures") > 9f6c532f59b2 ("futex: Add sys_futex_wake()") > cb8c4312afca ("futex: Add sys_futex_wait()") > 0f4b5f972216 ("futex: Add sys_futex_requeue()") > > from the asm-generic, block and tip trees and commit: > > 6d54f25e4605 ("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. Thanks Stephen, those changes look correct to me, I'll update the LSM tree once the asm-generic, block, and tip tree changes make their way to Linus. --=20 paul-moore.com