From: Christoffer Dall <cdall@linaro.org> To: Mark Rutland <mark.rutland@arm.com> Cc: Marc Zyngier <marc.zyngier@arm.com>, catalin.marinas@arm.com, Will Deacon <will.deacon@arm.com>, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 00/15] arm64/kvm: use common sysreg definitions Date: Tue, 28 Mar 2017 22:29:31 +0200 [thread overview] Message-ID: <20170328202931.GF20211@cbox> (raw) In-Reply-To: <20170328184828.GF8643@leverpostej> On Tue, Mar 28, 2017 at 07:48:28PM +0100, Mark Rutland wrote: > On Wed, Mar 22, 2017 at 06:35:13PM +0000, Mark Rutland wrote: > > On Fri, Mar 10, 2017 at 06:35:55PM +0000, Will Deacon wrote: > > > On Fri, Mar 10, 2017 at 08:17:22AM +0000, Marc Zyngier wrote: > > > > > > The next question is how do we merge this. Obviously, we can't split it > > > > between trees, and this is very likely to clash with anything that we > > > > will merge on the KVM side (the sysreg table is a popular place). > > > > > > > > Will, Catalin: Would it make sense to create a stable branch with these > > > > patches, and merge it into both the arm64 and KVM trees? That'd make > > > > things easier... > > > > > > I think the scope for conflict on our side is pretty high too, so a shared > > > branch might be the best way to go. I don't want to branch just yet though, > > > so I'll probably wait a week or so before setting something in stone. > > > > Any further thoughts on this? > > > > Christoffer has Acked the KVM bits, so if you're happy to do so for the > > arm64 bits I can make a stable branch. > > Looking around, it doesn't look like there's anything outside of arm64 > that'll conflict on the <asm/sysreg.h> changes, and git's happy to merge > my changes with Suzuki's changes currently queued in arm64's > for-next/core branch. > > I think it would make sense for those to be in a common branch taken by > both the arm64 and KVM trees, with the KVM-specific parts being taken by > KVM alone atop of that. > > Would everyone be happy with that? I'm happy with that. > > For reference, I've updated my branches so that arm64/common-sysreg only > contains the common parts, with the KVM parts atop of that in > kvm/common-sysreg. > Will, Catalin: Let me know if you're going to pull from common-sysreg and I'll do the same and add the kvm patches above. Thanks for preparing the patches. -Christoffer
WARNING: multiple messages have this Message-ID (diff)
From: cdall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 00/15] arm64/kvm: use common sysreg definitions Date: Tue, 28 Mar 2017 22:29:31 +0200 [thread overview] Message-ID: <20170328202931.GF20211@cbox> (raw) In-Reply-To: <20170328184828.GF8643@leverpostej> On Tue, Mar 28, 2017 at 07:48:28PM +0100, Mark Rutland wrote: > On Wed, Mar 22, 2017 at 06:35:13PM +0000, Mark Rutland wrote: > > On Fri, Mar 10, 2017 at 06:35:55PM +0000, Will Deacon wrote: > > > On Fri, Mar 10, 2017 at 08:17:22AM +0000, Marc Zyngier wrote: > > > > > > The next question is how do we merge this. Obviously, we can't split it > > > > between trees, and this is very likely to clash with anything that we > > > > will merge on the KVM side (the sysreg table is a popular place). > > > > > > > > Will, Catalin: Would it make sense to create a stable branch with these > > > > patches, and merge it into both the arm64 and KVM trees? That'd make > > > > things easier... > > > > > > I think the scope for conflict on our side is pretty high too, so a shared > > > branch might be the best way to go. I don't want to branch just yet though, > > > so I'll probably wait a week or so before setting something in stone. > > > > Any further thoughts on this? > > > > Christoffer has Acked the KVM bits, so if you're happy to do so for the > > arm64 bits I can make a stable branch. > > Looking around, it doesn't look like there's anything outside of arm64 > that'll conflict on the <asm/sysreg.h> changes, and git's happy to merge > my changes with Suzuki's changes currently queued in arm64's > for-next/core branch. > > I think it would make sense for those to be in a common branch taken by > both the arm64 and KVM trees, with the KVM-specific parts being taken by > KVM alone atop of that. > > Would everyone be happy with that? I'm happy with that. > > For reference, I've updated my branches so that arm64/common-sysreg only > contains the common parts, with the KVM parts atop of that in > kvm/common-sysreg. > Will, Catalin: Let me know if you're going to pull from common-sysreg and I'll do the same and add the kvm patches above. Thanks for preparing the patches. -Christoffer
next prev parent reply other threads:[~2017-03-28 20:27 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-09 17:07 [PATCH 00/15] arm64/kvm: use common sysreg definitions Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 01/15] arm64: sysreg: sort by encoding Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 02/15] arm64: sysreg: add debug system registers Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 03/15] arm64: sysreg: add performance monitor registers Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 04/15] arm64: sysreg: subsume GICv3 sysreg definitions Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 05/15] arm64: sysreg: add physical timer registers Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 06/15] arm64: sysreg: add register encodings used by KVM Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 07/15] arm64: sysreg: add Set/Way sys encodings Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 08/15] KVM: arm64: add SYS_DESC() Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 09/15] KVM: arm64: Use common debug sysreg definitions Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 10/15] KVM: arm64: Use common performance monitor " Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 11/15] KVM: arm64: Use common GICv3 " Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 12/15] KVM: arm64: Use common physical timer " Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 13/15] KVM: arm64: use common invariant " Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 14/15] KVM: arm64: Use common " Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-09 17:07 ` [PATCH 15/15] KVM: arm64: Use common Set/Way sys definitions Mark Rutland 2017-03-09 17:07 ` Mark Rutland 2017-03-10 8:17 ` [PATCH 00/15] arm64/kvm: use common sysreg definitions Marc Zyngier 2017-03-10 8:17 ` Marc Zyngier 2017-03-10 18:35 ` Will Deacon 2017-03-10 18:35 ` Will Deacon 2017-03-10 18:42 ` Mark Rutland 2017-03-10 18:42 ` Mark Rutland 2017-03-11 11:06 ` Marc Zyngier 2017-03-11 11:06 ` Marc Zyngier 2017-03-22 18:35 ` Mark Rutland 2017-03-22 18:35 ` Mark Rutland 2017-03-28 18:48 ` Mark Rutland 2017-03-28 18:48 ` Mark Rutland 2017-03-28 20:29 ` Christoffer Dall [this message] 2017-03-28 20:29 ` Christoffer Dall 2017-03-29 8:41 ` Will Deacon 2017-03-29 8:41 ` Will Deacon 2017-03-29 9:55 ` Mark Rutland 2017-03-29 9:55 ` Mark Rutland 2017-04-04 17:11 ` Catalin Marinas 2017-04-04 17:11 ` Catalin Marinas 2017-03-15 9:07 ` Christoffer Dall 2017-03-15 9:07 ` Christoffer Dall
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=20170328202931.GF20211@cbox \ --to=cdall@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=will.deacon@arm.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: linkBe 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.