Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.36-rc1
Commits on Aug 16, 2010
  1. Linus Torvalds

    Linux 2.6.36-rc1

    torvalds authored
  2. Linus Torvalds

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

    torvalds authored
    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      gcc-4.6: ACPI: fix unused but set variables in ACPI
      ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
      ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
      ACPI processor: remove deprecated ACPI procfs I/F
      ACPI power_resource: remove unused procfs I/F
      ACPI: remove deprecated ACPI procfs I/F
      ACPI: introduce drivers/acpi/sysfs.c
      ACPI: introduce module parameter acpi.aml_debug_output
      ACPI: introduce drivers/acpi/debugfs.c
      ACPI, APEI, ERST debug support
      ACPI, APEI, Manage GHES as platform devices
      ACPI, APEI, Rename CPER and GHES severity constants
      ACPI, APEI, Fix a typo of error path of apei_resources_request
      ACPI / ACPICA: Fix reference counting problems with GPE handlers
      ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
      ACPI / Sleep: Drop acpi_suspend_finish()
      ACPI / Sleep: Consolidate suspend and hibernation routines
      ACPI / Wakeup: Simplify enabling of wakeup devices
      ACPI / Sleep: Rework enabling wakeup devices
      ACPI / Sleep: Free NVS copy if suspending of devices fails
    
    Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
    patch that doesn't even compile in the merge.
    
    Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
    breakage before I even pulled.  And a big "Grrr.." at Len for not even
    bothering to compile the tree before asking me to pull.
  3. Linus Torvalds

    Merge git://git.infradead.org/iommu-2.6

    torvalds authored
    * git://git.infradead.org/iommu-2.6:
      intel-iommu: Fix 32-bit build warning with __cmpxchg()
      intr-remap: allow disabling source id checking
  4. Linus Torvalds

    Merge git://git.infradead.org/mtd-2.6

    torvalds authored
    * git://git.infradead.org/mtd-2.6:
      mtd/nand_ids: Fix buswidth
      mtd/m25p80: fix test for end of loop
      mtd/m25p80: retlen is never NULL
      MIPS: Fix gen_nand probe structures contents
      gen_nand: Test if nr_chips field is valid
      BFIN: Fix gen_nand probe structures contents
      nand/denali: move all hardware initialization work to denali_hw_init
      nand/denali: Add a page check in denali_read_page & denali_read_page_raw
      nand/denali: use cpu_relax() while waiting for hardware interrupt
      nand/denali: change read_status function method
      nand/denali: Fixed check patch warnings
      ARM: Fix gen_nand probe structures contents
      mtd/nand_base: fix kernel-doc warnings & typos
      nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk
      nand/denali: Fixed handle ECC error bugs
      nand/denali: use iowrite32() to replace denali_write32()
      nand/denali: Fixed probe function bugs
  5. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
      arch/tile: don't validate CROSS_COMPILE needlessly
      arch/tile: export only COMMAND_LINE_SIZE to userspace.
      arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
      arch/tile: Rename the hweight() implementations to __arch_hweight()
      arch/tile: extend syscall ABI to set r1 on return as well.
      arch/tile: Various cleanups.
      arch/tile: support backtracing on TILE-Gx
      arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx.
      arch/tile: Use separate, better minsec values for clocksource and sched_clock.
      arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.
      arch: tile: mm: pgtable.c: Removed duplicated #include
      arch: tile: kernel/proc.c Removed duplicated #include
      Add fanotify syscalls to <asm-generic/unistd.h>.
      arch/tile: support new kunmap_atomic() naming convention.
      tile: remove unused ISA_DMA_THRESHOLD define
    
    Conflicts in arch/tile/configs/tile_defconfig (pick the mainline version
    with the reduced defconfig).
