linux-next: manual merge of the akpm-current tree with the kvm tree

2015-12-17 Thread Stephen Rothwell
) from the kvm tree and commit: 7fd3f3e7c320 ("kvm: rename pfn_t to kvm_pfn_t") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/x8

linux-next: manual merge of the kvms390 tree with the kvm tree

2015-11-19 Thread Stephen Rothwell
ignal injection") 32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index") from the kvms390 tree. These patches used different names for the added function. I used the name from the kvm tree (kvm_get_vcpu_by_id). This also required the following merge patch: From

linux-next: manual merge of the kvm-arm tree with the kvm tree

2015-10-15 Thread Stephen Rothwell
_is_single_vcpu()") 8fc52eb9cee4 ("KVM: Add kvm_arch_vcpu_{un}blocking callbacks") from the kvm-arm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/x86/include/asm

Re: linux-next: Tree for Sep 10

2015-09-10 Thread Stephen Rothwell
Hi Christian, [cc'ing the current contacts] On Thu, 10 Sep 2015 10:05:01 +0200 Christian Borntraeger <borntrae...@de.ibm.com> wrote: > > Can you add > kvm@vger.kernel.org > for build failures of the kernel tree? Done. -- Cheers, Stephen Rothwells..

Re: Please add my kvm-ppc-next branch to linux-next

2015-09-08 Thread Stephen Rothwell
based if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PULL] virtio: virtio 1.0 support, misc patches

2014-12-11 Thread Stephen Rothwell
these patches through my tree. Rusty's on vacation, he acked using my tree for these, too. So, either none of this has been in linux-next or you have just rebased it all on top of v3.18 ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpuqQnbcDp5I.pgp Description: OpenPGP

Re: [PULL] virtio: virtio 1.0 support, misc patches

2014-12-11 Thread Stephen Rothwell
that these patches have been published and reviewed and tested, all I am saying is that they have not been in linux-next as those commits. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgplJ3pzj5ZEB.pgp Description: OpenPGP digital signature

Re: [GIT PULL] tree-wide: clean up no longer required #include linux/init.h

2014-02-06 Thread Stephen Rothwell
most of the changes in the last week have been trivial adding acks or dropping patches that maintainers decided to take themselves. Any thoughts on merging this? I can feel it bitrotting :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpLBzb9EX2uu.pgp Description: PGP

Re: [GIT PULL] tree-wide: clean up no longer required #include linux/init.h

2014-02-04 Thread Stephen Rothwell
in the mail along with the usual pull request message (I guess he should have put that bit at the top). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpCupBnQvITX.pgp Description: PGP signature

Re: [PATCH RFC 00/73] tree-wide: clean up some no longer required #include linux/init.h

2014-01-21 Thread Stephen Rothwell
to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating

Re: [PATCH] virtio: include asm/barrier explicitly

2013-07-07 Thread Stephen Rothwell
Hi Rusty, On Mon, 08 Jul 2013 11:31:45 +0930 Rusty Russell ru...@rustcorp.com.au wrote: PS. I'll squeeze these into this merge window, since they're trivial. s/'re trivial/fix bugs/ ;-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQCBOOsFabg.pgp Description

Re: [PATCH 3/8] vfio: add external user support

2013-06-27 Thread Stephen Rothwell
) + return -EINVAL; + + if (!atomic_inc_not_zero(group-container_users)) + return -EINVAL; + + return 0; +} +EXPORT_SYMBOL_GPL(vfio_group_add_external_user); You cannot EXPORT a static symbol ... The same through the rest of the file. -- Cheers, Stephen Rothwell

Re: [PATCH 3/8] vfio: add external user support

2013-06-27 Thread Stephen Rothwell
; + + BUG_ON(filep-f_op != vfio_group_fops); We usually reserve BUG_ON for situations where there is no way to continue running or continuing will corrupt the running kernel. Maybe WARN_ON() and return? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpPoxT1H0ADV.pgp Description

Re: [PATCH 3/8] vfio: add external user support

2013-06-27 Thread Stephen Rothwell
) + return -EINVAL; + + if (!atomic_inc_not_zero(group-container_users)) + return -EINVAL; + + return 0; +} +EXPORT_SYMBOL_GPL(vfio_group_add_external_user); You cannot EXPORT a static symbol ... The same through the rest of the file. -- Cheers, Stephen Rothwell

Re: [PATCH 3/8] vfio: add external user support

