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, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 19DF2C433DF for ; Fri, 19 Jun 2020 11:17:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECFAA2080C for ; Fri, 19 Jun 2020 11:17:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ellerman.id.au header.i=@ellerman.id.au header.b="FT1TmN7F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732627AbgFSLRE (ORCPT ); Fri, 19 Jun 2020 07:17:04 -0400 Received: from ozlabs.org ([203.11.71.1]:56849 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729862AbgFSLRB (ORCPT ); Fri, 19 Jun 2020 07:17:01 -0400 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 (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49pGV3381Cz9s9y; Fri, 19 Jun 2020 21:16:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ellerman.id.au; s=201909; t=1592565419; bh=KUgzDn5A0mB1tUojG4/8s9av4s0WnFqXhr3yFHygg8s=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=FT1TmN7F97o/+KCnwO65GIou4kMg+dUx/0uRoU3Mt4iDOVmQBDIJtqZJnI3PIrodD Gvzk/MB1TqkKyaJAB//uZQMlNyxBSCu0zub4EgRj419nfEUHYMHJZVSo6L0FdqPzgg dx0bAA9PEkofJa+C2oeL8wBASnmhUSzUUr8QJNZf1UlfP5rQmAy97ELYnkX6FmzQGW Wasq617evGkt0aotRYxkN7neI4RFchNnjQpjLnvV097lPuuPeHG3kWp1KD9ISUv3qB Kz/lJtA3V58yE2YEOV9qAZTDqgk5oHwpYJdo7OM1oiViIlCq/54TFLPQk4Aq71CQvk wma5gXswHNT6g== From: Michael Ellerman To: Stephen Rothwell , Christian Brauner , PowerPC Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the pidfd tree with the powerpc-fixes tree In-Reply-To: <20200618121131.4ad29150@canb.auug.org.au> References: <20200618121131.4ad29150@canb.auug.org.au> Date: Fri, 19 Jun 2020 21:17:30 +1000 Message-ID: <878sgjcnjp.fsf@mpe.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the pidfd tree got a conflict in: > > arch/powerpc/kernel/syscalls/syscall.tbl > > between commit: > > 35e32a6cb5f6 ("powerpc/syscalls: Split SPU-ness out of ABI") > > from the powerpc-fixes tree and commit: > > 9b4feb630e8e ("arch: wire-up close_range()") > > from the pidfd 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. I thought the week between rc1 and rc2 would be a safe time to do that conversion of the syscall table, but I guess I was wrong :) I'm planning to send those changes to Linus for rc2, so the conflict will then be vs mainline. But I guess it's pretty trivial so it doesn't really matter. cheers > diff --cc arch/powerpc/kernel/syscalls/syscall.tbl > index c0cdaacd770e,dd87a782d80e..000000000000 > --- a/arch/powerpc/kernel/syscalls/syscall.tbl > +++ b/arch/powerpc/kernel/syscalls/syscall.tbl > @@@ -480,6 -524,8 +480,7 @@@ > 434 common pidfd_open sys_pidfd_open > 435 32 clone3 ppc_clone3 sys_clone3 > 435 64 clone3 sys_clone3 > -435 spu clone3 sys_ni_syscall > + 436 common close_range sys_close_range > 437 common openat2 sys_openat2 > 438 common pidfd_getfd sys_pidfd_getfd > 439 common faccessat2 sys_faccessat2