13 Jan, 2010

1 commit

  • In 65f63384 "xen: improve error handling in do_suspend" I said:
    - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not
    nested in the obvious way.
    and changed the ordering of the calls as so:
    BEFORE AFTER
    xs_suspend dpm_suspend_noirq
    dpm_suspend_noirq xs_suspend
    *SUSPEND* *SUSPEND*
    dpm_resume_noirq dpm_resume_noirq
    xs_resume xs_resume
    Clearly this is not an improvement and I was talking rubbish.

    In particular the new ordering is susceptible to a hang if a xenstore write is
    in progress at the point at which the suspend kicks in. When the suspend
    process calls xs_suspend it tries to take the request_mutex but if a write is
    in progress it could be looping in xenbus_xs.c:read_reply() waiting for
    something to arrive on &xs_state.reply_list while holding the request_mutex
    (taken in the caller of read_reply).

    However if we have done dpm_suspend_noirq before xs_suspend then we won't get
    any more xenstore interrupts and process_msg() will never be woken up to add
    anything to the reply_list.

    Fix this by calling xs_suspend before dpm_suspend_noirq. If dpm_suspend_noirq
    fails then make sure we go through the xs_suspend_cancel() code path.

    Signed-off-by: Ian Campbell
    Acked-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Ian Campbell
     

12 Dec, 2009

1 commit

  • * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (109 commits)
    PCI: fix coding style issue in pci_save_state()
    PCI: add pci_request_acs
    PCI: fix BUG_ON triggered by logical PCIe root port removal
    PCI: remove ifdefed pci_cleanup_aer_correct_error_status
    PCI: unconditionally clear AER uncorr status register during cleanup
    x86/PCI: claim SR-IOV BARs in pcibios_allocate_resource
    PCI: portdrv: remove redundant definitions
    PCI: portdrv: remove unnecessary struct pcie_port_data
    PCI: portdrv: minor cleanup for pcie_port_device_register
    PCI: portdrv: add missing irq cleanup
    PCI: portdrv: enable device before irq initialization
    PCI: portdrv: cleanup service irqs initialization
    PCI: portdrv: check capabilities first
    PCI: portdrv: move PME capability check
    PCI: portdrv: remove redundant pcie type calculation
    PCI: portdrv: cleanup pcie_device registration
    PCI: portdrv: remove redundant pcie_port_device_probe
    PCI: Always set prefetchable base/limit upper32 registers
    PCI: read-modify-write the pcie device control register when initiating pcie flr
    PCI: show dma_mask bits in /sys
    ...

    Fixed up conflicts in:
    arch/x86/kernel/amd_iommu_init.c
    drivers/pci/dmar.c
    drivers/pci/hotplug/acpiphp_glue.c

    Linus Torvalds
     

11 Dec, 2009

1 commit

  • * 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
    xen: try harder to balloon up under memory pressure.
    Xen balloon: fix totalram_pages counting.
    xen: explicitly create/destroy stop_machine workqueues outside suspend/resume region.
    xen: improve error handling in do_suspend.
    xen: don't leak IRQs over suspend/resume.
    xen: call clock resume notifier on all CPUs
    xen: use iret for return from 64b kernel to 32b usermode
    xen: don't call dpm_resume_noirq() with interrupts disabled.
    xen: register runstate info for boot CPU early
    xen: register runstate on secondary CPUs
    xen: register timer interrupt with IRQF_TIMER
    xen: correctly restore pfn_to_mfn_list_list after resume
    xen: restore runstate_info even if !have_vcpu_info_placement
    xen: re-register runstate area earlier on resume.
    xen: wait up to 5 minutes for device connetion
    xen: improvement to wait_for_devices()
    xen: fix is_disconnected_device/exists_disconnected_device
    xen/xenbus: make DEVICE_ATTR()s static

    Linus Torvalds
     

05 Dec, 2009