2013-06-27 Thread Stephen Rothwell
; + + BUG_ON(filep-f_op != vfio_group_fops); We usually reserve BUG_ON for situations where there is no way to continue running or continuing will corrupt the running kernel. Maybe WARN_ON() and return? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiQGEYh_pRZ.pgp Description

Re: [PATCH 3/6 v5] powerpc: export debug registers save function for KVM

2013-06-26 Thread Stephen Rothwell
guarding function declarations. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp_yJYfcoXUd.pgp Description: PGP signature

Re: [PATCH 3/6 v5] powerpc: export debug registers save function for KVM

2013-06-26 Thread Stephen Rothwell
guarding function declarations. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpkE_3z91GtM.pgp Description: PGP signature

Re: KVM/ARM in next

2013-04-21 Thread Stephen Rothwell
tree), * successfully unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au

Re: linux-next: Tree for Jan 25 (kvm)

2013-01-25 Thread Stephen Rothwell
, Stephen Rothwells...@canb.auug.org.au pgpItVwlZeuzC.pgp Description: PGP signature

Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-13 Thread Stephen Rothwell
Hi Linus, On Thu, 13 Dec 2012 14:22:34 -0800 Linus Torvalds torva...@linux-foundation.org wrote: On Wed, Dec 12, 2012 at 1:19 PM, Stephen Rothwell s...@canb.auug.org.au wrote: There is a section of this tree (the kvm-ppc tree in linux-next) that has been rebased before being merged

Re: [GIT PULL] KVM updates for the 3.8 merge window

2012-12-12 Thread Stephen Rothwell
been added on top of it :-(). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpHnXbejFQ3v.pgp Description: PGP signature

Re: [GIT PULL] VFIO updates for v3.8

2012-12-11 Thread Stephen Rothwell
-vfio.git tags/vfio-for-v3.8 for you to fetch changes up to a9e3ccfa452c8c5bac49637fe6ece1ac3246d312: vfio-pci: Enable device before attempting reset (2012-12-11 11:25:37 -0700) This has been rebased from what was in linux-next yesterday onto v3.7. -- Cheers, Stephen Rothwell

Re: [GIT PULL] VFIO updates for v3.8

2012-12-11 Thread Stephen Rothwell
a semantic conflict, in which case the fix could be supplied to Linus with the pull request, or a well changed logged back merge of Linus' tree containing the fix could be done and Linus asked to pull the result. -- Cheers, Stephen Rothwells...@canb.auug.org.au

Re: Linux-next changes for module and virtio trees.

2012-10-31 Thread Stephen Rothwell
Hi Rusty, On Wed, 31 Oct 2012 13:58:15 +1030 Rusty Russell ru...@rustcorp.com.au wrote: Stephen Rothwell s...@canb.auug.org.au writes: On Tue, 02 Oct 2012 15:56:56 +0930 Rusty Russell ru...@rustcorp.com.au wrote: Please remove my quilt tree http://ozlabs.org/~rusty/kernel

Re: Linux-next changes for module and virtio trees.

2012-10-02 Thread Stephen Rothwell
in these trees should have been merged by Linus during the merge window, so a merge of -rc1 or later should be a fast forward (though merging with the tag itself may produce a real merge). The second can be tricky to pick the right moment :-) -- Cheers, Stephen Rothwells

Re: qemu-kvm loops after kernel udpate

2012-09-18 Thread Stephen Rothwell
just wait for a new mmotm? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpurzS3znHG8.pgp Description: PGP signature

Re: qemu-kvm loops after kernel udpate

2012-09-18 Thread Stephen Rothwell
Hi Andrew, On Tue, 18 Sep 2012 17:20:29 -0700 Andrew Morton a...@linux-foundation.org wrote: On Wed, 19 Sep 2012 10:00:34 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: On Tue, 18 Sep 2012 12:46:46 -0700 Andrew Morton a...@linux-foundation.org wrote: hm, thanks

Re: [GIT PULL] KVM updates for the 3.6 merge window

2012-07-24 Thread Stephen Rothwell
follow up with Alex and send you the relevant patches if any. There was at least one, but Linus got it (I checked all the mentions of VCPU_GPR). His merge resolution matches the one that has been in linux-next for quite some time. -- Cheers, Stephen Rothwells...@canb.auug.org.au

Re: Request VFIO inclusion in linux-next

2012-06-26 Thread Stephen Rothwell
, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included

Re: [PATCH RFC] virtio-net: remove useless disable on freeze

