Skip to content
Commits on Aug 29, 2011
  1. @torvalds

    Linux 3.1-rc4

    torvalds committed
Commits on Aug 28, 2011
  1. @torvalds

    Merge branch 'pm-fixes' of git://…

    torvalds committed
    * 'pm-fixes' of git://
      ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)
      OMAP: omap_device: only override _noirq methods, not normal suspend/resume
      PM / Runtime: Correct documentation of pm_runtime_irq_safe()
      ARM: mach-shmobile: sh7372 LCDC1 suspend fix
      sh-sci / PM: Use power.irq_safe
      PM: Use spinlock instead of mutex in clock management functions
Commits on Aug 27, 2011
  1. @torvalds

    Merge branch 'fixes' of git://…

    torvalds committed
    * 'fixes' of git://
      firewire: sbp2: fix panic after rmmod with slow targets
  2. @rjwysocki

    ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)

    Magnus Damm committed with rjwysocki
    This patch updates the recently submitted
    "Associate the HDMI clock together with LCDC1 on sh7372"
    to V2 with the following change:
     - Use lcdc1_device on AP4EVB to build properly.
    Signed-off-by: Magnus Damm <>
    Signed-off-by: Rafael J. Wysocki <>
Commits on Aug 26, 2011
  1. @neilbrown @torvalds

    All Arch: remove linkage for sys_nfsservctl system call

    neilbrown committed with torvalds
    The nfsservctl system call is now gone, so we should remove all
    linkage for it.
    Signed-off-by: NeilBrown <>
    Signed-off-by: J. Bruce Fields <>
    Signed-off-by: Linus Torvalds <>
  2. @torvalds

    Merge branch 'drm-intel-fixes' of git://…

    torvalds committed
    * 'drm-intel-fixes' of git://
      drm/i915: Fix wrong initializer for "locked" variable in assert_panel_unlocked
      i915: do not setup intel_backlight twice
  3. @torvalds

    Merge branch 'usb-linus' of git://…

    torvalds committed
    * 'usb-linus' of git:// (30 commits)
      USB: ftdi_sio: add Calao reference board support
      USB option driver K3765/K4505 avoid CDC_DATA interface
      USB: option: add YUGA device id to driver
      usb: s5p-ehci: fix a NULL pointer deference
      USB: EHCI: Do not rely on PORT_SUSPEND to stop USB resuming in ehci_bus_resume().
      USB option driver add PID of Huawei Vodafone K4605
      USB option driver add PID of Huawei Vodafone K3806
      xhci: Handle zero-length isochronous packets.
      USB: Avoid NULL pointer deref in usb_hcd_alloc_bandwidth.
      usb: musb: gadget: fix error path
      usb: gadget: f_phonet: unlock in error case
      usb: musb: blackfin: include prefetch head file
      usb: musb: tusb6010: fix compilation
      usb: gadget: renesas_usbhs: fix DMA build by including dma-mapping.h
      usb: musb: cppi: fix build errors due to DBG and missing musb variable
      usb: musb: ux500: replace missing DBG with dev_dbg
      usb: musb: ux500: set dma config for both src and dst
      usb: musb: fix oops on musb_gadget_pullup
      usb: host: ehci-omap: fix .remove and failure handling path of .probe(v1)
      usb: gadget: hid: don't STALL when processing a HID Descriptor request
  4. @torvalds

    Merge branch 'tty-linus' of git://…

    torvalds committed
    * 'tty-linus' of git://
      omap-serial: Allow IXON and IXOFF to be disabled.
      TTY: serial, document ignoring of uart->ops->startup error
      TTY: pty, fix pty counting
      8250: Fix race condition in serial8250_backup_timeout().
      serial/8250_pci: delete duplicate data definition
      8250_pci: add support for Rosewill RC-305 4x serial port card
      tty: Add "spi:" prefix for spi modalias
      atmel_serial: fix atmel_default_console_device
      serial: 8250_pnp: add Intermec CV60 touchscreen device
      drivers/serial/ucc_uart.c: Fix compiler warning
      pch_uart: Set PCIe bus number using probe parameter
      serial: samsung: Fix build error
  5. @torvalds

    Merge branch 'driver-core-linus' of git://…

    torvalds committed
    * 'driver-core-linus' of git://
      drivers:misc: ti-st: fix unexpected UART close
      drivers:misc: ti-st: free skb on firmware download
      drivers:misc: ti-st: wait for completion at fail
      drivers:misc: ti-st: reinit completion before send
      drivers:misc: ti-st: fail-safe on wrong pkt type
      drivers:misc: ti-st: reinit completion on ver read
      drivers:misc:ti-st: platform hooks for chip states
      drivers:misc: ti-st: avoid a misleading dbg msg
      base/devres.c: quiet sparse noise about context imbalance
      pti: add missing CONFIG_PCI dependency
      drivers/base/devtmpfs.c: correct annotation of `setup_done'
      driver core: fix kernel-doc warning in platform.c
      firmware: fix google/gsmi.c build warning
  6. @torvalds

    Merge branch 'staging-linus' of git://…

    torvalds committed
    * 'staging-linus' of git://
      staging: tidspbridge: fix compilation on dsp clock functions
      staging: octeon-ethernet: Add missing #includes.
      Staging: zcache: signedness bug in tmem_get()
      staging: zcache: fix crash on high memory swap
      staging: brcm80211: SPARC build error fix
      staging: brcm80211: fix compile error on non-x86 archs since 3.0 kernel
  7. @torvalds

    Merge branch 'for-linus' of git://

    torvalds committed
    * 'for-linus' of git://
      [S390] memory hotplug: only unassign assigned increments
      [S390] Change default action from reipl to stop for on_restart
      [S390] arch/s390/kernel/ipl.c: correct error detection check
      [S390] drivers/s390/block/dasd_ioctl.c: add missing kfree
      [S390] nss,initrd: kernel image and initrd must be in different segments
  8. @torvalds

    sfi: table irq 0xFF means 'no interrupt'

    Kirill A. Shutemov committed with torvalds
    According to the SFI specification irq number 0xFF means device has no
    interrupt or interrupt attached via GPIO.
    Currently, we don't handle this special case and set irq field in
    *_board_info structs to 255.  It leads to confusion in some drivers.
    Accelerometer driver tries to register interrupt 255, fails and prints
    "Cannot get IRQ" to dmesg.
    Signed-off-by: Kirill A. Shutemov <>
    Signed-off-by: Alan Cox <>
    Signed-off-by: Linus Torvalds <>
  9. @torvalds

    Merge branch 'for-linus' of git://…

    torvalds committed
    * 'for-linus' of git:// (32 commits)
      ALSA: hda: Conexant: Allow different output types to share DAC
      ASoC: Correct element count for WM8996 sidetone HPF
      ASoC: Tegra: wm8903 machine driver: Drop Ventana support
      ASoC: Add samsung maintainer
      ASoC: Add Springbank I/O card to Speyside Kconfig
      ALSA: hda/conexant - Enable ADC-switching for auto-mic mode, too
      ALSA: hda - Fix double-headphone/speaker paths for Cxt auto-parser
      ALSA: hda - Update jack-sense info even when no automute is set
      ALSA: hda - Fix output-path initialization for Realtek auto-parser
      sound/soc/fsl/mpc8610_hpcd.c: add missing of_node_put
      sound/soc/fsl/p1022_ds.c: add missing of_node_put
      sound/soc/ep93xx/ep93xx-i2s.c: add missing kfree
      sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree
      ASoC: soc-core: use GFP_KERNEL flag for kmalloc in snd_soc_cnew
      sound/soc/fsl/fsl_dma.c: add missing of_node_put
      ASoC: Clear completions from late WM8996 FLL lock IRQs
      ASoC: Clear any outstanding WM8962 FLL lock completions before waiting
      ASoC: Ensure we only run Speyside WM8962 bias level callbacks once
      ASoC: Fix configuration of WM8996 input enables
      ASoC: WM8996 record paths need AIFCLK
  10. @tiwai
  11. @torvalds

    arch/powerpc/sysdev/fsl_rio.c: correct IECSR register clear value

    Liu Gang-B34182 committed with torvalds
    This bug causes the IECSR register clear failure.  In this case, the RETE
    (retry error threshold exceeded) interrupt will be generated and cannot be
    cleared.  So the related ISR may be called persistently.
    The RETE bit in IECSR is cleared by writing a 1 to it.
    Signed-off-by: Liu Gang <>
    Cc: Benjamin Herrenschmidt <>
    Cc: Kumar Gala <>
    Cc: <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  12. @myungjoo @torvalds

    drivers/rtc/rtc-s3c.c: allow multiple open / allow no-ioctl-open'ed r…

    myungjoo committed with torvalds
    …tc to have irq.
    The previous rtc-s3c had two issues related with its IRQ.
    1. Users cannot open rtc multiple times because an open operation
       calls request_irq on the same IRQ.  (e.g., two user processes wants to
       open and read RTC time from rtc-s3c at the same time)
    2. If alarm is set and no one has the rtc opened with filesystem
       (either the alarm is set by kernel/boot-loader or user set an alarm and
       closed rtc dev file), the pending bit is not cleared and no further
       interrupt is invoked.  When the alarm is used by the system itself such
       as a resume from suspend-to-RAM or other Low-power modes/idle, this is
       a critical issue.
    This patch mitigates these issues by calling request_irq at probe and
    free_irq at remove.
    Signed-off-by: MyungJoo Ham <>
    Signed-off-by: Kyungmin Park <>
    Acked-by: Kukjin Kim <>
    Cc: Alessandro Zummo <>
    Cc: Changhwan Youn <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  13. @myungjoo @torvalds

    drivers/rtc/rtc-s3c.c: correct debug messages

    myungjoo committed with torvalds
    RTC-S3C used to print out debug messages incorrectly.  This patch
    corrects incorrect outputs.  (undecoded bcd numbers, incorrectly decoded
    register values)
    This patch affects the pr-debug messages only.
    Signed-off-by: MyungJoo Ham <>
    Signed-off-by: Kyungmin Park <>
    Acked-by: Kukjin Kim <>
    Cc: Alessandro Zummo <>
    Cc: Changhwan Youn <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
Commits on Aug 25, 2011
  1. @AxelLin @torvalds

    drivers/leds/leds-bd2802.c: bd2802_unregister_led_classdev() should u…

    AxelLin committed with torvalds
    …nregister all registered leds
    bd2802_unregister_led_classdev() should unregister all registered
    instances of led_classdev class that had registered by
    Signed-off-by: Axel Lin <>
    Acked-by: Kim Kyuwon <>
    Cc: Richard Purdie <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  2. @congwang @torvalds

    cris: add arch/cris/include/asm/serial.h

    congwang committed with torvalds
    Fix the following build errors:
      drivers/tty/serial/8250_early.c:160: error: 'BASE_BAUD' undeclared (first use in this function): 1 errors in 1 logs
      drivers/tty/serial/8250_early.c:37:24: error: asm/serial.h: No such file or directory: 1 errors in 1 logs
    I am not sure if (1843200 / 16) is suitable for cris, but most other
    arch's define it as this value.
    Signed-off-by: WANG Cong <>
    Cc: Mikael Starvik <>
    Cc: Jesper Nilsson <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  3. @AxelLin @torvalds

    drivers/misc/ab8500-pwm.c: fix modalias

    AxelLin committed with torvalds
    Since 43cc71e ("platform: prefix MODALIAS with "platform:""), the
    platform modalias is prefixed with "platform:".
    This patch changes the MODULE_ALIAS to "platform:ab8500-pwm".
    Signed-off-by: Axel Lin <>
    Acked-by: Arun Murthy <>
    Cc: Linus Walleij <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  4. @AxelLin @torvalds

    drivers/misc/fsa9480.c: fix a leak of the IRQ during init failure

    AxelLin committed with torvalds
    Make sure we are passing the same cookie in all calls to
    request_threaded_irq() and free_irq().
    Signed-off-by: Axel Lin <>
    Cc: Donggeun Kim <>
    Cc: Minkyu Kang <>
    Cc: Kyungmin Park <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  5. @AxelLin @torvalds

    backlight: fix module alias prefix for adp8870_bl

    AxelLin committed with torvalds
    This is an i2c driver, not a platform driver, thus use "i2c" prefix for
    the module alias.
    Signed-off-by: Axel Lin <>
    Acked-by: Michael Hennerich <>
    Cc: Richard Purdie <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  6. @torvalds

    backlight: add a callback 'notify_after' for backlight control

    Dilan Lee committed with torvalds
    We need a callback to do some things after pwm_enable, pwm_disable
    and pwm_config.
    Signed-off-by: Dilan Lee <>
    Reviewed-by: Robert Morell <>
    Reviewed-by: Arun Murthy <>
    Cc: Richard Purdie <>
    Cc: Paul Mundt <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  7. @torvalds

    memcg: fix hierarchical oom locking

    Johannes Weiner committed with torvalds
    Commit 79dfdac ("memcg: make oom_lock 0 and 1 based rather than
    counter") tried to oom lock the hierarchy and roll back upon
    encountering an already locked memcg.
    The code is confused when it comes to detecting a locked memcg, though,
    so it would fail and rollback after locking one memcg and encountering
    an unlocked second one.
    The result is that oom-locking hierarchies fails unconditionally and
    that every oom killer invocation simply goes to sleep on the oom
    waitqueue forever.  The tasks practically hang forever without anyone
    intervening, possibly holding locks that trip up unrelated tasks, too.
    Signed-off-by: Johannes Weiner <>
    Acked-by: Michal Hocko <>
    Acked-by: KAMEZAWA Hiroyuki <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  8. @AxelLin @torvalds

    leds: add missing include of linux/module.h

    AxelLin committed with torvalds
    Add missing include of linux/module.h for drivers that use interfaces from
    linux/module.h.  This patch fixes build errors.
    Signed-off-by: Axel Lin <>
    Cc: Jonathan McDowell <>
    Acked-by: Kristoffer Ericson <>
    Cc: Magnus Damm <>
    Cc: Richard Purdie <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  9. @AxelLin @torvalds

    drivers/video/backlight/ep93xx_bl.c: add missing include of linux/mod…

    AxelLin committed with torvalds
    ep93xx_bl.c uses interfaces from linux/module.h, so it should include
    that file.  This patch fixes build errors:
        CC [M]  drivers/video/backlight/ep93xx_bl.o
      drivers/video/backlight/ep93xx_bl.c:138: error: 'THIS_MODULE' undeclared here (not in a function)
      drivers/video/backlight/ep93xx_bl.c:158: error: expected declaration specifiers or '...' before string constant
      drivers/video/backlight/ep93xx_bl.c:158: warning: data definition has no type or storage class
    Signed-off-by: Axel Lin <>
    Acked-by: H Hartley Sweeten <>
    Cc: Ryan Mallon <>
    Cc: Richard Purdie <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  10. @abou9 @torvalds

    rapidio: fix use of non-compatible registers

    abou9 committed with torvalds
    Replace/remove use of RIO v.1.2 registers/bits that are not
    forward-compatible with newer versions of RapidIO specification.
    RapidIO specification v.1.3 removed Write Port CSR, Doorbell CSR,
    Mailbox CSR and Mailbox and Doorbell bits of the PEF CAR.
    Use of removed (since RIO v.1.3) register bits affects users of
    currently available 1.3 and 2.x compliant devices who may use not so
    recent kernel versions.
    Removing checks for unsupported bits makes corresponding routines
    compatible with all versions of RapidIO specification.  Therefore,
    backporting makes stable kernel versions compliant with RIO v.1.3 and
    later as well.
    Signed-off-by: Alexandre Bounine <>
    Cc: Kumar Gala <>
    Cc: Matt Porter <>
    Cc: Li Yang <>
    Cc: Thomas Moll <>
    Cc: Chul Kim <>
    Cc: <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  11. @torvalds

    vmscan: clear ZONE_CONGESTED for zone with good watermark

    Shaohua Li committed with torvalds
    ZONE_CONGESTED is only cleared in kswapd, but pages can be freed in any
    task.  It's possible ZONE_CONGESTED isn't cleared in some cases:
     1. the zone is already balanced just entering balance_pgdat() for
        order-0 because concurrent tasks free memory.  In this case, later
        check will skip the zone as it's balanced so the flag isn't cleared.
     2. high order balance fallbacks to order-0.  quote from Mel: At the
        end of balance_pgdat(), kswapd uses the following logic;
    	If reclaiming at high order {
    		for each zone {
    			if all_unreclaimable
    			if watermark is not met
    				order = 0
    				loop again
    			/* watermark is met */
    			clear congested
        i.e. it clears ZONE_CONGESTED if it the zone is balanced.  if not,
        it restarts balancing at order-0.  However, if the higher zones are
        balanced for order-0, kswapd will miss clearing ZONE_CONGESTED as
        that only happens after a zone is shrunk.  This can mean that
        wait_iff_congested() stalls unnecessarily.
    This patch makes kswapd clear ZONE_CONGESTED during its initial
    highmem->dma scan for zones that are already balanced.
    Signed-off-by: Shaohua Li <>
    Acked-by: Mel Gorman <>
    Reviewed-by: Minchan Kim <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  12. @torvalds

    kernel/printk: do not turn off bootconsole in printk_late_init() if k…

    Nishanth Aravamudan committed with torvalds
    It seems that 7bf6939 ("console: allow to retain boot console via
    boot option keep_bootcon") doesn't always achieve what it aims, as when
    printk_late_init() runs it unconditionally turns off all boot consoles.
    With this patch, I am able to see more messages on the boot console in
    KVM guests than I can without, when keep_bootcon is specified.
    I think it is appropriate for the relevant -stable trees.  However, it's
    more of an annoyance than a serious bug (ideally you don't need to keep
    the boot console around as console handover should be working -- I was
    encountering a situation where the console handover wasn't working and
    not having the boot console available meant I couldn't see why).
    Signed-off-by: Nishanth Aravamudan <>
    Cc: David S. Miller <>
    Cc: Alan Cox <>
    Cc: Greg KH <>
    Acked-by: Fabio M. Di Nitto <>
    Cc: <>		[2.6.39.x, 3.0.x]
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  13. @gaowanlong @torvalds

    MAINTAINERS: Paul Menage has moved

    gaowanlong committed with torvalds
    Paul said: I left Google at the end of last week - if it's not bouncing
    already, isn't going to work for much longer.
    Signed-off-by: Wanlong Gao <>
    Acked-by: Paul Menage <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  14. @torvalds

    mm: fix a vmscan warning

    Shaohua Li committed with torvalds
    I get the below warning:
      BUG: using smp_processor_id() in preemptible [00000000] code: bash/746
      caller is native_sched_clock+0x37/0x6e
      Pid: 746, comm: bash Tainted: G        W   3.0.0+ #254
      Call Trace:
       [<ffffffff813435c6>] debug_smp_processor_id+0xc2/0xdc
       [<ffffffff8104158d>] native_sched_clock+0x37/0x6e
       [<ffffffff81116219>] try_to_free_mem_cgroup_pages+0x7d/0x270
       [<ffffffff8114f1f8>] mem_cgroup_force_empty+0x24b/0x27a
       [<ffffffff8114ff21>] ? sys_close+0x38/0x138
       [<ffffffff8114ff21>] ? sys_close+0x38/0x138
       [<ffffffff8114f257>] mem_cgroup_force_empty_write+0x17/0x19
       [<ffffffff810c72fb>] cgroup_file_write+0xa8/0xba
       [<ffffffff811522d2>] vfs_write+0xb3/0x138
       [<ffffffff8115241a>] sys_write+0x4a/0x71
       [<ffffffff8114ffd9>] ? sys_close+0xf0/0x138
       [<ffffffff8176deab>] system_call_fastpath+0x16/0x1b
    sched_clock() can't be used with preempt enabled.  And we don't need
    fast approach to get clock here, so let's use ktime API.
    Signed-off-by: Shaohua Li <>
    Acked-by: KAMEZAWA Hiroyuki <>
    Tested-by: KAMEZAWA Hiroyuki <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  15. @thomasmey @torvalds

    drivers/char/msm_smd_pkt.c: don't use IS_ERR()

    thomasmey committed with torvalds
    The various basic memory allocation function return NULL, not an
    The semantic patch that makes this change is available in
    More information about semantic patching is available at
    Signed-off-by: Thomas Meyer <>
    Cc: Niranjana Vishwanathapura <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  16. @teawater @torvalds

    checkpatch: add missing WARN argument for min_t and max_t tests

    teawater committed with torvalds
    The test for bad usage of min_t() and max_t() is missing the --ignore
    type.  Add it.
    Signed-off-by: Hui Zhu <>
    Signed-off-by: Joe Perches <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  17. @ralfth @torvalds

    scripts/ update Linus's git repository

    ralfth committed with torvalds
    Change to new git tree -
    Signed-off-by: Ralf Thielow <>
    Cc: Joe Perches <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
  18. @torvalds

    memcg: pin execution to current cpu while draining stock

    Johannes Weiner committed with torvalds
    Commit d1a05b6 ("memcg do not try to drain per-cpu caches without
    pages") added a drain_local_stock() call to a preemptible section.
    The draining task looks up the cpu-local stock twice to set the
    draining-flag, then to drain the stock and clear the flag again.  If the
    task is migrated to a different CPU in between, noone will clear the
    flag on the first stock and it will be forever undrainable.  Its charge
    can not be recovered and the cgroup can not be deleted anymore.
    Properly pin the task to the executing CPU while draining stocks.
    Signed-off-by: Johannes Weiner <>
    Cc: KAMEZAWA Hiroyuki <
    Acked-by: Michal Hocko <>
    Signed-off-by: Andrew Morton <>
    Signed-off-by: Linus Torvalds <>
Something went wrong with that request. Please try again.