Commits on Aug 15, 2010
  1. cmetcalf-tilera

    arch/tile: don't validate CROSS_COMPILE needlessly

    cmetcalf-tilera authored
    With this change, the arch/tile Makefile will only check for a valid
    combination of CROSS_COMPILE vs "uname -m" for a few common targets
    that are typically the ones we get wrong (vmlinux, all, and modules).
    The change handles the case of an empty "make" goal like "make all".
    
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
  2. Linus Torvalds

    mm: fix up some user-visible effects of the stack guard page

    torvalds authored
    This commit makes the stack guard page somewhat less visible to user
    space. It does this by:
    
     - not showing the guard page in /proc/<pid>/maps
    
       It looks like lvm-tools will actually read /proc/self/maps to figure
       out where all its mappings are, and effectively do a specialized
       "mlockall()" in user space.  By not showing the guard page as part of
       the mapping (by just adding PAGE_SIZE to the start for grows-up
       pages), lvm-tools ends up not being aware of it.
    
     - by also teaching the _real_ mlock() functionality not to try to lock
       the guard page.
    
       That would just expand the mapping down to create a new guard page,
       so there really is no point in trying to lock it in place.
    
    It would perhaps be nice to show the guard page specially in
    /proc/<pid>/maps (or at least mark grow-down segments some way), but
    let's not open ourselves up to more breakage by user space from programs
    that depends on the exact deails of the 'maps' file.
    
    Special thanks to Henrique de Moraes Holschuh for diving into lvm-tools
    source code to see what was going on with the whole new warning.
    
    Reported-and-tested-by: François Valenduc <francois.valenduc@tvcablenet.be
    Reported-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Linus Torvalds

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

    torvalds authored
    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: sound/usb/format: silence uninitialized variable warnings
      MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices
      MAINTAINERS: Make Wolfson entry also cover CODEC drivers
      ASoC: Only tweak WM8994 chip configuration on devices up to rev D
      ASoC: Optimise DSP performance for WM8994
      ALSA: hda - Fix dynamic ADC change working again
      ALSA: hda - Restrict PCM parameters per ELD information over HDMI
      sound: oss: sh_dac_audio.c removed duplicated #include
  4. Linus Torvalds

    Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/lenb/linux-idle-2.6
    
    * 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
      intel_idle: recognize Lincroft Atom Processor
      intel_idle: no longer EXPERIMENTAL
      intel_idle: disable module support
      intel_idle: add support for Westmere-EX
      intel_idle: delete power_policy modparam, and choose substate functions
      intel_idle: delete substates DEBUG modparam
  5. cmetcalf-tilera

    arch/tile: export only COMMAND_LINE_SIZE to userspace.

    cmetcalf-tilera authored
    This fixes a failure in "make headers_check" for tile.
    I hadn't realized this file was exported to userspace by default.
    
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  6. cmetcalf-tilera

    arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN

    cmetcalf-tilera authored
    See commit a6eb9fe.
    
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
  7. Takashi Iwai
  8. Takashi Iwai
  9. Dan Carpenter Takashi Iwai

    ALSA: sound/usb/format: silence uninitialized variable warnings

    error27 authored tiwai committed
    Gcc complains that ret might be used uninitialized:
    
    sound/usb/format.c: In function ‘snd_usb_parse_audio_format’:
    sound/usb/format.c:354: warning: ‘ret’ may be used uninitialized in this function
    sound/usb/format.c:354: note: ‘ret’ was declared here
    sound/usb/format.c:414: warning: ‘ret’ may be used uninitialized in this function
    sound/usb/format.c:414: note: ‘ret’ was declared here
    
    I suppose it could be uninitialized if there is ever a UAC_VERSION_3
    released. Anyway this patch is worthwhile if only to silence the gcc
    warning.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Daniel Mack <daniel@caiaq.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
  10. Len Brown

    Merge branch 'linus' into release

    lenb authored
    Conflicts:
    	drivers/acpi/debug.c
    
    Signed-off-by: Len Brown <len.brown@intel.com>
  11. Len Brown

    gcc-4.6: ACPI: fix unused but set variables in ACPI

    Andi Kleen authored lenb committed
    Some minor improvements in error handling, but overall it was mostly dead
    code.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Len Brown <len.brown@intel.com>
  12. zhang-rui Len Brown

    ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS

    zhang-rui authored lenb committed
    Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/
    is already available and has been working for years w/o any problem.
    
    The ACPI thermal procfs I/F will be removed in 2.6.37.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  13. zhang-rui Len Brown

    ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS

    zhang-rui authored lenb committed
    Mark ACPI video driver procfs I/F deprecated, including:
    /proc/acpi/video/*/info
    /proc/acpi/video/*/DOS
    /proc/acpi/video/*/ROM
    /proc/acpi/video/*/POST
    /proc/acpi/video/*/POST_info
    /proc/acpi/video/*/*/info
    /proc/acpi/video/*/*/state
    /proc/acpi/video/*/*/EDID
    and
    /proc/acpi/video/*/*/brightness, because
    1. we already have the sysfs I/F /sysclass/backlight/ as the replacement
    of /proc/acpi/video/*/*/brightness.
    2. the other procfs I/F is not useful for userspace.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  14. zhang-rui Len Brown

    ACPI processor: remove deprecated ACPI procfs I/F

    zhang-rui authored lenb committed
    Remove deprecated ACPI processor procfs I/F, including:
    /proc/acpi/processor/CPUX/power
    /proc/acpi/processor/CPUX/limit
    /proc/acpi/processor/CPUX/info
    
    /proc/acpi/processor/CPUX/throttling still exists,
    as we don't have sysfs I/F available for now.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  15. zhang-rui Len Brown

    ACPI power_resource: remove unused procfs I/F

    zhang-rui authored lenb committed
    Remove unused ACPI power procfs I/F.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  16. zhang-rui Len Brown

    ACPI: remove deprecated ACPI procfs I/F

    zhang-rui authored lenb committed
    Rmove deprecated ACPI procfs I/F, including
    /proc/acpi/debug_layer
    /proc/acpi/debug_level
    /proc/acpi/info
    /proc/acpi/dsdt
    /proc/acpi/fadt
    /proc/acpi/sleep
    
    because the sysfs I/F is already available
    and has been working well for years.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  17. zhang-rui Len Brown

    ACPI: introduce drivers/acpi/sysfs.c

    zhang-rui authored lenb committed
    Introduce drivers/acpi/sysfs.c.
    
    code for ACPI sysfs I/F, including
    #ifdef ACPI_DEBUG
    /sys/module/acpi/parameters/debug_layer
    /sys/module/acpi/parameters/debug_level
    /sys/module/acpi/parameters/trace_method_name
    /sys/module/acpi/parameters/trace_debug_layer
    /sys/module/acpi/parameters/trace_debug_level
    /sys/module/acpi/parameters/trace_state
    #endif
    /sys/module/acpi/parameters/acpica_version
    /sys/firmware/acpi/tables/
    /sys/firmware/acpi/interrupts/
    is moved to this file.
    
    No function change in this patch.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  18. Len Brown
  19. Len Brown
  20. Len Brown
  21. Len Brown

    Merge branch 'apei' into release

    lenb authored
  22. Len Brown

    Merge branch 'nvs' into release

    lenb authored
  23. zhang-rui Len Brown

    ACPI: introduce module parameter acpi.aml_debug_output

    zhang-rui authored lenb committed
    Introduce module parameter acpi.aml_debug_output.
    
    With acpi.aml_debug_output set, we can get AML debug object output
    (Store (AAA, Debug)), even with CONFIG_ACPI_DEBUG cleared.
    
    Together with the runtime custom method mechanism,
    we can debug AML code problems without rebuilding the kernel.
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  24. zhang-rui Len Brown

    ACPI: introduce drivers/acpi/debugfs.c

    zhang-rui authored lenb committed
    Introduce drivers/acpi/debugfs.c.
    
    Code for ACPI debugfs I/F,
    i.e. /sys/kernel/debug/acpi/custom_method,
    is moved to this file.
    
    And make ACPI debugfs always built in,
    even if CONFIG_ACPI_DEBUG is cleared.
    
    BTW:this adds about 400bytes code to ACPI, when
    CONFIG_ACPI_DEBUG is cleared.
    
    [uaccess.h build fix from Andrew Morton <akpm@linux-foundation.org>]
    
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  25. fenrus75 Len Brown

    intel_idle: recognize Lincroft Atom Processor

    fenrus75 authored lenb committed
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
  26. Len Brown

    ACPI, APEI, ERST debug support

    Huang Ying authored lenb committed
    This patch adds debugging/testing support to ERST. A misc device is
    implemented to export raw ERST read/write/clear etc operations to user
    space. With this patch, we can add ERST testing support to
    linuxfirmwarekit ISO (linuxfirmwarekit.org) to verify the kernel
    support and the firmware implementation.
    
    Signed-off-by: Huang Ying <ying.huang@intel.com>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
Commits on Aug 14, 2010
  1. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
      defconfig reduction
      kbuild: drop unifdef-y support
      archs: replace unifdef-y with header-y
      include: replace unifdef-y with header-y
  2. Linus Torvalds

    fusion: add function parameter names to kernel-doc

    Randy Dunlap authored torvalds committed
    Fix fusion missing kernel-doc:
    
      Warning(drivers/message/fusion/mptbase.c:649): No description found for parameter 'func_name'
      Warning(drivers/message/fusion/mptbase.c:8010): No description found for parameter 'cb_idx'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Linus Torvalds

    fs/dcache: fix function param name in kernel-doc

    Randy Dunlap authored torvalds committed
    Fix parameter name in kernel-doc notation (causes a warning).
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. Linus Torvalds

    fusion: fix non-kernel-doc comment block

    Randy Dunlap authored torvalds committed
    Fix comment begin notation not to look like kernel-doc
    since it's not.  Removes kernel-doc warnings.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.