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=-9.0 required=3.0 tests=BAYES_00,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 C04B5C433EF for ; Fri, 3 Sep 2021 14:30:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D6DA61058 for ; Fri, 3 Sep 2021 14:30:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349458AbhICObd convert rfc822-to-8bit (ORCPT ); Fri, 3 Sep 2021 10:31:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:34442 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235668AbhICObc (ORCPT ); Fri, 3 Sep 2021 10:31:32 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 569D260295; Fri, 3 Sep 2021 14:30:32 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mMAD8-008rfE-95; Fri, 03 Sep 2021 15:30:30 +0100 Date: Fri, 03 Sep 2021 15:30:29 +0100 Message-ID: <8735qlwx2y.wl-maz@kernel.org> From: Marc Zyngier To: Michael Ellerman Cc: Linus Torvalds , aik@ozlabs.ru, aneesh.kumar@linux.ibm.com, anton@ozlabs.org, bigeasy@linutronix.de, christophe.leroy@csgroup.eu, clg@kaod.org, ego@linux.vnet.ibm.com, farosas@linux.ibm.com, fthain@linux-m68k.org, hbathini@linux.ibm.com, jniethe5@gmail.com, joel@jms.id.au, kjain@linux.ibm.com, ldufour@linux.ibm.com, leobras.c@gmail.com, linkmauve@linkmauve.fr, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, lkp@intel.com, lukas.bulwahn@gmail.com, masahiroy@kernel.org, maskray@google.com, msuchanek@suse.de, nathan@kernel.org, npiggin@gmail.com, oss@buserror.net, parth@linux.ibm.com, paul.gortmaker@windriver.com, psampat@linux.ibm.com, rdunlap@infradead.org, srikar@linux.vnet.ibm.com, sxwjean@gmail.com, wanjiabing@vivo.com, zhengyongjun3@huawei.com, Thomas Gleixner Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.15-1 tag In-Reply-To: <87pmtppypy.fsf@mpe.ellerman.id.au> References: <87pmtppypy.fsf@mpe.ellerman.id.au> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: mpe@ellerman.id.au, torvalds@linux-foundation.org, aik@ozlabs.ru, aneesh.kumar@linux.ibm.com, anton@ozlabs.org, bigeasy@linutronix.de, christophe.leroy@csgroup.eu, clg@kaod.org, ego@linux.vnet.ibm.com, farosas@linux.ibm.com, fthain@linux-m68k.org, hbathini@linux.ibm.com, jniethe5@gmail.com, joel@jms.id.au, kjain@linux.ibm.com, ldufour@linux.ibm.com, leobras.c@gmail.com, linkmauve@linkmauve.fr, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, lkp@intel.com, lukas.bulwahn@gmail.com, masahiroy@kernel.org, maskray@google.com, msuchanek@suse.de, nathan@kernel.org, npiggin@gmail.com, oss@buserror.net, parth@linux.ibm.com, paul.gortmaker@windriver.com, psampat@linux.ibm.com, rdunlap@infradead.org, srikar@linux.vnet.ibm.com, sxwjean@gmail.com, wanjiabing@vivo.com, zhengyongjun3@huawei.com, tglx@linutronix.de X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Michael, On Fri, 03 Sep 2021 14:36:57 +0100, Michael Ellerman wrote: > > Hi Linus, > > Please pull powerpc updates for 5.15. > > A bit of a small batch this time. > > There was one conflict against my own fixes branch, and the resolution was a little bit > messy, so I just did a merge of fixes myself to resolve the conflict. I didn't think there > was any value in having you resolve a conflict between two of my own branches. > > Notable out of area changes: > scripts/mod/modpost.c # 1e688dd2a3d6 powerpc/bug: Provide better flexibility to WARN_ON/__WARN_FLAGS() with asm goto > kernel/irq/irqdomain.c # 51be9e51a800 KVM: PPC: Book3S HV: XIVE: Fix mapping of passthrough interrupts > > That second one generated a bit of discussion[1] with tglx and maz, > who asked if we could avoid adding the export of > irq_get_default_host(). Cédric replied explaining that we don't > really have good way to avoid it, but we never heard back from them, > so in the end I decided to merge it. Apologies for this, I clearly have lost track of it. It clearly isn't pretty, but it isn't a deal breaker either. In the end, it will be easier to address with the code being in the tree. Thanks, M. -- Without deviation from the norm, progress is not possible.