1. 17 Aug, 2012 13 commits
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 557e2e2e
      Linus Torvalds authored
      Pull staging fixes from Greg Kroah-Hartman:
       "Here are some staging driver fixes (and iio driver fixes, they get
        lumped in with the staging stuff due to dependancies) for your 3.6-rc3
        tree.
      
        Nothing major, just a bunch of fixes that people have reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'staging-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (26 commits)
        iio: lm3533-als: Fix build warnings
        staging:iio:ad7780: Mark channels as unsigned
        staging:iio:ad7192: Report offset and scale for temperature channel
        staging:iio:ad7192: Report channel offset
        staging:iio:ad7192: Mark channels as unsigned
        staging:iio:ad7192: Fix setting ACX
        staging:iio:ad7192: Add missing break in switch statement
        staging:iio:ad7793: Fix internal reference value
        staging:iio:ad7793: Follow new IIO naming spec
        staging:iio:ad7793: Fix temperature scale and offset
        staging:iio:ad7793: Report channel offset
        staging:iio:ad7793: Mark channels as unsigned
        staging:iio:ad7793: Add missing break in switch statement
        iio/adjd_s311: Fix potential memory leak in adjd_s311_update_scan_mode()
        iio: frequency: ADF4350: Fix potential reference div factor overflow.
        iio: staging: ad7298_ring: Fix maybe-uninitialized warning
        staging: comedi: usbduxfast: Declare MODULE_FIRMWARE usage
        staging: comedi: usbdux: Declare MODULE_FIRMWARE usage
        staging: comedi: usbduxsigma: Declare MODULE_FIRMWARE usage
        staging: csr: add INET dependancy
        ...
      557e2e2e
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · c8391797
      Linus Torvalds authored
      Pull driver core fixes from Greg Kroah-Hartman:
       "Here are two tiny patches, one fixing a dynamic debug problem that the
        printk rework turned up, and the other one fixing an extcon problem
        that people reported.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one
        drivers-core: make structured logging play nice with dynamic-debug
      c8391797
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · d7d45fed
      Linus Torvalds authored
      Pull Char / Misc driver fixes from Greg Kroah-Hartman:
       "Here are some small misc and w1 driver fixes for 3.6-rc3.  Nothing
        major, just some some bugfixes and a new device id for a w1 driver.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        1-Wire: Add support for the maxim ds1825 temperature sensor
        ti-st: Fix check for pdata->chip_awake function pointer
        mei: add mei_quirk_probe function
        mei: fix device stall after wd is stopped
      d7d45fed
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 9134e7d2
      Linus Torvalds authored
      Pull USB patches from Greg Kroah-Hartman:
       "Here are a number of small USB patches for 3.6-rc3.
      
        The "large" one is just a number of device id updates to the option
        driver, done by the manufacturer, properly fixing up the device ids
        based on shipping devices.
      
        Other than that, some gadget driver fixes, the obligitary XHCI
        patches, and some other device ids and bugs fixed.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
        USB: qcserial: fix port handling on Gobi 1K and 2K+
        USB: serial: Fix mos7840 timeout
        USB: option: add ZTE K5006-Z
        usb: gadget: u_ether: fix kworker 100% CPU issue with still used interfaces in eth_stop
        usb: host: tegra: fix warning messages in ehci_remove
        usb: host: mips: sead3: Update for EHCI register structure.
        usb: renesas_usbhs: fixup resume method for autonomy mode
        usb: renesas_usbhs: mod_host: add missing .bus_suspend/resume
        update MAINTAINERS for Oliver Neukum
        usb: usb_wwan: resume/suspend can be called after port is gone
        usb: serial: prevent suspend/resume from racing against probe/remove
        usb: usb_wwan: replace release and disconnect with a port_remove hook
        usb: serial: mos7840: Fixup mos7840_chars_in_buffer()
        USB: isp1362-hcd.c: usb message always saved in case of underrun
        OMAP: USB : Fix the EHCI enumeration and core retention issue
        usb: chipidea: fix and improve dependencies if usb host or gadget support is built as module
        USB: support the new interfaces of Huawei Data Card devices in option driver
        USB: ftdi_sio: Add VID/PID for Kondo Serial USB
        xhci: Switch PPT ports to EHCI on shutdown.
        xhci: Fix bug after deq ptr set to link TRB.
        ...
      9134e7d2
    • Randy Dunlap's avatar
      scripts/kernel-doc: fix fatal script error · 0df7c0e3
      Randy Dunlap authored
      Fix fatal error in scripts/kernel-doc by ignoring the "__weak" attribute:
      
        Error(drivers/pci/pci.c:2820): cannot understand prototype: 'char * __weak pcibios_setup(char *str) '
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0df7c0e3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 0b0402d4
      Linus Torvalds authored
      Pull a Yama bugfix from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        Yama: access task_struct->comm directly
      0b0402d4
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming · 9d0f8140
      Linus Torvalds authored
      Pull C6X atomic64 support from Mark Salter:
       "Enable atomic64 ops in C6X
         - define L1_CACHE_SHIFT
         - select GENERIC_ATOMIC64"
      
      * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
        C6X: select GENERIC_ATOMIC64
        C6X: add Lx_CACHE_SHIFT defines
      9d0f8140
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · ef824bfb
      Linus Torvalds authored
      Pull ext4 bug fixes from Ted Ts'o:
       "The following are all bug fixes and regressions.  The most notable are
        the ones which cause problems for ext4 on RAID --- a performance
        problem when mounting very large filesystems, and a kernel OOPS when
        doing an rm -rf on large directory hierarchies on fast devices."
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: fix kernel BUG on large-scale rm -rf commands
        ext4: fix long mount times on very big file systems
        ext4: don't call ext4_error while block group is locked
        ext4: avoid kmemcheck complaint from reading uninitialized memory
        ext4: make sure the journal sb is written in ext4_clear_journal_err()
      ef824bfb
    • Ian Kent's avatar
      autofs4 - fix expire check · d807ff83
      Ian Kent authored
      In some cases when an autofs indirect mount is contained in a file
      system that is marked as shared (such as when systemd does the
      equivalent of "mount --make-rshared /" early in the boot), mounts
      stop expiring.
      
      When this happens the first expiry check on a mountpoint dentry in
      autofs_expire_indirect() sees a mountpoint dentry with a higher
      than minimal reference count. Consequently the dentry is condidered
      busy and the actual expiry check is never done.
      
      This particular check was originally meant as an optimisation to
      detect a path walk in progress but with the addition of rcu-walk
      it can be ineffective anyway.
      
      Removing the test allows automounts to expire again since the
      actual expire check doesn't rely on the dentry reference count.
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d807ff83
    • Theodore Ts'o's avatar
      ext4: fix kernel BUG on large-scale rm -rf commands · 89a4e48f
      Theodore Ts'o authored
      Commit 968dee77: "ext4: fix hole punch failure when depth is greater
      than 0" introduced a regression in v3.5.1/v3.6-rc1 which caused kernel
      crashes when users ran run "rm -rf" on large directory hierarchy on
      ext4 filesystems on RAID devices:
      
          BUG: unable to handle kernel NULL pointer dereference at 0000000000000028
      
          Process rm (pid: 18229, threadinfo ffff8801276bc000, task ffff880123631710)
          Call Trace:
           [<ffffffff81236483>] ? __ext4_handle_dirty_metadata+0x83/0x110
           [<ffffffff812353d3>] ext4_ext_truncate+0x193/0x1d0
           [<ffffffff8120a8cf>] ? ext4_mark_inode_dirty+0x7f/0x1f0
           [<ffffffff81207e05>] ext4_truncate+0xf5/0x100
           [<ffffffff8120cd51>] ext4_evict_inode+0x461/0x490
           [<ffffffff811a1312>] evict+0xa2/0x1a0
           [<ffffffff811a1513>] iput+0x103/0x1f0
           [<ffffffff81196d84>] do_unlinkat+0x154/0x1c0
           [<ffffffff8118cc3a>] ? sys_newfstatat+0x2a/0x40
           [<ffffffff81197b0b>] sys_unlinkat+0x1b/0x50
           [<ffffffff816135e9>] system_call_fastpath+0x16/0x1b
          Code: 8b 4d 20 0f b7 41 02 48 8d 04 40 48 8d 04 81 49 89 45 18 0f b7 49 02 48 83 c1 01 49 89 4d 00 e9 ae f8 ff ff 0f 1f 00 49 8b 45 28 <48> 8b 40 28 49 89 45 20 e9 85 f8 ff ff 0f 1f 80 00 00 00
      
          RIP  [<ffffffff81233164>] ext4_ext_remove_space+0xa34/0xdf0
      
      This could be reproduced as follows:
      
      The problem in commit 968dee77 was that caused the variable 'i' to
      be left uninitialized if the truncate required more space than was
      available in the journal.  This resulted in the function
      ext4_ext_truncate_extend_restart() returning -EAGAIN, which caused
      ext4_ext_remove_space() to restart the truncate operation after
      starting a new jbd2 handle.
      Reported-by: default avatarMaciej Żenczykowski <maze@google.com>
      Reported-by: default avatarMarti Raudsepp <marti@juffo.org>
      Tested-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      89a4e48f
    • Theodore Ts'o's avatar
      ext4: fix long mount times on very big file systems · 0548bbb8
      Theodore Ts'o authored
      Commit 8aeb00ff: "ext4: fix overhead calculation used by
      ext4_statfs()" introduced a O(n**2) calculation which makes very large
      file systems take forever to mount.  Fix this with an optimization for
      non-bigalloc file systems.  (For bigalloc file systems the overhead
      needs to be set in the the superblock.)
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      0548bbb8
    • Theodore Ts'o's avatar
      ext4: don't call ext4_error while block group is locked · 7a4c5de2
      Theodore Ts'o authored
      While in ext4_validate_block_bitmap(), if an block allocation bitmap
      is found to be invalid, we call ext4_error() while the block group is
      still locked.  This causes ext4_commit_super() to call a function
      which might sleep while in an atomic context.
      
      There's no need to keep the block group locked at this point, so hoist
      the ext4_error() call up to ext4_validate_block_bitmap() and release
      the block group spinlock before calling ext4_error().
      
      The reported stack trace can be found at:
      
      	http://article.gmane.org/gmane.comp.file-systems.ext4/33731Reported-by: default avatarDave Jones <davej@redhat.com>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      7a4c5de2
    • Kees Cook's avatar
      Yama: access task_struct->comm directly · 7612bfee
      Kees Cook authored
      The core ptrace access checking routine holds a task lock, and when
      reporting a failure, Yama takes a separate task lock. To avoid a
      potential deadlock with two ptracers taking the opposite locks, do not
      use get_task_comm() and just use ->comm directly since accuracy is not
      important for the report.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Suggested-by: default avatarOleg Nesterov <oleg@redhat.com>
      CC: stable@vger.kernel.org
      Signed-off-by: default avatarKees Cook <keescook@chromium.org>
      Acked-by: default avatarJohn Johansen <john.johansen@canonical.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      7612bfee
  2. 16 Aug, 2012 27 commits