All of lore.kernel.org
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Linus Torvalds <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,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.15-1 tag
Date: Fri, 03 Sep 2021 15:30:29 +0100	[thread overview]
Message-ID: <8735qlwx2y.wl-maz@kernel.org> (raw)
In-Reply-To: <87pmtppypy.fsf@mpe.ellerman.id.au>

Hi Michael,

On Fri, 03 Sep 2021 14:36:57 +0100,
Michael Ellerman <mpe@ellerman.id.au> 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.

WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: ego@linux.vnet.ibm.com, srikar@linux.vnet.ibm.com,
	parth@linux.ibm.com, aik@ozlabs.ru, jniethe5@gmail.com,
	bigeasy@linutronix.de, psampat@linux.ibm.com,
	paul.gortmaker@windriver.com, leobras.c@gmail.com,
	wanjiabing@vivo.com, lkp@intel.com, maskray@google.com,
	linkmauve@linkmauve.fr, aneesh.kumar@linux.ibm.com,
	masahiroy@kernel.org, joel@jms.id.au, lukas.bulwahn@gmail.com,
	kjain@linux.ibm.com, npiggin@gmail.com, nathan@kernel.org,
	clg@kaod.org, Thomas Gleixner <tglx@linutronix.de>,
	ldufour@linux.ibm.com, hbathini@linux.ibm.com, oss@buserror.net,
	msuchanek@suse.de, fthain@linux-m68k.org, farosas@linux.ibm.com,
	sxwjean@gmail.com, Linus Torvalds <torvalds@linux-foundation.org>,
	rdunlap@infradead.org, linux-kernel@vger.kernel.org,
	zhengyongjun3@huawei.com, linuxppc-dev@lists.ozlabs.org
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.15-1 tag
Date: Fri, 03 Sep 2021 15:30:29 +0100	[thread overview]
Message-ID: <8735qlwx2y.wl-maz@kernel.org> (raw)
In-Reply-To: <87pmtppypy.fsf@mpe.ellerman.id.au>

Hi Michael,

On Fri, 03 Sep 2021 14:36:57 +0100,
Michael Ellerman <mpe@ellerman.id.au> 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.

  reply	other threads:[~2021-09-03 14:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-03 13:36 [GIT PULL] Please pull powerpc/linux.git powerpc-5.15-1 tag Michael Ellerman
2021-09-03 13:36 ` Michael Ellerman
2021-09-03 14:30 ` Marc Zyngier [this message]
2021-09-03 14:30   ` Marc Zyngier
2021-09-03 18:45 ` pr-tracker-bot
2021-09-03 18:45   ` pr-tracker-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8735qlwx2y.wl-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=aik@ozlabs.ru \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=anton@ozlabs.org \
    --cc=bigeasy@linutronix.de \
    --cc=christophe.leroy@csgroup.eu \
    --cc=clg@kaod.org \
    --cc=ego@linux.vnet.ibm.com \
    --cc=farosas@linux.ibm.com \
    --cc=fthain@linux-m68k.org \
    --cc=hbathini@linux.ibm.com \
    --cc=jniethe5@gmail.com \
    --cc=joel@jms.id.au \
    --cc=kjain@linux.ibm.com \
    --cc=ldufour@linux.ibm.com \
    --cc=leobras.c@gmail.com \
    --cc=linkmauve@linkmauve.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lkp@intel.com \
    --cc=lukas.bulwahn@gmail.com \
    --cc=masahiroy@kernel.org \
    --cc=maskray@google.com \
    --cc=mpe@ellerman.id.au \
    --cc=msuchanek@suse.de \
    --cc=nathan@kernel.org \
    --cc=npiggin@gmail.com \
    --cc=oss@buserror.net \
    --cc=parth@linux.ibm.com \
    --cc=paul.gortmaker@windriver.com \
    --cc=psampat@linux.ibm.com \
    --cc=rdunlap@infradead.org \
    --cc=srikar@linux.vnet.ibm.com \
    --cc=sxwjean@gmail.com \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=wanjiabing@vivo.com \
    --cc=zhengyongjun3@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.