[lkml]   [2010]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: [GIT PULL] stable/xen-pcifront-0.8.2 for 2.6.37
    On Thu, Oct 21, 2010 at 11:05:33AM -0400, Konrad Rzeszutek Wilk wrote:
    > Hello Linus,
    > Please pull from:
    > git:// stable/xen-pcifront-0.8.2
    > for patches since git commit 032fa36091a925f555158f4e80f8a09d951cdb10
    > Thomas Gleixner (1):
    > arm: Use ARCH_IRQ_INIT_FLAGS
    > [also known as "irq-core-for-linus"]. My patchset has been rebased on top of Thomas's
    > sparse_irq work, but if you prefer to have it based off your tree (v2.6.36-rc7),
    > there is stable/xen-pcifront-0.8.1 branch which has no sparse_irq work. If you
    > choose that route, the patch "x86: xen: Sanitse irq handling (part two)"
    > would have to be applied after tip/irq/core had been merged in after my patchset.
    > I can follow up with that patch if you would like.

    Since the sparse_irq rework has been merged, please do git pull


    branch and ignore the stable/xen-pcifront-0.8.1.

    Stephen found a contextual git merge error with the tree and the patch
    below fixes the issue. I can rebase the tree of your latest but I am pretty
    sure that is not the right way to do it, so I am leaving it as is. If however
    you would like me to rebase on top of your tree I can definitly do it.

    <begin copy-n-paste>
    Hi Konrad,

    Today's linux-next merge of the swiotlb-xen tree got a conflict in
    arch/x86/include/asm/io_apic.h between commit
    23f9b267159b4c7ff59d2e6c8ed31693eff841e3 ("x86: apic: Move
    probe_nr_irqs_gsi() into ioapic_init_mappings()") from the tip tree and
    commit 7b586d71858091f0958e5808b7e3d5390c2ae47d ("x86/io_apic: add
    get_nr_irqs_gsi()") from the swiotlb-xen tree.

    Just context changes. I fixed it up (see below) and can carry the fix as
    Stephen Rothwell

    diff --cc arch/x86/include/asm/io_apic.h
    index 240a0a5,a6b28d0..0000000
    --- a/arch/x86/include/asm/io_apic.h
    +++ b/arch/x86/include/asm/io_apic.h
    @@@ -168,6 -168,9 +168,8 @@@ extern int save_IO_APIC_setup(struct IO
    extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
    extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);

    -extern void probe_nr_irqs_gsi(void);
    + extern int get_nr_irqs_gsi(void);
    extern void setup_ioapic_ids_from_mpc(void);

    struct mp_ioapic_gsi{

    <end copy-n-paste>

     \ /
      Last update: 2010-10-26 16:59    [W:0.040 / U:12.512 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site