From: Stephen Rothwell <sfr@canb.auug.org.au> To: Marcelo Tosatti <mtosatti@redhat.com>, Gleb Natapov <gleb@kernel.org>, <kvm@vger.kernel.org>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, <linuxppc-dev@lists.ozlabs.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>, Kevin Hao <haokexin@gmail.com> Subject: linux-next: manual merge of the kvm tree with the powerpc tree Date: Thu, 21 Jul 2016 14:37:56 +1000 [thread overview] Message-ID: <20160721143756.1d24c16f@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/powerpc/kernel/Makefile between commit: 27d114966735 ("powerpc/32: Remove RELOCATABLE_PPC32") from the powerpc tree and commit: fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt") from the kvm 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. -- Cheers, Stephen Rothwell diff --cc arch/powerpc/kernel/Makefile index 62df36c3f138,6972a23433d3..000000000000 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@@ -46,7 -41,8 +46,7 @@@ obj-$(CONFIG_VDSO32) += vdso32 obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o - obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o + obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o hmi.o -obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Marcelo Tosatti <mtosatti@redhat.com>, Gleb Natapov <gleb@kernel.org>, kvm@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, linuxppc-dev@lists.ozlabs.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>, Kevin Hao <haokexin@gmail.com> Subject: linux-next: manual merge of the kvm tree with the powerpc tree Date: Thu, 21 Jul 2016 14:37:56 +1000 [thread overview] Message-ID: <20160721143756.1d24c16f@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/powerpc/kernel/Makefile between commit: 27d114966735 ("powerpc/32: Remove RELOCATABLE_PPC32") from the powerpc tree and commit: fd7bacbca47a ("KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt") from the kvm 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. -- Cheers, Stephen Rothwell diff --cc arch/powerpc/kernel/Makefile index 62df36c3f138,6972a23433d3..000000000000 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@@ -46,7 -41,8 +46,7 @@@ obj-$(CONFIG_VDSO32) += vdso32 obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o - obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o + obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o hmi.o -obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o
next reply other threads:[~2016-07-21 4:38 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-21 4:37 Stephen Rothwell [this message] 2016-07-21 4:37 ` linux-next: manual merge of the kvm tree with the powerpc tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2021-06-22 5:25 Stephen Rothwell 2021-06-22 5:25 ` Stephen Rothwell 2021-06-22 6:23 ` Paolo Bonzini 2021-06-22 6:23 ` Paolo Bonzini 2021-06-22 14:51 ` Michael Ellerman 2021-06-22 14:51 ` Michael Ellerman 2021-06-22 16:52 ` Paolo Bonzini 2021-06-22 16:52 ` Paolo Bonzini 2018-12-21 5:16 Stephen Rothwell 2018-12-21 5:16 ` Stephen Rothwell 2017-02-15 2:38 Stephen Rothwell 2017-02-15 10:52 ` Michael Ellerman 2017-02-14 3:20 Stephen Rothwell 2017-02-14 3:16 Stephen Rothwell 2017-02-14 3:12 Stephen Rothwell 2017-02-10 3:59 Stephen Rothwell 2017-02-10 10:06 ` Paolo Bonzini 2017-02-10 10:06 ` Paolo Bonzini 2017-02-14 8:45 ` Michael Ellerman 2017-02-14 13:34 ` Paolo Bonzini 2017-02-14 13:34 ` Paolo Bonzini 2017-02-15 11:16 ` Michael Ellerman 2017-02-15 11:28 ` Paolo Bonzini 2017-02-10 3:47 Stephen Rothwell 2016-07-18 5:55 Stephen Rothwell 2016-07-18 5:55 ` Stephen Rothwell 2016-07-18 5:54 Stephen Rothwell 2016-07-18 5:54 ` Stephen Rothwell 2016-03-04 4:30 Stephen Rothwell 2016-03-04 4:30 ` Stephen Rothwell
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=20160721143756.1d24c16f@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=benh@kernel.crashing.org \ --cc=gleb@kernel.org \ --cc=haokexin@gmail.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mahesh@linux.vnet.ibm.com \ --cc=mpe@ellerman.id.au \ --cc=mtosatti@redhat.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.