2 commits

  • Currently if the balloon driver is unable to increase the guest's
    reservation it assumes the failure was due to reaching its full
    allocation, gives up on the ballooning operation and records the limit
    it reached as the "hard limit". The driver will not try again until
    the target is set again (even to the same value).

    However it is possible that ballooning has in fact failed due to
    memory pressure in the host and therefore it is desirable to keep
    attempting to reach the target in case memory becomes available. The
    most likely scenario is that some guests are ballooning down while
    others are ballooning up and therefore there is temporary memory
    pressure while things stabilise. You would not expect a well behaved
    toolstack to ask a domain to balloon to more than its allocation nor
    would you expect it to deliberately over-commit memory by setting
    balloon targets which exceed the total host memory.

    This patch drops the concept of a hard limit and causes the balloon
    driver to retry increasing the reservation on a timer in the same
    manner as when decreasing the reservation.

    Also if we partially succeed in increasing the reservation
    (i.e. receive less pages than we asked for) then we may as well keep
    those pages rather than returning them to Xen.

    Signed-off-by: Ian Campbell
    Cc: Stable Kernel

    Ian Campbell
     
  • Change totalram_pages when a single page is added/removed to the
    ballooned list. This avoid totalram_pages to be set erroneously to
    max_pfn at boot.

    Signed-off-by: Gianluca Guida
    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Gianluca Guida
     

04 Dec, 2009

8 commits

  • I have observed cases where the implicit stop_machine_destroy() done by
    stop_machine() hangs while destroying the workqueues, specifically in
    kthread_stop(). This seems to be because timer ticks are not restarted
    until after stop_machine() returns.

    Fortunately stop_machine provides a facility to pre-create/post-destroy
    the workqueues so use this to ensure that workqueues are only destroyed
    after everything is really up and running again.

    I only actually observed this failure with 2.6.30. It seems that newer
    kernels are somehow more robust against doing kthread_stop() without timer
    interrupts (I tried some backports of some likely looking candidates but
    did not track down the commit which added this robustness). However this
    change seems like a reasonable belt&braces thing to do.

    Signed-off-by: Ian Campbell
    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Ian Campbell
     
  • The existing error handling has a few issues:
    - If freeze_processes() fails it exits with shutting_down = SHUTDOWN_SUSPEND.
    - If dpm_suspend_noirq() fails it exits without resuming xenbus.
    - If stop_machine() fails it exits without resuming xenbus or calling
    dpm_resume_end().
    - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not
    nested in the obvious way.

    Fix by ensuring each failure case goto's the correct label. Treat a failure of
    stop_machine() as a cancelled suspend in order to follow the correct resume
    path.

    Signed-off-by: Ian Campbell
    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Ian Campbell
     
  • On resume irq_info[*].evtchn is reset to 0 since event channel mappings
    are not preserved over suspend/resume. The other contents of irq_info
    is preserved to allow rebind_evtchn_irq() to function.

    However when a device resumes it will try to unbind from the
    previous IRQ (e.g. blkfront goes blkfront_resume() -> blkif_free() ->
    unbind_from_irqhandler() -> unbind_from_irq()). This will fail due to the
    check for VALID_EVTCHN in unbind_from_irq() and the IRQ is leaked. The
    device will then continue to resume and allocate a new IRQ, eventually
    leading to find_unbound_irq() panic()ing.

    Fix this by changing unbind_from_irq() to handle teardown of interrupts
    which have type!=IRQT_UNBOUND but are not currently bound to a specific
    event channel.

    Signed-off-by: Ian Campbell
    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Ian Campbell
     
  • dpm_resume_noirq() takes a mutex, so it can't be called from a no-interrupt
    context. Don't call it from within the stop-machine function, but just
    afterwards, since we're resuming anyway, regardless of what happened.

    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Jeremy Fitzhardinge
     
  • Increases the device timeout from 10s to 5 minutes, giving the user a
    visual indication during that time in case there are problems. The patch
    is a backport of changesets 144 and 150 in the Xenbits tree.

    Cc: Jeremy Fitzhardinge
    Signed-off-by: Paolo Bonzini
    Signed-off-by: Jeremy Fitzhardinge

    Paolo Bonzini
     
  • When printing a warning about a timed-out device, print the
    current state of both ends of the device connection (i.e., backend as
    well as frontend). This backports half of changeset 146 from the
    Xenbits tree.

    Cc: Jeremy Fitzhardinge
    Signed-off-by: Paolo Bonzini
    Signed-off-by: Jeremy Fitzhardinge

    Paolo Bonzini
     
  • The logic of is_disconnected_device/exists_disconnected_device is wrong
    in that they are used to test whether a device is trying to connect (i.e.
    connecting). For this reason the patch fixes them to not consider a
    Closing or Closed device to be connecting. At the same time the patch
    also renames the functions according to what they really do; you could
    say a closed device is "disconnected" (the old name), but not "connecting"
    (the new name).

    This patch is a backport of changeset 909 from the Xenbits tree.

    Cc: Jeremy Fitzhardinge
    Signed-off-by: Paolo Bonzini
    Signed-off-by: Jeremy Fitzhardinge

    Paolo Bonzini
     
  • They don't need to be global, and may cause linker clashes.

    Signed-off-by: Jeremy Fitzhardinge
    Cc: Stable Kernel

    Jeremy Fitzhardinge
     

