Skip to content
Commits on Dec 24, 2009
  1. @torvalds

    Linux 2.6.33-rc2

    torvalds committed Dec 24, 2009
  2. @torvalds

    Merge branch 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/ak/linux-misc-2.6
    
    * 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6:
      SYSCTL: Add a mutex to the page_alloc zone order sysctl
      SYSCTL: Print binary sysctl warnings (nearly) only once
    torvalds committed Dec 24, 2009
  3. @torvalds

    Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/ak/linux-mce-2.6
    
    * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
      HWPOISON: Add PROC_FS dependency to hwpoison injector v2
    torvalds committed Dec 24, 2009
  4. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
      classmate-laptop: add support for Classmate PC ACPI devices
      hp-wmi: Fix two memleaks
      acer-wmi, msi-wmi: Remove needless DMI MODULE_ALIAS
      dell-wmi: do not keep driver loaded on unsupported boxes
      wmi: Free the allocated acpi objects through wmi_get_event_data
      drivers/platform/x86/acerhdf.c: check BIOS information whether it begins with string of table
      acerhdf: add new BIOS versions
      acerhdf: limit modalias matching to supported
      toshiba_acpi: convert to seq_file
      asus_acpi: convert to seq_file
      ACPI: do not select ACPI_DOCK from ATA_ACPI
      sony-laptop: enumerate rfkill devices using SN06
      sony-laptop: rfkill support for newer models
      ACPI: fix OSC regression that caused aer and pciehp not to load
      MAINTAINERS: add maintainer for msi-wmi driver
      fujitu-laptop: fix tests of acpi_evaluate_integer() return value
      arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c: avoid cross-CPU interrupts by using smp_call_function_any()
      ACPI: processor: remove _PDC object list from struct acpi_processor
      ACPI: processor: change acpi_processor_set_pdc() interface
      ACPI: processor: open code acpi_processor_cleanup_pdc
      ...
    torvalds committed Dec 24, 2009
  5. @torvalds

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/k…

    …ernel/git/jlbec/ocfs2
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
      ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c
      ocfs2/trivial: Use proper mask for 2 places in hearbeat.c
      Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.
      Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode?
      ocfs2: Use FIEMAP_EXTENT_SHARED
      fiemap: Add new extent flag FIEMAP_EXTENT_SHARED
      ocfs2: replace u8 by __u8 in ocfs2_fs.h
      ocfs2: explicit declare uninitialized var in user_cluster_connect()
      ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock()
      ocfs2: return -EAGAIN instead of EAGAIN in dlm
      ocfs2/cluster: Make fence method configurable - v2
      ocfs2: Set MS_POSIXACL on remount
      ocfs2: Make acl use the default
      ocfs2: Always include ACL support
    torvalds committed Dec 24, 2009
  6. @torvalds

    Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
      VIDEO: cyberpro: pci_request_regions needs a persistent name
      ARM: dma-isa: request cascade channel after registering it
      ARM: footbridge: trim down old ISA rtc setup
      ARM: fix PAGE_KERNEL
      ARM: Fix wrong shared bit for CPU write buffer bug test
      ARM: 5857/1: ARM: dmabounce: fix build
      ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
      ARM: 5855/1: putc support for nuc900
      ARM: 5854/1: fix compiling error for NUC900
      ARM: 5849/1: ARMv7: fix Oprofile events count
      ARM: add missing include to nwflash.c
      ARM: Kill CONFIG_CPU_32
      ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
      ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
    torvalds committed Dec 24, 2009
  7. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/bp/bp
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
      edac, pci: remove pesky debug printk
      amd64_edac: restrict PCI config space access
      amd64_edac: fix forcing module load/unload
      amd64_edac: make driver loading more robust
      amd64_edac: fix driver instance freeing
      amd64_edac: fix K8 chip select reporting
    torvalds committed Dec 24, 2009
  8. @torvalds

    Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/lethal/sh-2.6
    
    * 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
      sh: Ensure all PG_dcache_dirty pages are written back.
      sh: mach-ecovec24: setup.c detailed correction
      serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.
      serial: sh-sci: earlyprintk zero uartclk fix
      sh: Only use bl bit toggling for sleeping idle.
      sh: Restore bl bit toggling in idle loop.
      sh: Fix up MAX_DMA_CHANNELS definition when DMA is disabled.
      sh: dmaengine support for SH7785
      sh: dmaengine support for sh7724.
    torvalds committed Dec 24, 2009
  9. VIDEO: cyberpro: pci_request_regions needs a persistent name

    Don't pass a name pointer from the kernel stack, it will not survive
    and will result in corrupted /proc/iomem output.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Dec 24, 2009
  10. ARM: dma-isa: request cascade channel after registering it

    We can't request the cascade channel before it's been registered, so
    move it afterwards.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Dec 24, 2009
  11. ARM: footbridge: trim down old ISA rtc setup

    This fixes a "start_kernel(): bug: interrupts were enabled early".
    
    rtc_cmos now takes care of initializing the ISA RTC and reading the
    current time and date from it; there's no need to repeat that here,
    thereby causing interrupts to be enabled too early.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Dec 24, 2009
  12. ARM: fix PAGE_KERNEL

    PAGE_KERNEL should not be executable; any area marked executable can
    be prefetched into the instruction cache.  We don't want vmalloc areas
    to be read in this way.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Dec 24, 2009
  13. edac, pci: remove pesky debug printk

    Do not spam the logs needlessly with the sole info that
    edac_pci_dev_parity_clear is being called.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  14. amd64_edac: restrict PCI config space access

    Do not access F2x19[0,4] on K8 since they're undefined there.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  15. amd64_edac: fix forcing module load/unload

    Clear the override flag after force-loading the module.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  16. amd64_edac: make driver loading more robust

    Currently, the module does not initialize fully when the DIMMs aren't
    ECC but remains still loaded. Propagate the error when no instance of
    the driver is properly initialized and prevent further loading.
    
    Reorganize and polish error handling in amd64_edac_init() while at it.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  17. amd64_edac: fix driver instance freeing

    Fix use-after-free errors by pushing all memory-freeing calls to the end
    of amd64_remove_one_instance().
    
    Reported-by: Darren Jenkins <darrenrjenkins@gmail.com>
    LKML-Reference: <1261370306.11354.52.camel@ICE-BOX>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  18. amd64_edac: fix K8 chip select reporting

    Fix the case when amd64_debug_display_dimm_sizes() reports only half the
    amount of DRAM on it because it doesn't account for when the single DCT
    operates in 128-bit mode and merges chip selects from different DIMMs.
    
    Reported-by: Johannes Hirte <johannes.hirte@fem.tu-ilmenau.de>
    LKML-Reference: <200912112202.48173.johannes.hirte@fem.tu-ilmenau.de>
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Borislav Petkov committed Dec 21, 2009
  19. @lenb
  20. @lenb
  21. @lenb

    Merge branch 'sony' into release

    lenb committed Dec 24, 2009
  22. @lenb
  23. @lenb

    Merge branch 'pdc' into release

    lenb committed Dec 24, 2009
  24. @lenb
  25. @lenb

    Merge branch 'osc' into release

    lenb committed Dec 24, 2009
  26. @lenb

    classmate-laptop: add support for Classmate PC ACPI devices

    This add supports for devices like keyboard, backlight, tablet and
    accelerometer.
    
    This work is supported by International Syst S/A.
    
    [randy.dunlap@oracle.com: cmpc_acpi: depends on ACPI]
    [akpm@linux-foundation.org: readability tweaks]
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Thadeu Lima de Souza Cascardo committed with lenb Dec 21, 2009
  27. Merge branch 'sh/g3-prep' into sh/for-2.6.33

    Paul Mundt committed Dec 24, 2009
  28. sh: Ensure all PG_dcache_dirty pages are written back.

    With some of the cache rework an address aliasing optimization was added,
    but this managed to fail on certain mappings resulting in pages with
    PG_dcache_dirty set never writing back their dcache lines. This patch
    reverts to the earlier behaviour of simply always writing back when the
    dirty bit is set.
    
    Signed-off-by: Markus Pietrek <Markus.Pietrek@emtrion.de>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Markus Pietrek committed with Paul Mundt Dec 24, 2009
  29. sh: mach-ecovec24: setup.c detailed correction

    o remove unused define
    o add device name comment
    
    Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Kuninori Morimoto committed with Paul Mundt Dec 24, 2009
  30. @watologo1 @lenb

    hp-wmi: Fix two memleaks

    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
    watologo1 committed with lenb Dec 18, 2009
  31. serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.

    ctrl_xxx() is an antiquated SH interface, while __raw_xxx is the standard
    API that accomplishes the same thing. As such, this converts the
    remaining sh-sci straggles over, which enables the driver to be wired up
    for ARM SH-Mobile CPUs as well.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Paul Mundt committed Dec 24, 2009
  32. serial: sh-sci: earlyprintk zero uartclk fix

    This establishes a sensible max baud rate for the earlyprintk cases where
    the port's uartclk has not yet been determined.
    
    Signed-off-by: Magnus Damm <damm@opensource.se>
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Magnus Damm committed with Paul Mundt Dec 22, 2009
  33. @watologo1 @lenb

    acer-wmi, msi-wmi: Remove needless DMI MODULE_ALIAS

    Now that we have WMI autoloading
    the DMI matching is not needed anymore.
    
    Signed-off-by: Thomas Renninger <trenn@suse.de>
    Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Acked-by: Anisse Astier <anisse@astier.eu>
    Signed-off-by: Len Brown <len.brown@intel.com>
    watologo1 committed with lenb Dec 18, 2009
  34. @dtor @lenb

    dell-wmi: do not keep driver loaded on unsupported boxes

    There is no point in having the driver loaded in memory if we fail
    to locate particular WMI GUID.
    
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Acked-by: Matthew Garrett <mjg@redhat.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    dtor committed with lenb Dec 17, 2009
  35. @anisse @lenb

    wmi: Free the allocated acpi objects through wmi_get_event_data

    These function allocate an acpi object by calling wmi_get_event_data, which
    then calls acpi_evaluate_object, and it is not freed afterwards.
    
    And kernel doc is fixed for parameters of wmi_get_event_data.
    
    Signed-off-by: Anisse Astier <anisse@astier.eu>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
    Signed-off-by: Len Brown <len.brown@intel.com>
    anisse committed with lenb Dec 4, 2009
Something went wrong with that request. Please try again.