linux-next: rr series import failure

linux-next: rr series import failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2089 bytes --]

Hi Rusty,

Today's linux-next import of the rr quilt series failed like this:

Importing rr based on rr_cpumask/master
$ git checkout quilt/rr
Switched to branch "quilt/rr"
$ git reset --hard 7be7585393d311866653564fbcd10a3232773c0b
HEAD is now at 7be7585 cpumask: Use all NR_CPUS bits unless CONFIG_CPUMASK_OFFSTACK
$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr
cpumask:smp_call_function_many-up-fix.patch
virtio:pci_queue_allocation_not_page_aligned.patch
virtio:struct_device_replace_bus_id_with_dev_name_dev_set_name.patch
virtio:VIRTIO_PCI_QUEUE_ADDR_SHIFT.patch
virtio:rename-vring-pagesize-to-align.patch
virtio:VIRTIO_PCI_VRING_ALIGN.patch
virtio:LGUEST_VRING_ALIGN.patch
virtio:KVM_S390_VIRTIO_RING_ALIGN.patch
virtio:virtqueue-hand-in-vqalign.patch
virtio:balloon_avoid_Linux_page_size.patch
virtio:block-no-max-segment-size-by-default.patch
virtio:block-dynamic-max-segments.patch
virtio:blk_fix_type_warning.patch
virtio:net_large_tx_mtu_support.patch
virtio:console_support_console_resizing.patch
virtio:kvm_s390_implement_config_changed_for_on_s390.patch
/home/sfr/kernels/next/next/.git/rebase-apply/patch:19: space before tab in indent.
 	subcode = S390_lowcore.cpu_addr;
warning: 1 line adds whitespace errors.
lguest:move_the_initial_guest_page_table_creation_code_to_the_host.patch
module:remove_config_kmod.patch
Context reduced to (2/2) to apply fragment at 909
module:compare-sym-values-for-export-mark-in-proc-kallsyms.patch
module:print_unload_info-no-proc.patch
bitmap:test-for-constant.patch
6cc88bc4.patch
cpumask:for_each_cpu-in-cpumask.h.patch
cpumask:cpu_online_mask-etc-as-primary.patch
cpumask:convert-cpumask.h.patch
cpumask:out-of-line-accessors.patch
cpumask:add_sysfs_displays_for_configured_and_disabled_cpu_maps.patch
error: patch failed: arch/x86/kernel/smpboot.c:1293
error: arch/x86/kernel/smpboot.c: patch does not apply

So I have dropped it for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: rr series import failure

[Mike Travis]

...
> cpumask:add_sysfs_displays_for_configured_and_disabled_cpu_maps.patch
> error: patch failed: arch/x86/kernel/smpboot.c:1293
> error: arch/x86/kernel/smpboot.c: patch does not apply
> 
> So I have dropped it for today.

Hi Stephen,

This is my fault.  I should have pulled the x86 only file
to a patch for tip/cpus4096.  Rusty - do you want to do this
in your rr queue?

(Ingo - this will be another "dependency" patch needed by tips/cpus4096.)

Thanks,
Mike

Re: linux-next: rr series import failure

[Rusty Russell]

On Thursday 18 December 2008 10:57:25 Mike Travis wrote:
> > cpumask:add_sysfs_displays_for_configured_and_disabled_cpu_maps.patch
> Rusty - do you want to do this in your rr queue?

Once Greg's happy and Ack'ed, and we've run it through normal tests, I'll
put it in the cpumask git tree and Ingo can simply merge it from there.

Thanks,
Rusty.

Re: linux-next: rr series import failure

[Ingo Molnar]

* Rusty Russell <rusty@rustcorp.com.au> wrote:

> On Thursday 18 December 2008 10:57:25 Mike Travis wrote:
> > > cpumask:add_sysfs_displays_for_configured_and_disabled_cpu_maps.patch
> > Rusty - do you want to do this in your rr queue?
> 
> Once Greg's happy and Ack'ed, and we've run it through normal tests, 
> I'll put it in the cpumask git tree and Ingo can simply merge it from 
> there.
> 
> Thanks,
> Rusty.

perfect, thanks Rusty!

	Ingo

Re: linux-next: rr series import failure

[Rusty Russell]

On Thursday 18 December 2008 10:20:19 Stephen Rothwell wrote:
> Hi Rusty,
...
> cpumask:add_sysfs_displays_for_configured_and_disabled_cpu_maps.patch
> error: patch failed: arch/x86/kernel/smpboot.c:1293
> error: arch/x86/kernel/smpboot.c: patch does not apply

Ah, yes, it needs a prereq which I didn't include.  Mike is polishing
this at Greg's behest anyway, so I'll leave it for the moment.

(Mike, in future the x86 part of this patch, even though it's a 1-liner,
should probably be a separate patch).

Thanks,
Rusty.