05 Nov, 2009

1 commit


04 Nov, 2009

1 commit


05 Oct, 2009

1 commit


22 Sep, 2009

2 commits

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
    trivial: fix typo in aic7xxx comment
    trivial: fix comment typo in drivers/ata/pata_hpt37x.c
    trivial: typo in kernel-parameters.txt
    trivial: fix typo in tracing documentation
    trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c
    trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c
    trivial: remove unnecessary semicolons
    trivial: Fix duplicated word "options" in comment
    trivial: kbuild: remove extraneous blank line after declaration of usage()
    trivial: improve help text for mm debug config options
    trivial: doc: hpfall: accept disk device to unload as argument
    trivial: doc: hpfall: reduce risk that hpfall can do harm
    trivial: SubmittingPatches: Fix reference to renumbered step
    trivial: fix typos "man[ae]g?ment" -> "management"
    trivial: media/video/cx88: add __init/__exit macros to cx88 drivers
    trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
    trivial: fix missing printk space in amd_k7_smp_check
    trivial: fix typo s/ketymap/keymap/ in comment
    trivial: fix typo "to to" in multiple files
    trivial: fix typos in comments s/DGBU/DBGU/
    ...

    Linus Torvalds
     
  • Sizing of memory allocations shouldn't depend on the number of physical
    pages found in a system, as that generally includes (perhaps a huge amount
    of) non-RAM pages. The amount of what actually is usable as storage
    should instead be used as a basis here.

    Some of the calculations (i.e. those not intending to use high memory)
    should likely even use (totalram_pages - totalhigh_pages).

    Signed-off-by: Jan Beulich
    Acked-by: Rusty Russell
    Acked-by: Ingo Molnar
    Cc: Dave Airlie
    Cc: Kyle McMartin
    Cc: Jeremy Fitzhardinge
    Cc: Pekka Enberg
    Cc: Hugh Dickins
    Cc: "David S. Miller"
    Cc: Patrick McHardy
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jan Beulich
     

21 Sep, 2009

1 commit


20 Sep, 2009

1 commit


16 Sep, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)
    powerpc64: convert to dynamic percpu allocator
    sparc64: use embedding percpu first chunk allocator
    percpu: kill lpage first chunk allocator
    x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA
    percpu: update embedding first chunk allocator to handle sparse units
    percpu: use group information to allocate vmap areas sparsely
    vmalloc: implement pcpu_get_vm_areas()
    vmalloc: separate out insert_vmalloc_vm()
    percpu: add chunk->base_addr
    percpu: add pcpu_unit_offsets[]
    percpu: introduce pcpu_alloc_info and pcpu_group_info
    percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward
    percpu: add @align to pcpu_fc_alloc_fn_t
    percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()
    percpu: drop @static_size from first chunk allocators
    percpu: generalize first chunk allocator selection
    percpu: build first chunk allocators selectively
    percpu: rename 4k first chunk allocator to page
    percpu: improve boot messages
    percpu: fix pcpu_reclaim() locking
    ...

    Fix trivial conflict as by Tejun Heo in kernel/sched.c

    Linus Torvalds
     

10 Sep, 2009

1 commit

  • -fstack-protector uses a special per-cpu "stack canary" value.
    gcc generates special code in each function to test the canary to make
    sure that the function's stack hasn't been overrun.

    On x86-64, this is simply an offset of %gs, which is the usual per-cpu
    base segment register, so setting it up simply requires loading %gs's
    base as normal.

    On i386, the stack protector segment is %gs (rather than the usual kernel
    percpu %fs segment register). This requires setting up the full kernel
    GDT and then loading %gs accordingly. We also need to make sure %gs is
    initialized when bringing up secondary cpus too.

    To keep things consistent, we do the full GDT/segment register setup on
    both architectures.

    Because we need to avoid -fstack-protected code before setting up the GDT
    and because there's no way to disable it on a per-function basis, several
    files need to have stack-protector inhibited.

    [ Impact: allow Xen booting with stack-protector enabled ]

    Signed-off-by: Jeremy Fitzhardinge

    Jeremy Fitzhardinge
     