2012-05-31 Thread Stephen Rothwell
... Davem's net tree (so presumably he will send it to Linus shortly) and Michael's vhost tree (is that tree needed any more?). Presumably it is now also in the rr tree? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpsAKJ5kzVVL.pgp Description: PGP signature

Re: linux-next: Tree for Sept 29 (kvm)

2011-09-29 Thread Stephen Rothwell
[Just cc'ing the kvm guys ] On Thu, 29 Sep 2011 12:50:24 -0700 Randy Dunlap rdun...@xenotime.net wrote: On 09/28/11 23:57, Stephen Rothwell wrote: Hi all, The linux-next tree is now available from git://github.com/sfrothwell/linux-next.git as a temporary measure while the kernel.org

Re: kvm linux-next tree

2011-09-27 Thread Stephen Rothwell
Hi Avi, On Tue, 27 Sep 2011 15:25:02 +0300 Avi Kivity a...@redhat.com wrote: Please add git://github.com/avikivity/kvm.git kvm-updates/3.2 to the linux-next collection, until kernel.org is back up. Thanks. I will switch to this tomorrow. -- Cheers, Stephen Rothwell

Re: [GIT PULL] KVM updates for the 2.6.37 merge window

2010-10-24 Thread Stephen Rothwell
not particularly picking on you, your tree just happened to strike me this morning ... there are many others. At least you also updated your linux-next branch so I won't have to cope with two slightly different versions and all the conflicts that causes :-)] -- Cheers, Stephen Rothwell

Re: [PATCH] [PPC] Add dequeue for external on BookE

2010-04-07 Thread Stephen Rothwell
. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpiHVmUvpI5v.pgp Description: PGP signature

Re: [PATCH 19/27] Export symbols for KVM module

2009-10-30 Thread Stephen Rothwell
this anyway, how about moving it into arch/powerpc/kernel/time.c where tb_ticks_per_jiffy is defined. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgp9GzKJo66J0.pgp Description: PGP signature

Re: [PATCH 20/27] Split init_new_context and destroy_context

2009-10-30 Thread Stephen Rothwell
(unsigned long id, pgd_t *pgd); #ifdef CONFIG_PPC_BOOK3S_64 +extern int __init_new_context(void); +extern void __destroy_context(int context_id); +#endif + +#ifdef CONFIG_PPC_BOOK3S_64 don't add the #endif/#ifdef pair ... -- Cheers, Stephen Rothwells

Re: [PATCH 20/27] Split init_new_context and destroy_context

2009-10-30 Thread Stephen Rothwell
(unsigned long id, pgd_t *pgd); #ifdef CONFIG_PPC_BOOK3S_64 +extern int __init_new_context(void); +extern void __destroy_context(int context_id); +#endif + +#ifdef CONFIG_PPC_BOOK3S_64 don't add the #endif/#ifdef pair ... -- Cheers, Stephen Rothwells

linux-next: tree build failure

2009-09-23 Thread Stephen Rothwell
8c87df457cb58fe75b9b893007917cf8095660a0 (BUILD_BUG_ON(): fix it and a couple of bogus uses of it). I applied the following patch for today. This inline function is only called from one place in one file ... From: Stephen Rothwell s...@canb.auug.org.au Date: Thu, 24 Sep 2009 15:13:20 +1000 Subject: [PATCH

Re: New kvm.git branch for linux-next

2009-09-09 Thread Stephen Rothwell
bisectability. (this is actually a symbolic ref to kvm-updates/2.6.32 which will be updated when kvm-updates/2.6.33 is created) That sounds great. I have changed over starting from today. Thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr

[PATCH] powerpc/kvm: fix some init/exit annotations

2009-06-01 Thread Stephen Rothwell
the function kvmppc_booke_exit() has valid usage outside the exit section and the fix is to remove the __exit annotation of kvmppc_booke_exit. Also add some __init annotations on obvious routines. Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- arch/powerpc/kvm/44x.c |4 ++-- arch/powerpc

[PATCH] powerpc/kvm: fix some init/exit annotations

2009-06-01 Thread Stephen Rothwell
the function kvmppc_booke_exit() has valid usage outside the exit section and the fix is to remove the __exit annotation of kvmppc_booke_exit. Also add some __init annotations on obvious routines. Signed-off-by: Stephen Rothwell s...@canb.auug.org.au --- arch/powerpc/kvm/44x.c |4 ++-- arch/powerpc

linux-next: kvm tree build failure

2008-12-18 Thread Stephen Rothwell
problem.) I have reverted the kvm tree for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpiBM252L09F.pgp Description: PGP signature