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

    firmware loader: allow builtin firmware load even if usermodehelper i…

    …s disabled
    
    In commit a144c6a ("PM: Print a warning if firmware is requested
    when tasks are frozen") we not only printed a warning if somebody tried
    to load the firmware when tasks are frozen - we also failed the load.
    
    But that check was done before the check for built-in firmware, and then
    when we disallowed usermode helpers during bootup (commit 288d5ab:
    "Boot up with usermodehelper disabled"), that actually means that
    built-in modules can no longer load their firmware even if the firmware
    is built in too.  Which used to work, and some people depended on it for
    the R100 driver.
    
    So move the test for usermodehelper_is_disabled() down, to after
    checking the built-in firmware.
    
    This should fix:
    
    	https://bugzilla.kernel.org/show_bug.cgi?id=40952
    
    Reported-by: James Cloos <cloos@hjcloos.com>
    Bisected-by: Elimar Riesebieter <riesebie@lxtec.de>
    Cc: Michel Dänzer <michel@daenzer.net>
    Cc: Rafael Wysocki <rjw@sisk.pl>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Cc: Valdis Kletnieks <valdis.kletnieks@vt.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Aug 24, 2011
  2. @torvalds

    Merge branch 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux

    * 'for-31-rc3/i2c-fixes' of git://git.fluff.org/bjdooks/linux:
      i2c-nomadik: fix kerneldoc warning
      Revert "i2c-omap: fix static suspend vs. runtime suspend"
      i2c-nomadik: Do not use _interruptible_ variant call
    torvalds committed Aug 24, 2011
  3. @linusw

    i2c-nomadik: fix kerneldoc warning

    There was a missing struct item in the kerneldoc, add it and fix
    another pretty-printing formatting issue with a missing space.
    
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    linusw committed with Ben Dooks Aug 9, 2011
  4. @torvalds

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

    …/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: wiimote: Add status and return request handlers
      HID: wiimote: Add drm request
      HID: wiimote: Register led class devices
      HID: wiimote: Correctly call HID open/close callbacks
      HID: wiimote: Simplify synchronization
      HID: usbhid: Add support for SiGma Micro chip
      HID: add support for new revision of Apple aluminum keyboard
    torvalds committed Aug 24, 2011
  5. @torvalds

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

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: ad714x - read the interrupt status registers in a row
      Input: ad714x - use DMA-safe buffers for spi_write()
      Input: ad714x - fix endianness issues
      Input: ad714xx-spi - force SPI bus into the default 8-bit mode
      Input: ep93xx_keypad - add missing include of linux/module.h
      Input: tnetv107x-ts - add missing include of linux/module.h
      Input: max11801_ts - correct license statement
      Input: atmel_mxt_ts - report pressure information from the driver
      Input: bcm5974 - Add support for newer MacBookPro8,2
      Input: wacom - report id 3 returns 4 bytes of data
      Input: wacom - add WAC_MSG_RETRIES define
      Input: wacom - add support for the Wacom Bamboo Pen (CTL-660/K)
      Input: tegra-kbc - correct call to input_free_device
      Input: mpu3050 - correct call to input_free_device
      Input: bcm5974 - add support for touchpads found in MacBookAir4,2
      Input: mma8450 - fix module device table type
      Input: remove CLOCK_TICK_RATE from analog joystick driver
    torvalds committed Aug 24, 2011
  6. @torvalds

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

    …/git/mszeredi/fuse
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message
      fuse: mark pages accessed when written to
      fuse: delete dead .write_begin and .write_end aops
      fuse: fix flock
      fuse: fix non-ANSI void function notation
    torvalds committed Aug 24, 2011
  7. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc: Allow handling signals when stack is corrupted.
    torvalds committed Aug 24, 2011
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
      bridge: fix a possible net_device leak
      net: Documentation: RFC 2553bis is now RFC 3493
      atm: br2684: Fix oops due to skb->dev being NULL
      ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
      net: netdev-features.txt update to Documentation/networking/00-INDEX
      vlan: reset headers on accel emulation path
      forcedeth: call vlan_mode only if hw supports vlans
      via-velocity: remove non-tagged packet filtering
      bonding:reset backup and inactive flag of slave
      net_sched: fix port mirror/redirect stats reporting
      sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
      gianfar: reduce stack usage in gianfar_ethtool.c
      net: minor update to Documentation/networking/scaling.txt
      net: add missing entries to Documentation/networking/00-INDEX
      gianfar: prevent buggy hw rx vlan tagging
      net: sh_eth: Fix build by forgot including linux/interrupt.h
      drivers/net/can/sja1000/plx_pci.c: eliminate double free
      usbnet/cdc_ncm: Don't use stack variables for DMA
      vmxnet3: Don't enable vlan filters in promiscuous mode.
      iwlagn: sysfs couldn't find the priv pointer
      ...
    torvalds committed Aug 24, 2011
  9. fuse: check size of FUSE_NOTIFY_INVAL_ENTRY message

    FUSE_NOTIFY_INVAL_ENTRY didn't check the length of the write so the
    message processing could overrun and result in a "kernel BUG at
    fs/fuse/dev.c:629!"
    
    Reported-by: Han-Wen Nienhuys <hanwenn@gmail.com>
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    CC: stable@kernel.org
    Miklos Szeredi committed Aug 24, 2011
  10. @torvalds

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

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86-32, vdso: On system call restart after SYSENTER, use int $0x80
      x86, UV: Remove UV delay in starting slave cpus
      x86, olpc: Wait for last byte of EC command to be accepted
    torvalds committed Aug 23, 2011
Commits on Aug 23, 2011
  1. x86-32, vdso: On system call restart after SYSENTER, use int $0x80

    When we enter a 32-bit system call via SYSENTER or SYSCALL, we shuffle
    the arguments to match the int $0x80 calling convention.  This was
    probably a design mistake, but it's what it is now.  This causes
    errors if the system call as to be restarted.
    
    For SYSENTER, we have to invoke the instruction from the vdso as the
    return address is hardcoded.  Accordingly, we can simply replace the
    jump in the vdso with an int $0x80 instruction and use the slower
    entry point for a post-restart.
    
    Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Link: http://lkml.kernel.org/r/CA%2B55aFztZ=r5wa0x26KJQxvZOaQq8s2v3u50wCyJcA-Sc4g8gQ@mail.gmail.com
    Cc: <stable@kernel.org>
    H. Peter Anvin committed Aug 22, 2011
  2. @torvalds

    m68k: fix __page_to_pfn for a const struct page argument

    Fixes fallout due to the removal of the cast in commit aa462ab
    ("mm: fix __page_to_pfn for a const struct page argument")
    
    Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: linux-m68k@lists.linux-m68k.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ian Campbell committed with torvalds Aug 18, 2011
  3. Revert "i2c-omap: fix static suspend vs. runtime suspend"

    This reverts commit adf6e07.
    
    Remove system PM methods which can race with runtime PM methods.
    
    Also, as of v3.1, the PM domain level code for OMAP handles device
    power state transistions automatically for devices, so drivers no
    longer need to specifically call the bus/pm_domain methods themselves.
    
    Signed-off-by: Kevin Hilman <khilman@ti.com>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Kevin Hilman committed with Ben Dooks Aug 4, 2011
  4. i2c-nomadik: Do not use _interruptible_ variant call

    If there is a signal pending and wait_for_completion_interruptible_timeout
    exited because of the -ERESTARTSYS error we are unable to send any more
    i2c messages.
    
    So, deprecate this _interruptible_ variant call.
    
    Signed-off-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    srinidhi kasagar committed with Ben Dooks Aug 9, 2011
  5. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: fix tracing builds inside the source tree
      xfs: remove subdirectories
      xfs: don't expect xfs headers to be in subdirectories
    torvalds committed Aug 23, 2011
  6. @torvalds

    Merge git://git.infradead.org/users/cbou/battery-3.1

    * git://git.infradead.org/users/cbou/battery-3.1:
      s3c-adc-battery: Fix compilation error due to missing header (module.h)
      max8997_charger: Needs module.h
      max8998_charger: Needs module.h
    torvalds committed Aug 23, 2011
  7. @torvalds

    Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon: Extended DDC Probing for Toshiba L300D Radeon Mobility X1100 HDMI-A Connector
      drm/ttm: ensure ttm for new node is bound before calling move_notify()
      drm/ttm: unbind ttm before destroying node in accel move cleanup
      drm/ttm: fix ttm_bo_add_ttm(user) failure path
      drm/radeon: Make vramlimit parameter actually work.
      drm/radeon: Explicitly print GTT/VRAM offsets on test failure.
      drm/radeon: Take IH ring into account for test size calculation.
      drm/radeon/alpha: Add Alpha support to Radeon DRM code
    torvalds committed Aug 23, 2011
  8. @torvalds

    Revert "irq: Always set IRQF_ONESHOT if no primary handler is specified"

    This reverts commit f3637a5.
    
    It turns out that this breaks several drivers, one example being OMAP
    boards which use the on-board OMAP UARTs and the omap-serial driver that
    will not boot to userspace after the commit.
    
    Paul Walmsley reports that enabling CONFIG_DEBUG_SHIRQ reveals 'IRQ
    handler type mismatch' errors:
    
      IRQ handler type mismatch for IRQ 74
      current handler: serial idle
      ...
    
    and the reason is that setting IRQF_ONESHOT will now result in those
    interrupt handlers having different IRQF flags, and thus being
    unsharable.  So the commit log in the reverted commit:
    
                                "Since it is required for those users and
        there is no difference for others it makes sense to add this flag
        unconditionally."
    
    is simply not true: there may not be any difference from a "actions at
    irq time", but there is a *big* difference wrt this flag testing irq
    management (see __setup_irq() in kernel/irq/manage.c).
    
    One solution may be to stop verifying IRQF_ONESHOT in __setup_irq(), but
    right now the safe course of action is to revert the change.  Let's
    revisit this in a later merge window.
    
    Reported-by: Paul Walmsley <paul@pwsan.com>
    Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Requested-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Aug 23, 2011
  9. drm/radeon: Extended DDC Probing for Toshiba L300D Radeon Mobility X1…

    …100 HDMI-A Connector
    
    Toshiba Satellite L300D with ATI Mobility Radeon X1100 sends data
       to i2c bus for a HDMI connector that is not implemented/existent
       on the notebook's board.
    
       Fix by applying extented DDC probing for this connector.
    
       Requires [PATCH] drm/radeon: Extended DDC Probing for Connectors
       with Improperly Wired DDC Lines
    
       Tested for kernel 2.6.38 on Toshiba Satellite L300D notebook
    
       BugLink: http://bugs.launchpad.net/bugs/826677
    
    Signed-off-by: Thomas Reim <reimth@gmail.com>
    Acked-by: Chris Routh <routhy@gmail.com>
    Cc: <stable@kernel.org>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Thomas Reim committed with Dave Airlie Aug 17, 2011
  10. @dvdhrm

    HID: wiimote: Add status and return request handlers

    The wiimote resets the current drm when an extension is plugged in.
    Fortunately, it also sends a status report in this situation so we just
    reset the drm on every status report to keep the drm consistent.
    
    Also handle return reports from the wiimote which indicate success and
    failure of requests that we've sent.
    
    Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    dvdhrm committed with Jiri Kosina Aug 17, 2011
  11. @dvdhrm

    HID: wiimote: Add drm request

    The wiimote reports data in several data reporting modes (DRM). The DRM
    request makes the wiimote send data in the requested drm.
    
    The DRM mode can be set explicitely or can be chosen by the driver. To let
    the driver choose the DRM mode, pass WIIPROTO_REQ_NULL placeholder to it. This
    is no valid request and is replaced with an appropriate DRM.
    
    Currently, the driver always sets the basic DRM_K mode, but this will be
    extended when further peripherals like accelerometer and IR are supported.
    
    Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    dvdhrm committed with Jiri Kosina Aug 17, 2011
  12. @dvdhrm

    HID: wiimote: Register led class devices

    This registers 4 led devices to allow controlling the wiimote leds via standard
    LED sysfs API. It removes the four sysfs attributes so we don't have two APIs
    for one device.
    
    Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    dvdhrm committed with Jiri Kosina Aug 17, 2011
  13. @dvdhrm

    HID: wiimote: Correctly call HID open/close callbacks

    Even though the bluetooth hid backend does not react on open/close callbacks, we
    should call them to be consistent with other hid drivers.
    
    Also the new input open/close handlers will be used in future to prepare the
    wiimote device for IR/extension input.
    
    Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    dvdhrm committed with Jiri Kosina Aug 17, 2011
  14. @dvdhrm

    HID: wiimote: Simplify synchronization

    The new locking scheme in HID core allows us to remove a bit of synchronization.
    Since the HID layer acts synchronously we simply register input core last and
    there are no synchonization issues anymore.
    Also register sysfs files after that to simplify the code.
    
    Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    dvdhrm committed with Jiri Kosina Aug 17, 2011
  15. drm/ttm: ensure ttm for new node is bound before calling move_notify()

    This was true for new TTM_PL_SYSTEM and new TTM_PL_TT cases, but wasn't
    the case on TTM_PL_SYSTEM<->TTM_PL_TT moves, which causes trouble on some
    paths as nouveau's move_notify() hook requires that the dma addresses be
    valid at this point.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Ben Skeggs committed with Dave Airlie Aug 22, 2011
  16. drm/ttm: unbind ttm before destroying node in accel move cleanup

    Nouveau makes the assumption that if a TTM is bound there will be a mm_node
    around for it and the backwards ordering here resulted in a use-after-free
    on some eviction paths.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Ben Skeggs committed with Dave Airlie Aug 22, 2011
  17. @mslusarz

    drm/ttm: fix ttm_bo_add_ttm(user) failure path

    ttm_tt_destroy kfrees passed object, so we need to nullify
    a reference to it.
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: stable@kernel.org
    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    mslusarz committed with Dave Airlie Aug 22, 2011
  18. @sprg

    HID: usbhid: Add support for SiGma Micro chip

    Patch to add SiGma Micro-based keyboards (1c4f:0002) to hid-quirks.
    
    These keyboards dont seem to allow the records to be initialized, and hence a
    timeout occurs when the usbhid driver attempts to initialize them. The patch
    just adds the signature for these keyboards to the hid-quirks list with the
    setting HID_QUIRK_NO_INIT_REPORTS. This removes the 5-10 second wait for the
    timeout to occur.
    
    Signed-off-by: Jeremiah Matthey <sprg86@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    sprg committed with Jiri Kosina Aug 23, 2011
Commits on Aug 22, 2011
  1. @davem330

    bridge: fix a possible net_device leak

    Jan Beulich reported a possible net_device leak in bridge code after
    commit bb900b2 (bridge: allow creating bridge devices with netlink)
    
    Reported-by: Jan Beulich <JBeulich@novell.com>
    Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
    Acked-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Eric Dumazet committed with davem330 Aug 22, 2011
  2. xfs: fix tracing builds inside the source tree

    The code really requires the current source directory to be in the
    header search path.  We already do this if building with an object
    tree separate from the source, but it needs to be added manually
    if building inside the source.  The cflags addition for it accidentally
    got removed when collapsing the xfs directory structure.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Dave Chinner <david@fromorbit.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    Christoph Hellwig committed with Alex Elder Aug 14, 2011
  3. @davem330

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

    …/git/linville/wireless
    davem330 committed Aug 22, 2011
  4. @torvalds

    Linux 3.1-rc3

    torvalds committed Aug 22, 2011
  5. @geofft @davem330

    net: Documentation: RFC 2553bis is now RFC 3493

    Signed-off-by: Geoffrey Thomas <geofft@mit.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    geofft committed with davem330 Aug 22, 2011
  6. @torvalds

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

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf tools: Add group event scheduling option to perf record/stat
      MAINTAINERS: Fix list of perf events source files
      perf tools: Fix build against newer glibc
      perf tools: Fix error handling of unknown events
      perf evlist: Fix missing event name init for default event
      perf list: Fix exit value
    torvalds committed Aug 22, 2011
Something went wrong with that request. Please try again.