14 Aug, 2009

1 commit

  • Conflicts:
    arch/sparc/kernel/smp_64.c
    arch/x86/kernel/cpu/perf_counter.c
    arch/x86/kernel/setup_percpu.c
    drivers/cpufreq/cpufreq_ondemand.c
    mm/percpu.c

    Conflicts in core and arch percpu codes are mostly from commit
    ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
    num_possible_cpus() with nr_cpu_ids. As for-next branch has moved all
    the first chunk allocators into mm/percpu.c, the changes are moved
    from arch code to mm/percpu.c.

    Signed-off-by: Tejun Heo

    Tejun Heo
     

01 Jul, 2009

1 commit

  • The init_IRQ() function is now called with slab allocator initialized.
    Therefore, we must not use the bootmem allocator in xen_init_IRQ().

    Fixes the following boot-time warning:

    ------------[ cut here ]------------
    WARNING: at mm/bootmem.c:535 alloc_arch_preferred_bootmem+0x27/0x45()
    Modules linked in:
    Pid: 0, comm: swapper Not tainted 2.6.30 #1
    Call Trace:
    [] ? warn_slowpath_common+0x73/0xb0
    [] ? pvclock_clocksource_read+0x49/0x90
    [] ? alloc_arch_preferred_bootmem+0x27/0x45
    [] ? ___alloc_bootmem_nopanic+0x39/0xc9
    [] ? ___alloc_bootmem+0x9/0x2f
    [] ? xen_init_IRQ+0x25/0x61
    [] ? start_kernel+0x1b5/0x29e
    ---[ end trace 4eaa2a86a8e2da22 ]---

    Acked-by: Jeremy Fitzhardinge
    Tested-by: Christian Kujau
    Reported-by: Christian Kujau
    Signed-off-by: Pekka Enberg
    Cc: lists@nerdbynature.de
    Cc: jeremy.fitzhardinge@citrix.com
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Pekka Enberg
     

24 Jun, 2009

2 commits

  • Percpu variable definition is about to be updated such that all percpu
    symbols including the static ones must be unique. Update percpu
    variable definitions accordingly.

    * as,cfq: rename ioc_count uniquely

    * cpufreq: rename cpu_dbs_info uniquely

    * xen: move nesting_count out of xen_evtchn_do_upcall() and rename it

    * mm: move ratelimits out of balance_dirty_pages_ratelimited_nr() and
    rename it

    * ipv4,6: rename cookie_scratch uniquely

    * x86 perf_counter: rename prev_left to pmc_prev_left, irq_entry to
    pmc_irq_entry and nmi_entry to pmc_nmi_entry

    * perf_counter: rename disable_count to perf_disable_count

    * ftrace: rename test_event_disable to ftrace_test_event_disable

    * kmemleak: rename test_pointer to kmemleak_test_pointer

    * mce: rename next_interval to mce_next_interval

    [ Impact: percpu usage cleanups, no duplicate static percpu var names ]

    Signed-off-by: Tejun Heo
    Reviewed-by: Christoph Lameter
    Cc: Ivan Kokshaysky
    Cc: Jens Axboe
    Cc: Dave Jones
    Cc: Jeremy Fitzhardinge
    Cc: linux-mm
    Cc: David S. Miller
    Cc: Peter Zijlstra
    Cc: Steven Rostedt
    Cc: Li Zefan
    Cc: Catalin Marinas
    Cc: Andi Kleen

    Tejun Heo
     
  • Currently, the following three different ways to define percpu arrays
    are in use.

    1. DEFINE_PER_CPU(elem_type[array_len], array_name);
    2. DEFINE_PER_CPU(elem_type, array_name[array_len]);
    3. DEFINE_PER_CPU(elem_type, array_name)[array_len];

    Unify to #1 which correctly separates the roles of the two parameters
    and thus allows more flexibility in the way percpu variables are
    defined.

    [ Impact: cleanup ]

    Signed-off-by: Tejun Heo
    Reviewed-by: Christoph Lameter
    Cc: Ingo Molnar
    Cc: Tony Luck
    Cc: Benjamin Herrenschmidt
    Cc: Thomas Gleixner
    Cc: Jeremy Fitzhardinge
    Cc: linux-mm@kvack.org
    Cc: Christoph Lameter
    Cc: David S. Miller

    Tejun Heo
     

13 Jun, 2009

2 commits

  • This patch (as1241) renames a bunch of functions in the PM core.
    Rather than go through a boring list of name changes, suffice it to
    say that in the end we have a bunch of pairs of functions:

    device_resume_noirq dpm_resume_noirq
    device_resume dpm_resume
    device_complete dpm_complete
    device_suspend_noirq dpm_suspend_noirq
    device_suspend dpm_suspend
    device_prepare dpm_prepare

    in which device_X does the X operation on a single device and dpm_X
    invokes device_X for all devices in the dpm_list.

    In addition, the old dpm_power_up and device_resume_noirq have been
    combined into a single function (dpm_resume_noirq).

    Lastly, dpm_suspend_start and dpm_resume_end are the renamed versions
    of the former top-level device_suspend and device_resume routines.

    Signed-off-by: Alan Stern
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Alan Stern
     
  • Rename the functions performing "_noirq" dev_pm_ops
    operations from device_power_down() and device_power_up()
    to device_suspend_noirq() and device_resume_noirq().

    The new function names are chosen to show that the functions
    are responsible for calling the _noirq() versions to finalize
    the suspend/resume operation. The current function names do
    not perform power down/up anymore so the names may be misleading.

    Global function renames:
    - device_power_down() -> device_suspend_noirq()
    - device_power_up() -> device_resume_noirq()

    Static function renames:
    - suspend_device_noirq() -> __device_suspend_noirq()
    - resume_device_noirq() -> __device_resume_noirq()

    Signed-off-by: Magnus Damm
    Acked-by: Greg Kroah-Hartman
    Acked-by: Len Brown
    Signed-off-by: Rafael J. Wysocki

    Magnus Damm
     

11 Jun, 2009

1 commit

  • * 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (42 commits)
    xen: cache cr0 value to avoid trap'n'emulate for read_cr0
    xen/x86-64: clean up warnings about IST-using traps
    xen/x86-64: fix breakpoints and hardware watchpoints
    xen: reserve Xen start_info rather than e820 reserving
    xen: add FIX_TEXT_POKE to fixmap
    lguest: update lazy mmu changes to match lguest's use of kvm hypercalls
    xen: honour VCPU availability on boot
    xen: add "capabilities" file
    xen: drop kexec bits from /sys/hypervisor since kexec isn't implemented yet
    xen/sys/hypervisor: change writable_pt to features
    xen: add /sys/hypervisor support
    xen/xenbus: export xenbus_dev_changed
    xen: use device model for suspending xenbus devices
    xen: remove suspend_cancel hook
    xen/dev-evtchn: clean up locking in evtchn
    xen: export ioctl headers to userspace
    xen: add /dev/xen/evtchn driver
    xen: add irq_from_evtchn
    xen: clean up gate trap/interrupt constants
    xen: set _PAGE_NX in __supported_pte_mask before pagetable construction
    ...

    Linus Torvalds
     

12 May, 2009

1 commit


08 May, 2009

1 commit

  • Conflicts:
    arch/frv/include/asm/pgtable.h
    arch/x86/include/asm/required-features.h
    arch/x86/xen/mmu.c

    Merge reason: x86/xen was on a .29 base still, move it to a fresher
    branch and pick up Xen fixes as well, plus resolve
    conflicts

    Signed-off-by: Ingo Molnar

    Ingo Molnar
     

06 May, 2009

1 commit


28 Apr, 2009

2 commits

  • This simplifies the node awareness of the code. All our allocators
    only deal with a NUMA node ID locality not with CPU ids anyway - so
    there's no need to maintain (and transform) a CPU id all across the
    IRq layer.

    v2: keep move_irq_desc related

    [ Impact: cleanup, prepare IRQ code to be NUMA-aware ]

    Signed-off-by: Yinghai Lu
    Cc: Andrew Morton
    Cc: Suresh Siddha
    Cc: "Eric W. Biederman"
    Cc: Rusty Russell
    Cc: Jeremy Fitzhardinge
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Yinghai Lu
     
  • according to Ingo, change set_affinity() in irq_chip should return int,
    because that way we can handle failure cases in a much cleaner way, in
    the genirq layer.

    v2: fix two typos

    [ Impact: extend API ]

    Signed-off-by: Yinghai Lu
    Cc: Andrew Morton
    Cc: Suresh Siddha
    Cc: "Eric W. Biederman"
    Cc: Rusty Russell
    Cc: linux-arch@vger.kernel.org
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Yinghai Lu
     

09 Apr, 2009

2 commits

  • If a VM is booted with offline VCPUs then unplug them during boot. Determining
    the availability of a VCPU requires access to XenStore which is not available
    at the point smp_prepare_cpus() is called, therefore we bring up all VCPUS
    initially and unplug the offline ones as soon as XenStore becomes available.

    Signed-off-by: Ian Campbell

    Ian Campbell
     
  • Impact: bugfix Xen domain restore

    Otherwise the first timer interrupt after resume is missed and we never
    get another.

    Signed-off-by: Ian Campbell
    Signed-off-by: Jeremy Fitzhardinge

    Ian Campbell
     

08 Apr, 2009

2 commits

  • * commit 'origin/master': (4825 commits)
    Fix build errors due to CONFIG_BRANCH_TRACER=y
    parport: Use the PCI IRQ if offered
    tty: jsm cleanups
    Adjust path to gpio headers
    KGDB_SERIAL_CONSOLE check for module
    Change KCONFIG name
    tty: Blackin CTS/RTS
    Change hardware flow control from poll to interrupt driven
    Add support for the MAX3100 SPI UART.
    lanana: assign a device name and numbering for MAX3100
    serqt: initial clean up pass for tty side
    tty: Use the generic RS485 ioctl on CRIS
    tty: Correct inline types for tty_driver_kref_get()
    splice: fix deadlock in splicing to file
    nilfs2: support nanosecond timestamp
    nilfs2: introduce secondary super block
    nilfs2: simplify handling of active state of segments
    nilfs2: mark minor flag for checkpoint created by internal operation
    nilfs2: clean up sketch file
    nilfs2: super block operations fix endian bug
    ...

    Conflicts:
    arch/x86/include/asm/thread_info.h
    arch/x86/lguest/boot.c
    drivers/xen/manage.c

    Jeremy Fitzhardinge
     
  • * for-linus/xen/core:
    xen: honour VCPU availability on boot

    Jeremy Fitzhardinge
     

06 Apr, 2009

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: (36 commits)
    cpumask: remove cpumask allocation from idle_balance, fix
    numa, cpumask: move numa_node_id default implementation to topology.h, fix
    cpumask: remove cpumask allocation from idle_balance
    x86: cpumask: x86 mmio-mod.c use cpumask_var_t for downed_cpus
    x86: cpumask: update 32-bit APM not to mug current->cpus_allowed
    x86: microcode: cleanup
    x86: cpumask: use work_on_cpu in arch/x86/kernel/microcode_core.c
    cpumask: fix CONFIG_CPUMASK_OFFSTACK=y cpu hotunplug crash
    numa, cpumask: move numa_node_id default implementation to topology.h
    cpumask: convert node_to_cpumask_map[] to cpumask_var_t
    cpumask: remove x86 cpumask_t uses.
    cpumask: use cpumask_var_t in uv_flush_tlb_others.
    cpumask: remove cpumask_t assignment from vector_allocation_domain()
    cpumask: make Xen use the new operators.
    cpumask: clean up summit's send_IPI functions
    cpumask: use new cpumask functions throughout x86
    x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask
    cpumask: convert struct cpuinfo_x86's llc_shared_map to cpumask_var_t
    cpumask: convert node_to_cpumask_map[] to cpumask_var_t
    x86: unify 32 and 64-bit node_to_cpumask_map
    ...

    Linus Torvalds
     

04 Apr, 2009

1 commit

  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
    trivial: Update my email address
    trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
    trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
    trivial: Fix misspelling of "Celsius".
    trivial: remove unused variable 'path' in alloc_file()
    trivial: fix a pdlfush -> pdflush typo in comment
    trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
    trivial: wusb: Storage class should be before const qualifier
    trivial: drivers/char/bsr.c: Storage class should be before const qualifier
    trivial: h8300: Storage class should be before const qualifier
    trivial: fix where cgroup documentation is not correctly referred to
    trivial: Give the right path in Documentation example
    trivial: MTD: remove EOL from MODULE_DESCRIPTION
    trivial: Fix typo in bio_split()'s documentation
    trivial: PWM: fix of #endif comment
    trivial: fix typos/grammar errors in Kconfig texts
    trivial: Fix misspelling of firmware
    trivial: cgroups: documentation typo and spelling corrections
    trivial: Update contact info for Jochen Hein
    trivial: fix typo "resgister" -> "register"
    ...

    Linus Torvalds