1. 21 Feb, 2013 14 commits
    • Linus Torvalds's avatar
      Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b5c78e04
      Linus Torvalds authored
      Pull staging tree update from Greg Kroah-Hartman:
       "Here's the big staging tree merge for 3.9-rc1
      
        Lots of cleanups and updates for drivers all through the staging tree.
        We are pretty much "code neutral" here, adding just about as many
        lines as we removed.
      
        All of these have been in linux-next for a while."
      
      * tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
        staging: comedi: vmk80xx: wait for URBs to complete
        staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
        staging: et131x: Update TODO list
        staging: et131x: Remove assignment of skb->dev
        staging: wlan-ng: hfa384x.h: fix for error reported by smatch
        staging/zache checkpatch ERROR: spaces prohibited around that
        staging/ozwpan: Mark read only parameters and structs as const
        staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
        staging/ozwpan: Mark local functions as static (fix sparse warnings)
        staging/ozwpan: Add missing header includes
        staging/usbip: Mark local functions as static (fix sparse warnings)
        staging/xgifb: Remove duplicated code in loops.
        staging/xgifb: Consolidate return paths
        staging/xgifb: Remove code without effect
        staging/xgifb: Remove unnecessary casts
        staging/xgifb: Consolidate if/else if with identical code branches
        staging: vt6656: replaced custom TRUE definition with true
        staging: vt6656: replaced custom FALSE definition with false
        staging: vt6656: replace custom BOOL definition with bool
        staging/rtl8187se: Mark functions as static to silence sparse
        ...
      b5c78e04
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 06991c28
      Linus Torvalds authored
      Pull driver core patches from Greg Kroah-Hartman:
       "Here is the big driver core merge for 3.9-rc1
      
        There are two major series here, both of which touch lots of drivers
        all over the kernel, and will cause you some merge conflicts:
      
         - add a new function called devm_ioremap_resource() to properly be
           able to check return values.
      
         - remove CONFIG_EXPERIMENTAL
      
        Other than those patches, there's not much here, some minor fixes and
        updates"
      
      Fix up trivial conflicts
      
      * tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
        base: memory: fix soft/hard_offline_page permissions
        drivercore: Fix ordering between deferred_probe and exiting initcalls
        backlight: fix class_find_device() arguments
        TTY: mark tty_get_device call with the proper const values
        driver-core: constify data for class_find_device()
        firmware: Ignore abort check when no user-helper is used
        firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
        firmware: Make user-mode helper optional
        firmware: Refactoring for splitting user-mode helper code
        Driver core: treat unregistered bus_types as having no devices
        watchdog: Convert to devm_ioremap_resource()
        thermal: Convert to devm_ioremap_resource()
        spi: Convert to devm_ioremap_resource()
        power: Convert to devm_ioremap_resource()
        mtd: Convert to devm_ioremap_resource()
        mmc: Convert to devm_ioremap_resource()
        mfd: Convert to devm_ioremap_resource()
        media: Convert to devm_ioremap_resource()
        iommu: Convert to devm_ioremap_resource()
        drm: Convert to devm_ioremap_resource()
        ...
      06991c28
    • Linus Torvalds's avatar
      Merge tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 460dc1ee
      Linus Torvalds authored
      Pull sound updates from Takashi Iwai:
       "The biggest change in this update is the unification of HD-audio codec
        parsers.  Now the HD-audio codec is parsed in a generic parser code
        which is invoked by each HD-audio codec driver.
      
        Some background information is found in David Henningsson's blog
        entry:
      
            http://voices.canonical.com/david.henningsson/2013/01/18/upcoming-changes-to-the-intel-hda-drivers/
      
        Other than that, some random updates/fixes like USB-audio and a bunch
        of small AoC updates as usual.
      
        Highlights:
      
         - Unification of HD-audio parser code (aka generic parser)
      
         - Support of new Intel HD-audio controller, new IDT codecs
      
         - Fixes for HD-audio HDMI audio hotplug
      
         - Haswell HDMI audio fixup
      
         - Support of Creative CA0132 DSP code
      
         - A few fixes of HDSP driver
      
         - USB-audio fix for Roland A-PRO, M-Audio FT C600
      
         - Support PM for aloop driver (and fixes Oops)
      
         - Compress API updates for gapless playback support
      
        For ASoC part:
      
         - Support for a wider range of hardware in the compressed stream code
      
         - The ability to mute capture streams as well as playback streams
           while inactive
      
         - DT support for AK4642, FSI, Samsung I2S and WM8962
      
         - AC'97 support for Tegra
      
         - New driver for max98090, replacing the stub which was there
      
         - A new driver from Dialog
      
        Note that due to dependencies, DTification of DMA support for Samsung
        platforms (used only by the and I2S driver and SPI) is merged here as
        well."
      
      Fix up trivial conflict in drivers/spi/spi-s3c64xx.c due to removed code
      being changed.
      
      * tag 'sound-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (453 commits)
        ALSA: usb: Fix Processing Unit Descriptor parsers
        ALSA: hda - hdmi: Notify userspace when ELD control changes
        ALSA: hda - hdmi: Protect ELD buffer
        ALSA: hda - hdmi: Refactor hdmi_eld into parsed_hdmi_eld
        ALSA: hda - hdmi: Do not expose eld data when eld is invalid
        ALSA: hda - hdmi: ELD shouldn't be valid after unplug
        ALSA: hda - Fix the silent speaker output on Fujitsu S7020 laptop
        ALSA: hda - add quirks for mute LED on two HP machines
        ALSA: usb/quirks, fix out-of-bounds access
        ASoC: codecs: Add da7213 codec
        ALSA: au88x0 - Define channel map for au88x0
        ALSA: compress: add support for gapless playback
        ALSA: hda - Remove speaker clicks on CX20549
        ALSA: hda - Disable runtime PM for Intel 5 Series/3400
        ALSA: hda - Increase badness for missing multi-io
        ASoC: arizona: Automatically manage input mutes
        ALSA: hda - Fix broken workaround for HDMI/SPDIF conflicts
        ALSA: hda/ca0132 - Add missing \n to debug prints
        ALSA: hda/ca0132 - Fix type of INVALID_CHIP_ADDRESS
        ALSA: hda - update documentation for no-primary-hp fixup
        ...
      460dc1ee
    • Linus Torvalds's avatar
      Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 024e4ec1
      Linus Torvalds authored
      Pull pstore patches from Tony Luck:
       "A few fixes to reduce places where pstore might hang a system in the
        crash path.  Plus a new mountpoint (/sys/fs/pstore ...  makes more
        sense then /dev/pstore)."
      
      Fix up trivial conflict in drivers/firmware/efivars.c
      
      * tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: Create a convenient mount point for pstore
        efi_pstore: Introducing workqueue updating sysfs
        efivars: Disable external interrupt while holding efivars->lock
        efi_pstore: Avoid deadlock in non-blocking paths
        pstore: Avoid deadlock in panic and emergency-restart path
      024e4ec1
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 850cb82b
      Linus Torvalds authored
      Pull dlm update from David Teigland:
       "This includes a single patch to avoid excessive and unnecessary
        scanning of rsbs to free."
      
      * tag 'dlm-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: avoid scanning unchanged toss lists
      850cb82b
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 2171ee8f
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
      
       - Fix an Oops in the pNFS layoutget code
      
       - Fix a number of NFSv4 and v4.1 state recovery deadlocks and hangs due
         to the interaction of the session drain lock and state management
         locks.
      
       - Remove task->tk_xprt, which was hiding a lot of RCU dereferencing
         bugs
      
       - Fix a long standing NFSv3 posix lock recovery bug.
      
       - Revert commit 324d003b ("NFS: add nfs_sb_deactive_async to avoid
         deadlock").  It turned out that the root cause of the deadlock was
         due to interactions with the workqueues that have now been resolved.
      
      * tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (22 commits)
        NLM: Ensure that we resend all pending blocking locks after a reclaim
        umount oops when remove blocklayoutdriver first
        sunrpc: silence build warning in gss_fill_context
        nfs: remove kfree() redundant null checks
        NFSv4.1: Don't decode skipped layoutgets
        NFSv4.1: Fix bulk recall and destroy of layouts
        NFSv4.1: Fix an ABBA locking issue with session and state serialisation
        NFSv4: Fix a reboot recovery race when opening a file
        NFSv4: Ensure delegation recall and byte range lock removal don't conflict
        NFSv4: Fix up the return values of nfs4_open_delegation_recall
        NFSv4.1: Don't lose locks when a server reboots during delegation return
        NFSv4.1: Prevent deadlocks between state recovery and file locking
        NFSv4: Allow the state manager to mark an open_owner as being recovered
        SUNRPC: Add missing static declaration to _gss_mech_get_by_name
        Revert "NFS: add nfs_sb_deactive_async to avoid deadlock"
        SUNRPC: Nuke the tk_xprt macro
        SUNRPC: Avoid RCU dereferences in the transport bind and connect code
        SUNRPC: Fix an RCU dereference in xprt_reserve
        SUNRPC: Pass pointers to struct rpc_xprt to the congestion window
        SUNRPC: Fix an RCU dereference in xs_local_rpcbind
        ...
      2171ee8f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 9b9a72a8
      Linus Torvalds authored
      Pull GFS2 updates from Steven Whitehouse:
       "This is one of the smallest collections of patches for the merge
        window for some time.  There are some clean ups relating to the
        transaction code and the shrinker, which are mostly in preparation for
        further development, but also make the code much easier to follow in
        these areas.
      
        There is a patch which allows the use of ->writepages even in the
        default ordered write mode for all writebacks.  This results in
        sending larger i/os to the block layer, and a subsequent increase in
        performance.  It also reduces the number of different i/o paths by
        one.
      
        There is also a bug fix reinstating the withdraw ack system which
        somehow got lost when the lock modules were merged into GFS2."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Reinstate withdraw ack system
        GFS2: Get a block reservation before resizing a file
        GFS2: Split glock lru processing into two parts
        GFS2: Use ->writepages for ordered writes
        GFS2: Clean up freeze code
        GFS2: Merge gfs2_attach_bufdata() into trans.c
        GFS2: Copy gfs2_trans_add_bh into new data/meta functions
        GFS2: Split gfs2_trans_add_bh() into two
        GFS2: Merge revoke adding functions
        GFS2: Separate LRU scanning from shrinker
      9b9a72a8
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.9-rc1' of git://oss.sgi.com/xfs/xfs · 736a4c11
      Linus Torvalds authored
      Pull xfs update from Ben Myers:
       "Primarily bugfixes and a few cleanups:
      
         - fix(es) for compound buffers
      
         - remove unused XFS_TRANS_DEBUG routines
      
         - fix for dquot soft timer asserts due to overflow of d_blk_softlimit
      
         - don't zero allocation args structure members after they are memset(0)
      
         - fix for regression in dir v2 code introduced in commit 20f7e9f3
      
         - remove obsolete simple_strto<foo>
      
         - fix return value when filesystem probe finds no XFS magic, a
           regression introduced in 98021821.
      
         - remove boolean_t typedef completely
      
         - fix stack switch in __xfs_bmapi_allocate by moving the check for
           stack switch up into xfs_bmapi_write.
      
         - fix build error due to incomplete boolean_t removal
      
         - fix oops in _xfs_buf_find by validating that the requested block is
           within the filesystem bounds.
      
         - limit speculative preallocation near ENOSPC.
      
         - fix an unmount hang in xfs_wait_buftarg by freeing the
           xfs_buf_log_item in xfs_buf_item_unlock.
      
         - fix a possible use after free with AIO.
      
         - fix xfs_swap_extents after removal of xfs_flushinval_pages, a
           regression introduced in fb595814.
      
         - replace hardcoded 128 with log header size
      
         - add memory barrier before wake_up_bit in xfs_ifunlock
      
         - limit speculative preallocation on sparse files
      
         - fix xa_lock recursion bug introduced in 90810b9e
      
         - fix write verifier for symlinks"
      
      Fixed up conflicts in fs/xfs/xfs_buf_item.c (due to bli_format rename in
      commit 0f22f9d0 affecting the removed XFS_TRANS_DEBUG routines in
      commit ec47eb6b).
      
      * tag 'for-linus-v3.9-rc1' of git://oss.sgi.com/xfs/xfs: (36 commits)
        xfs: xfs_bmap_add_attrfork_local is too generic
        xfs: remove log force from xfs_buf_trylock()
        xfs: recheck buffer pinned status after push trylock failure
        xfs: limit speculative prealloc size on sparse files
        xfs: memory barrier before wake_up_bit()
        xfs: refactor space log reservation for XFS_TRANS_ATTR_SET
        xfs: make use of XFS_SB_LOG_RES() at xfs_fs_log_dummy()
        xfs: make use of XFS_SB_LOG_RES() at xfs_mount_log_sb()
        xfs: make use of XFS_SB_LOG_RES() at xfs_log_sbcount()
        xfs: introduce XFS_SB_LOG_RES() for transactions that modify sb on disk
        xfs: calculate XFS_TRANS_QM_QUOTAOFF_END space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_QUOTAOFF space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_DQALLOC space log reservation at mount time
        xfs: calcuate XFS_TRANS_QM_SETQLIM space log reservation at mount time
        xfs: calculate xfs_qm_write_sb_changes() space log reservation at mount time
        xfs: calculate XFS_TRANS_QM_SBCHANGE space log reservation at mount time
        xfs: make use of xfs_calc_buf_res() in xfs_trans.c
        xfs: add a helper to figure out the space log reservation per item
        xfs: Fix xfs_swap_extents() after removal of xfs_flushinval_pages()
        xfs: Fix possible use-after-free with AIO
        ...
      736a4c11
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · c4bc705e
      Linus Torvalds authored
      Pull fuse updates from Miklos Szeredi:
       "The biggest part of this pull request is a patch series from Maxim
        Patlasov to optimize scatter-gather direct IO.  There's also the
        addition of a "readdirplus" API, poll events and various fixes and
        cleanups.
      
        There's a one line change outside of fuse to mm/filemap.c which makes
        the argument of iov_iter_single_seg_count() const, required by Maxim's
        patches."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: (22 commits)
        fuse: allow control of adaptive readdirplus use
        Synchronize fuse header with one used in library
        fuse: send poll events
        fuse: don't WARN when nlink is zero
        fuse: avoid out-of-scope stack access
        fuse: bump version for READDIRPLUS
        FUSE: Adapt readdirplus to application usage patterns
        Do not use RCU for current process credentials
        fuse: cleanup fuse_direct_io()
        fuse: optimize __fuse_direct_io()
        fuse: optimize fuse_get_user_pages()
        fuse: pass iov[] to fuse_get_user_pages()
        mm: minor cleanup of iov_iter_single_seg_count()
        fuse: use req->page_descs[] for argpages cases
        fuse: add per-page descriptor <offset, length> to fuse_req
        fuse: rework fuse_do_ioctl()
        fuse: rework fuse_perform_write()
        fuse: rework fuse_readpages()
        fuse: rework fuse_retrieve()
        fuse: categorize fuse_get_req()
        ...
      c4bc705e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 2608e3d0
      Linus Torvalds authored
      Pull v9fs updates from Eric Van Hensbergen:
       "Just fixes and simplifications"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: Fix atomic_open
        fs/9p: Don't use O_TRUNC flag in TOPEN and TLOPEN request
        locking in fs/9p ->readdir()
      2608e3d0
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 33673dcb
      Linus Torvalds authored
      Pull security subsystem updates from James Morris:
       "This is basically a maintenance update for the TPM driver and EVM/IMA"
      
      Fix up conflicts in lib/digsig.c and security/integrity/ima/ima_main.c
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (45 commits)
        tpm/ibmvtpm: build only when IBM pseries is configured
        ima: digital signature verification using asymmetric keys
        ima: rename hash calculation functions
        ima: use new crypto_shash API instead of old crypto_hash
        ima: add policy support for file system uuid
        evm: add file system uuid to EVM hmac
        tpm_tis: check pnp_acpi_device return code
        char/tpm/tpm_i2c_stm_st33: drop temporary variable for return value
        char/tpm/tpm_i2c_stm_st33: remove dead assignment in tpm_st33_i2c_probe
        char/tpm/tpm_i2c_stm_st33: Remove __devexit attribute
        char/tpm/tpm_i2c_stm_st33: Don't use memcpy for one byte assignment
        tpm_i2c_stm_st33: removed unused variables/code
        TPM: Wait for TPM_ACCESS tpmRegValidSts to go high at startup
        tpm: Fix cancellation of TPM commands (interrupt mode)
        tpm: Fix cancellation of TPM commands (polling mode)
        tpm: Store TPM vendor ID
        TPM: Work around buggy TPMs that block during continue self test
        tpm_i2c_stm_st33: fix oops when i2c client is unavailable
        char/tpm: Use struct dev_pm_ops for power management
        TPM: STMicroelectronics ST33 I2C BUILD STUFF
        ...
      33673dcb
    • David Howells's avatar
      KEYS: Revert one application of "Fix unreachable code" patch · fe9453a1
      David Howells authored
      A patch to fix some unreachable code in search_my_process_keyrings() got
      applied twice by two different routes upstream as commits e67eab39
      and b010520a (both "fix unreachable code").
      
      Unfortunately, the second application removed something it shouldn't
      have and this wasn't detected by GIT.  This is due to the patch not
      having sufficient lines of context to distinguish the two places of
      application.
      
      The effect of this is relatively minor: inside the kernel, the keyring
      search routines may search multiple keyrings and then prioritise the
      errors if no keys or negative keys are found in any of them.  With the
      extra deletion, the presence of a negative key in the thread keyring
      (causing ENOKEY) is incorrectly overridden by an error searching the
      process keyring.
      
      So revert the second application of the patch.
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Cc: Jiri Kosina <jkosina@suse.cz>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fe9453a1
    • Pawel Moll's avatar
      ALSA: usb: Fix Processing Unit Descriptor parsers · b531f81b
      Pawel Moll authored
      Commit 99fc8645 "ALSA: usb-mixer:
      parse descriptors with structs" introduced a set of useful parsers
      for descriptors. Unfortunately the parses for the Processing Unit
      Descriptor came with a very subtle bug...
      
      Functions uac_processing_unit_iProcessing() and
      uac_processing_unit_specific() were indexing the baSourceID array
      forgetting the fields before the iProcessing and process-specific
      descriptors.
      
      The problem was observed with Sound Blaster Extigy mixer,
      where nNrModes in Up/Down-mix Processing Unit Descriptor
      was accessed at offset 10 of the descriptor (value 0)
      instead of offset 15 (value 7). In result the resulting
      control had interesting limit values:
      
      Simple mixer control 'Channel Routing Mode Select',0
        Capabilities: volume volume-joined penum
        Playback channels: Mono
        Capture channels: Mono
        Limits: 0 - -1
        Mono: -1 [100%]
      
      Fixed by starting from the bmControls, which was calculated
      correctly, instead of baSourceID.
      
      Now the mentioned control is fine:
      
      Simple mixer control 'Channel Routing Mode Select',0
        Capabilities: volume volume-joined penum
        Playback channels: Mono
        Capture channels: Mono
        Limits: 0 - 6
        Mono: 0 [0%]
      Signed-off-by: default avatarPawel Moll <mail@pawelmoll.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      b531f81b
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · a0b1c429
      Linus Torvalds authored
      Pull networking update from David Miller:
      
       1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
          timestamp offset.  From Andrey Vagin.
      
       2) VMWARE VM VSOCK layer, from Andy King.
      
       3) Much improved support for virtual functions and SR-IOV in bnx2x,
          from Ariel ELior.
      
       4) All protocols on ipv4 and ipv6 are now network namespace aware, and
          all the compatability checks for initial-namespace-only protocols is
          removed.  Thanks to Tom Parkin for helping deal with the last major
          holdout, L2TP.
      
       5) IPV6 support in netpoll and network namespace support in pktgen,
          from Cong Wang.
      
       6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
          Protocol (MVRP) support, from David Ward.
      
       7) Compute packet lengths more accurately in the packet scheduler, from
          Eric Dumazet.
      
       8) Use per-task page fragment allocator in skb_append_datato_frags(),
          also from Eric Dumazet.
      
       9) Add support for connection tracking labels in netfilter, from
          Florian Westphal.
      
      10) Fix default multicast group joining on ipv6, and add anti-spoofing
          checks to 6to4 and 6rd.  From Hannes Frederic Sowa.
      
      11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
          times, rearrange inet frag datastructures for better cacheline
          locality, and move more operations outside of locking.  From Jesper
          Dangaard Brouer.
      
      12) Instead of strict master <--> slave relationships, allow arbitrary
          scenerios with "upper device lists".  From Jiri Pirko.
      
      13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
          Pirko.
      
      14) Add a BPF filter netfilter match target, from Willem de Bruijn.
      
      15) Orphan and delete a bunch of pre-historic networking drivers from
          Paul Gortmaker.
      
      16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
          this still needs some minor bug fixing before it's %100 correct in
          all cases.
      
      17) Handle unresolved IPSEC states like ARP, with a resolution packet
          queue.  From Steffen Klassert.
      
      18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
          Hemminger.  This was long overdue.
      
      19) Support SO_REUSEPORT, from Tom Herbert.
      
      20) Allow locking a socket BPF filter, so that it cannot change after a
          process drops capabilities.
      
      21) Add VLAN filtering to bridge, from Vlad Yasevich.
      
      22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
          the ipv6 routes, from YOSHIFUJI Hideaki.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
        ipv6: fix race condition regarding dst->expires and dst->from.
        net: fix a wrong assignment in skb_split()
        ip_gre: remove an extra dst_release()
        ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
        atl1c: restore buffer state
        net: fix a build failure when !CONFIG_PROC_FS
        net: ipv4: fix waring -Wunused-variable
        net: proc: fix build failed when procfs is not configured
        Revert "xen: netback: remove redundant xenvif_put"
        net: move procfs code to net/core/net-procfs.c
        qmi_wwan, cdc-ether: add ADU960S
        bonding: set sysfs device_type to 'bond'
        bonding: fix bond_release_all inconsistencies
        b44: use netdev_alloc_skb_ip_align()
        xen: netback: remove redundant xenvif_put
        net: fec: Do a sanity check on the gpio number
        ip_gre: propogate target device GSO capability to the tunnel device
        ip_gre: allow CSUM capable devices to handle packets
        bonding: Fix initialize after use for 3ad machine state spinlock
        bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
        ...
      a0b1c429
  2. 20 Feb, 2013 26 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 8ec49422
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "Mostly more sparc64 THP bug fixes, and a refactoring of SMP bootup on
        sparc32 from Sam Ravnborg."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc32: refactor smp boot
        sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler.
        sparc64: Fix tsb_grow() in atomic context.
        sparc64: Handle hugepage TSB being NULL.
        sparc64: Fix gfp_flags setting in tsb_grow().
      8ec49422
    • Linus Torvalds's avatar
      Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 79a69d34
      Linus Torvalds authored
      Pull arm64 patches from Catalin Marinas:
      
       - SMP support for the PSCI booting protocol (power state coordination
         interface).
      
       - Simple earlyprintk support.
      
       - Platform devices populated by default from the DT (SoC-agnostic).
      
       - CONTEXTIDR support (used by external trace tools).
      
      * tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: update CONTEXTIDR register to contain PID of current process
        arm64: atomics: fix grossly inconsistent asm constraints for exclusives
        arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
        arm64: Select ARCH_WANT_FRAME_POINTERS
        arm64: Add kvm_para.h and xor.h generic headers
        arm64: SMP: enable PSCI boot method
        arm64: psci: add support for PSCI invocations from the kernel
        arm64: SMP: rework the SMP code to be enabling method agnostic
        arm64: perf: add guest vs host discrimination
        arm64: add COMPAT_PSR_*_BIT flags
        arm64: Add simple earlyprintk support
        arm64: Populate the platform devices
      79a69d34
    • Linus Torvalds's avatar
      Merge branch 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm · 6db167df
      Linus Torvalds authored
      Pull ARM updates (part two) from Russell King:
      
       - breakpoint and perf updates from Will Deacon.
      
       - hypervisor boot mode updates from Will.
      
       - support for Power State Coordination Interface via the Hypervisor
      
       - core ARM support for KVM
      
      * 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm: (32 commits)
        KVM: ARM: Add maintainer entry for KVM/ARM
        KVM: ARM: Power State Coordination Interface implementation
        KVM: ARM: Handle I/O aborts
        KVM: ARM: Handle guest faults in KVM
        KVM: ARM: VFP userspace interface
        KVM: ARM: Demux CCSIDR in the userspace API
        KVM: ARM: User space API for getting/setting co-proc registers
        KVM: ARM: Emulation framework and CP15 emulation
        KVM: ARM: World-switch implementation
        KVM: ARM: Inject IRQs and FIQs from userspace
        KVM: ARM: Memory virtualization setup
        KVM: ARM: Hypervisor initialization
        KVM: ARM: Initial skeleton to compile KVM support
        ARM: Section based HYP idmap
        ARM: Add page table and page defines needed by KVM
        ARM: perf: simplify __hw_perf_event_init err handling
        ARM: perf: remove unnecessary checks for idx < 0
        ARM: perf: handle armpmu_register failing
        ARM: perf: don't pretend to support counting of L1I writes
        ARM: perf: remove redundant NULL check on cpu_pmu
        ...
      6db167df
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm · 32f9aab8
      Linus Torvalds authored
      Pull ARM updates (part one) from Russell King:
      
       - MMC patches from Ulf Hansson and Pawel Moll.  These add support for
         DDR mode and the latest variant found on ARM Versatile Express, as
         well as a number of cleanups.
      
       - A fix for to improve the behaviour of ARMs sched_clock()
      
       - Changes to the ARM ioremap() code.  I'm not convinced with the
         primary arguments for this, but it's been around for a while, and
         people seem happy with it - and the "other" justification for this is
         at
      
            http://lkml.org/lkml/2012/12/6/184
      
       - Add SCHED_HRTICK to ARMs Kconfig
      
       - Making the ARM SHA/AES code Thumb-2 compatible
      
       - A collection of other small updates.
      
      * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (26 commits)
        ARM: add SCHED_HRTICK config option
        ARM: 7650/1: mm: replace direct access to mm->context.id with new macro
        ARM: 7649/1: mm: mm->context.id fix for big-endian
        ARM: 7648/1: pci: Allow passing per-controller private data
        ARM: 7647/1: pci: Keep pci_common_init() around after init
        ARM: fix warnings introduced by previous patch
        ARM: 7646/1: mm: use static_vm for managing static mapped areas
        ARM: 7645/1: ioremap: introduce an infrastructure for static mapped area
        ARM: 7644/1: vmregion: remove vmregion code entirely
        MAINTAINERS: Re-assert MMCI driver maintainer status
        MAINTAINERS: add additional file for MMCI driver
        MAINTAINERS: add maintainer entry for AMBA serial drivers
        ARM: 7637/1: memory: use SZ_ constants for defining the virtual memory layout
        ARM: 7643/1: sched: correct update_sched_clock()
        ARM: 7635/1: versatile: fix the PCI IRQ regression
        ARM: 7639/1: cache-l2x0: add missed dummy outer_resume entry
        ARM: 7630/1: mmc: mmci: Fixup and cleanup code for DMA handling
        ARM: 7632/1: spinlock: avoid exclusive accesses on unlock() path
        ARM: 7631/1: mmc: mmci: Add new VE MMCI variant
        ARM: 7623/1: mmc: mmci: Fixup clock gating when freq is 0 for ST-variants
        ...
      32f9aab8
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · e177bb58
      Linus Torvalds authored
      Pull m68k update from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA
        swim: Add missing spinlock init
      e177bb58
    • Sam Ravnborg's avatar
      sparc32: refactor smp boot · f9fd3488
      Sam Ravnborg authored
      Introduce a common smp_callin() function to call
      from trampoline_32.S.
      Add platform specific functions to handle the
      platform details.
      
      This is in preparation for a patch that will
      unify the smp boot stuff for all architectures.
      sparc32 was significantly different to warrant
      this patch in preparation.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
      Cc: "Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>
      Acked-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9fd3488
    • David S. Miller's avatar
      sparc64: Fix huge PMD to PTE translation for sun4u in TLB miss handler. · 76968ad2
      David S. Miller authored
      When we set the sun4u version of the PTE execute bit, it's:
      
      	or	REG, _PAGE_EXEC_4U, REG
      
      _PAGE_EXEC_4U is 0x1000, unfortunately the immedate field of the
      'or' instruction is a signed 13-bit value.  So the above actually
      assembles into:
      
      	or	REG, -4096, REG
      
      completely corrupting the final PTE value.
      
      Set it with a:
      
      	sethi	%hi(_PAGE_EXEC_4U), TMP
      	or	REG, TMP, REG
      
      sequence instead.
      
      This fixes "git gc" crashes on sun4u machines.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      76968ad2
    • YOSHIFUJI Hideaki / 吉藤英明's avatar
      ipv6: fix race condition regarding dst->expires and dst->from. · ecd98837
      YOSHIFUJI Hideaki / 吉藤英明 authored
      Eric Dumazet wrote:
      | Some strange crashes happen in rt6_check_expired(), with access
      | to random addresses.
      |
      | At first glance, it looks like the RTF_EXPIRES and
      | stuff added in commit 1716a961
      | (ipv6: fix problem with expired dst cache)
      | are racy : same dst could be manipulated at the same time
      | on different cpus.
      |
      | At some point, our stack believes rt->dst.from contains a dst pointer,
      | while its really a jiffie value (as rt->dst.expires shares the same area
      | of memory)
      |
      | rt6_update_expires() should be fixed, or am I missing something ?
      |
      | CC Neil because of https://bugzilla.redhat.com/show_bug.cgi?id=892060
      
      Because we do not have any locks for dst_entry, we cannot change
      essential structure in the entry; e.g., we cannot change reference
      to other entity.
      
      To fix this issue, split 'from' and 'expires' field in dst_entry
      out of union.  Once it is 'from' is assigned in the constructor,
      keep the reference until the very last stage of the life time of
      the object.
      
      Of course, it is unsafe to change 'from', so make rt6_set_from simple
      just for fresh entries.
      Reported-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
      Reported-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      CC: Gao Feng <gaofeng@cn.fujitsu.com>
      Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
      Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
      Reported-by: default avatarSteinar H. Gunderson <sesse@google.com>
      Reviewed-by: default avatarNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ecd98837
    • Amerigo Wang's avatar
      net: fix a wrong assignment in skb_split() · 68534c68
      Amerigo Wang authored
      commit c9af6db4 (net: Fix possible wrong checksum generation)
      has a suspicous piece:
      
      	-       skb_shinfo(skb1)->gso_type = skb_shinfo(skb)->gso_type;
      	-
      	+       skb_shinfo(skb)->tx_flags = skb_shinfo(skb1)->tx_flags & SKBTX_SHARED_FRAG;
      
      skb1 is the new skb, therefore should be on the left side of the assignment.
      This patch fixes it.
      
      Cc: Pravin B Shelar <pshelar@nicira.com>
      Cc: David S. Miller <davem@davemloft.net>
      Signed-off-by: default avatarCong Wang <amwang@redhat.com>
      Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      68534c68
    • Linus Torvalds's avatar
      Merge tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 55529fa5
      Linus Torvalds authored
      Pull EDAC updates from Borislav Petkov:
       "Mostly AMD's side of EDAC.  It is basically a new family enablement
        stuff: AMD F16h MCE decoding enablement from Jacob Shin.  The rest is
        trivial cleanups."
      
      * tag 'edac_3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Fix typo
        EDAC, MCE, AMD: Remove unneeded exports
        EDAC, MCE, AMD: Add MCE decoding support for Family 16h
        EDAC, MCE, AMD: Make MC2 decoding per-family
        amd64_edac: Remove dead code
      55529fa5
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8793422f
      Linus Torvalds authored
      Pull ACPI and power management updates from Rafael Wysocki:
      
       - Rework of the ACPI namespace scanning code from Rafael J.  Wysocki
         with contributions from Bjorn Helgaas, Jiang Liu, Mika Westerberg,
         Toshi Kani, and Yinghai Lu.
      
       - ACPI power resources handling and ACPI device PM update from Rafael
         J Wysocki.
      
       - ACPICA update to version 20130117 from Bob Moore and Lv Zheng with
         contributions from Aaron Lu, Chao Guan, Jesper Juhl, and Tim Gardner.
      
       - Support for Intel Lynxpoint LPSS from Mika Westerberg.
      
       - cpuidle update from Len Brown including Intel Haswell support, C1
         state for intel_idle, removal of global pm_idle.
      
       - cpuidle fixes and cleanups from Daniel Lezcano.
      
       - cpufreq fixes and cleanups from Viresh Kumar and Fabio Baltieri with
         contributions from Stratos Karafotis and Rickard Andersson.
      
       - Intel P-states driver for Sandy Bridge processors from Dirk
         Brandewie.
      
       - cpufreq driver for Marvell Kirkwood SoCs from Andrew Lunn.
      
       - cpufreq fixes related to ordering issues between acpi-cpufreq and
         powernow-k8 from Borislav Petkov and Matthew Garrett.
      
       - cpufreq support for Calxeda Highbank processors from Mark Langsdorf
         and Rob Herring.
      
       - cpufreq driver for the Freescale i.MX6Q SoC and cpufreq-cpu0 update
         from Shawn Guo.
      
       - cpufreq Exynos fixes and cleanups from Jonghwan Choi, Sachin Kamat,
         and Inderpal Singh.
      
       - Support for "lightweight suspend" from Zhang Rui.
      
       - Removal of the deprecated power trace API from Paul Gortmaker.
      
       - Assorted updates from Andreas Fleig, Colin Ian King, Davidlohr Bueso,
         Joseph Salisbury, Kees Cook, Li Fei, Nishanth Menon, ShuoX Liu,
         Srinivas Pandruvada, Tejun Heo, Thomas Renninger, and Yasuaki
         Ishimatsu.
      
      * tag 'pm+acpi-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (267 commits)
        PM idle: remove global declaration of pm_idle
        unicore32 idle: delete stray pm_idle comment
        openrisc idle: delete pm_idle
        mn10300 idle: delete pm_idle
        microblaze idle: delete pm_idle
        m32r idle: delete pm_idle, and other dead idle code
        ia64 idle: delete pm_idle
        cris idle: delete idle and pm_idle
        ARM64 idle: delete pm_idle
        ARM idle: delete pm_idle
        blackfin idle: delete pm_idle
        sparc idle: rename pm_idle to sparc_idle
        sh idle: rename global pm_idle to static sh_idle
        x86 idle: rename global pm_idle to static x86_idle
        APM idle: register apm_cpu_idle via cpuidle
        cpufreq / intel_pstate: Add kernel command line option disable intel_pstate.
        cpufreq / intel_pstate: Change to disallow module build
        tools/power turbostat: display SMI count by default
        intel_idle: export both C1 and C1E
        ACPI / hotplug: Fix concurrency issues and memory leaks
        ...
      8793422f
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · b3cdda2b
      Linus Torvalds authored
      Pull device tree changes from Grant Likely:
       "All around device tree changes destined for v3.8.  Aside from the
        documentation updates the highlights in this branch include:
      
         - Kbuild changes for using CPP with .dts files
         - locking fix from preempt_rt patchset
         - include DT alias names in device uevent
         - Selftest bugfixes and improvements
         - New function for counting phandles stanzas in a property
         - constify argument to of_node_full_name()
         - Various bug fixes
      
        This tree did also contain a commit to use platform_device_add instead
        of open-coding the device add code, but it caused problems with amba
        devices and needed to be reverted."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
        Revert "of: use platform_device_add"
        kbuild: limit dtc+cpp include path
        gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
        of: Create function for counting number of phandles in a property
        of/base: Clean up exit paths for of_parse_phandle_with_args()
        of/selftest: Use selftest() macro throughout
        of/selftest: Fix GPIOs selftest to cover the 7th case
        of: fix recursive locking in of_get_next_available_child()
        documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
        OF: convert devtree lock from rw_lock to raw spinlock
        of/exynos_g2d: Add Bindings for exynos G2D driver
        kbuild: create a rule to run the pre-processor on *.dts files
        input: Extend matrix-keypad device tree binding
        devicetree: Move NS2 LEDs binding into LEDs directory
        of: use platform_device_add
        powerpc/5200: Fix size to request_mem_region() call
        documentation/devicetree: Fix typos
        of: add 'const' to of_node_full_name parameter
        of: Output devicetree alias names in uevent
        DT: add vendor prefixes for Renesas and Toshiba
        ...
      b3cdda2b
    • Linus Torvalds's avatar
      Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux · 3aad3f03
      Linus Torvalds authored
      Pull SPI changes from Grant Likely:
       "Changes to both core spi code and spi device drivers.  The driver
        changes are the usual set of bug fixes and platform enablement.
      
        Core code changes include:
      
         - More intelligent assignment of SPI bus numbers when using DT
      
         - Common mechanism for using gpios as CS lines
      
         - Pull checks for bits_per_word and transfer speed out of drivers and
           into core code
      
         - Ensure temporary DMA buffers are DMA safe"
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux: (50 commits)
        spi: Document cs_gpios and cs_gpio in kernel-doc
        spi/of: Fix initialization of cs_gpios array
        spi/pxa2xx: add support for Lynxpoint SPI controllers
        spi/pxa2xx: add support for Intel Low Power Subsystem SPI
        spi/pxa2xx: add support for SPI_LOOP
        spi/pxa2xx: add support for runtime PM
        spi/pxa2xx: add support for DMA engine
        spi/pxa2xx: break out the private DMA API usage into a separate file
        spi/ath79: add shutdown handler
        spi/mips-lantiq: set SPI_MASTER_HALF_DUPLEX flag
        spi/mips-lantiq: make use of spi_finalize_current_message
        spi/bcm63xx: work around inability to keep CS up
        spi/davinci: use request_threaded_irq() to fix deadlock
        spi/orion: Use module_platform_driver()
        spi/bcm63xx: reject transfers unable to transfer
        spi: Ensure memory used for spi_write_then_read() is DMA safe
        spi/spi-mpc512x-psc: init mode bits supported by the driver
        spi/mpc512x-psc: don't use obsolet cell-index property
        spi: Remove erroneous __init, __exit and __exit_p() references in drivers
        spi/s3c64xx: fix checkpatch warnings and error
        ...
      3aad3f03
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 10b6339e
      Linus Torvalds authored
      Pull clock framework update from Michael Turquette:
       "The common clock framework changes for 3.9 are almost entirely fixes.
      
        None are dire enough to be Cc'd to stable which may be interpreted to
        mean that users of the framework are reaching stability.  Lots of new
        adoption of this framework is via DeviceTree data and that comes
        through the respective architecture and platform trees instead of
        through the clk framework tree.
      
        Two new features are improved debugfs output and an improvement to how
        DT clocks are initialized by reusing a common method."
      
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (25 commits)
        clk: sunxi: remove stale Makefile entry
        clk: vexpress: Use common of_clk_init() function
        clk: zynq: Use common of_clk_init() function
        clk: vt8500: Use common of_clk_init() function
        clk: highbank: Use common of_clk_init() function
        clk: sunxi: Use common of_clk_init() function
        clk: add common of_clk_init() function
        clk: Deduplicate exit code in clk_set_rate
        clk: beautify Makefile
        clk-divider: fix macros
        clk: prima2: enable dt-binding clkdev mapping
        clk: mxs: Index is always positive
        clk: max77686: Avoid double free at remove time
        clk: remove exported function from __init section
        clk: vt8500: Add support for WM8750/WM8850 PLL clocks
        clk: vt8500: Fix division-by-0 when requested rate=0
        clk: vt8500: Fix device clock divisor calculations
        clk: vt8500: Fix error in PLL calculations on non-exact match.
        clk: max77686: Remove unnecessary NULL checking for container_of()
        clk: JSON debugfs clock tree summary
        ...
      10b6339e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c6699b58
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "Two new touchpad drivers - Cypress APA I2C Trackpad and Cypress PS/2
        touchpad and a big update to ALPS driver from Kevin Cernekee that adds
        support for "Rushmore" touchpads and paves way for adding support for
        "Dolphin" touchpads.
      
        There is also a new input driver for Goldfish emulator and also
        Android keyreset driver was folded into SysRq code.
      
        A few more drivers were updated with device tree bindings and others
        got some small cleanups and fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
        Input: cyttsp-spi - remove duplicate MODULE_ALIAS()
        Input: tsc2005 - add MODULE_ALIAS
        Input: tegra-kbc - require CONFIG_OF, remove platform data
        Input: synaptics - initialize pointer emulation usage
        Input: MT - do not apply filtering on emulated events
        Input: bma150 - make some defines public and fix some comments
        Input: bma150 - fix checking pm_runtime_get_sync() return value
        Input: ALPS - enable trackstick on Rushmore touchpads
        Input: ALPS - add support for "Rushmore" touchpads
        Input: ALPS - make the V3 packet field decoder "pluggable"
        Input: ALPS - move pixel and bitmap info into alps_data struct
        Input: ALPS - fix command mode check
        Input: ALPS - rework detection of Pinnacle AGx touchpads
        Input: ALPS - move {addr,nibble}_command settings into alps_set_defaults()
        Input: ALPS - use function pointers for different protocol handlers
        Input: ALPS - rework detection sequence
        Input: ALPS - introduce helper function for repeated commands
        Input: ALPS - move alps_get_model() down below hw_init code
        Input: ALPS - copy "model" info into alps_data struct
        Input: ALPS - document the alps.h data structures
        ...
      c6699b58
    • Linus Torvalds's avatar
      Merge tag 'for-v3.9' of git://git.infradead.org/battery-2.6 · 5a120391
      Linus Torvalds authored
      Pull battery updates from Anton Vorontsov:
       "Four new drivers:
      
         - goldfish_battery:
      
           This is Android Emulator battery driver.  Originally from Google,
           but Intel folks reshaped it for mainline
      
         - pm2301_charger:
      
           A new driver for ST-Ericsson 2301 Power Management chip, uses
           AB8500 battery management core
      
         - qnap-poweroff:
      
           The driver adds poweroff functionality for QNAP NAS boxes
      
         - restart-poweroff:
      
           A generic driver that implements 'power off by restarting'.  The
           actual poweroff functionality is implemented through a bootloader,
           so Linux' task is just to restart the box.  The driver is useful on
           Buffalo Linkstation LS-XHL and LS-CHLv2 boards.  Andrew Lunn worked
           on submitting the driver (as well as qnap-poweroff above).
      
        Additionally:
      
         - A lot of fixes for ab8500 drivers.  This is a part of efforts of
           syncing internal ST-Ericsson development tree with the mainline.
           Lee Jones @ Linaro worked on compilation and reshaping these
           series.
      
         - New health properties for the power supplies: "Watchdog timer
           expire" and "Safety timer expire"
      
         - As usual, a bunch of fixes/cleanups here and there"
      
      * tag 'for-v3.9' of git://git.infradead.org/battery-2.6: (81 commits)
        bq2415x_charger: Add support for offline and 100mA mode
        generic-adc-battery: Fix forever loop in gab_remove()
        goldfish_battery: Add missing GENERIC_HARDIRQS dependency
        da9030_battery: Include notifier.h
        bq27x00_battery: Fix reporting battery temperature
        power/reset: Remove newly introduced __dev* annotations
        lp8727_charger: Small cleanup in naming
        ab8500_btemp: Demote initcall sequence
        ds2782_battery: Add power_supply_changed() calls for proper uevent support
        power: Add battery driver for goldfish emulator
        u8500-charger: Delay for USB enumeration
        ab8500-bm: Remove individual [charger|btemp|fg|chargalg] pdata structures
        ab8500-charger: Do not touch VBUSOVV bits
        ab8500-fg: Use correct battery charge full design
        pm2301: LPN mode control support
        pm2301: Enable vbat low monitoring
        ab8500-bm: Flush all work queues before suspending
        ab8500-fg: Go to INIT_RECOVERY when charger removed
        ab8500-charger: Add support for autopower on AB8505 and AB9540
        abx500-chargalg: Add new sysfs interface to get current charge status
        ...
      
      Fix up fairly straightforward conflicts in the ab8500 driver.  But since
      it seems to be ARM-specific, I can't even compile-test the result..
      5a120391
    • David S. Miller's avatar
      sparc64: Fix tsb_grow() in atomic context. · 0fbebed6
      David S. Miller authored
      If our first THP installation for an MM is via the set_pmd_at() done
      during khugepaged's collapsing we'll end up in tsb_grow() trying to do
      a GFP_KERNEL allocation with several locks held.
      
      Simply using GFP_ATOMIC in this situation is not the best option
      because we really can't have this fail, so we'd really like to keep
      this an order 0 GFP_KERNEL allocation if possible.
      
      Also, doing the TSB allocation from khugepaged is a really bad idea
      because we'll allocate it potentially from the wrong NUMA node in that
      context.
      
      So what we do is defer the hugepage TSB allocation until the first TLB
      miss we take on a hugepage.  This is slightly tricky because we have
      to handle two unusual cases:
      
      1) Taking the first hugepage TLB miss in the window trap handler.
         We'll call the winfix_trampoline when that is detected.
      
      2) An initial TSB allocation via TLB miss races with a hugetlb
         fault on another cpu running the same MM.  We handle this by
         unconditionally loading the TSB we see into the current cpu
         even if it's non-NULL at hugetlb_setup time.
      Reported-by: default avatarMeelis Roos <mroos@ut.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fbebed6
    • David S. Miller's avatar
      sparc64: Handle hugepage TSB being NULL. · bcd896ba
      David S. Miller authored
      Accomodate the possibility that the TSB might be NULL at
      the point that update_mmu_cache() is invoked.  This is
      necessary because we will sometimes need to defer the TSB
      allocation to the first fault that happens in the 'mm'.
      
      Seperate out the hugepage PTE test into a seperate function
      so that the logic is clearer.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bcd896ba
    • David S. Miller's avatar
      sparc64: Fix gfp_flags setting in tsb_grow(). · a55ee1ff
      David S. Miller authored
      We should "|= more_flags" rather than "= more_flags".
      Reported-by: default avatarDavid Rientjes <rientjes@google.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a55ee1ff
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · c560dc87
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
      
       - New drivers for MAX6697 and compatibles and for INA209.
      
       - Added support for IT8771E, IT8772E, MAX34460, MAX34461, MCP98244, and
         ADT7420 to existing drivers.
      
       - Added support for additional attributes to various drivers.
      
       - Replaced SENSORS_LIMIT with clamp_val; retire SENSORS_LIMIT;
      
       - Clean up PMBus code to reduce its size; clean up adt7410 driver.
      
       - A couple of minor bug fixes as well as documentation cleanup.
      
       - Out-of-tree change: Replace SENSORS_LIMIT with clamp_val in
         platform/x86/eeepc-laptop driver.
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (32 commits)
        hwmon: (ntc_thermistor): Fix sparse warnings
        hwmon: (adt7410) Add device table entry for the adt7420
        hwmon: (adt7410) Use I2C_ADDRS helper macro
        hwmon: (adt7410) Use the SIMPLE_DEV_PM_OPS helper macro
        hwmon: (adt7410) Let suspend/resume depend on CONFIG_PM_SLEEP
        hwmon: (adt7410) Clear unwanted bits in the config register
        hwmon: (jc42) Add support for MCP98244
        hwmon: (pmbus) Clean up for code size reduction
        hwmon: (pmbus/max34440) Add support for MAX34460 and MAX34461
        hwmon: (pmbus) Add support for word status register
        hwmon: (pmbus/zl6100) Add support for VMON/VDRV
        hwmon: (pmbus) Add function to clear sensor cache
        hwmon: (pmbus) Add support for additional voltage sensor
        hwmon: (pmbus) Use krealloc to allocate attribute memory
        hwmon: (pmbus) Simplify memory allocation for sensor attributes
        hwmon: (pmbus) Improve boolean handling
        hwmon: (pmbus) Simplify memory allocation for labels and booleans
        hwmon: (pmbus) Use dev variable to represent client->dev
        hwmon: (pmbus) Fix 'Macros with multiple statements' checkpatch error
        hwmon: (pmbus) Drop unnecessary error messages in probe error path
        ...
      c560dc87
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 8a3a11f9
      Linus Torvalds authored
      Pull pinctrl changes from Linus Walleij:
       "These are the main pinctrl changes for the v3.9 merge window.  The
        most interesting change by far is how the device core grabs pinctrl
        default handles avoiding the need to stick boilerplate into driver
        consumers.
      
         - Grabbing of default pinctrl handles from the device core.  These
           are the hunks hitting drivers/base.  All is ACKed by Greg, after a
           long discussion about different alternatives.
      
         - Some stuff also touches the MFD and ARM SoC trees, this has been
           coordinated and ACKed.
      
         - New drivers for:
           - The Tegra 114 sub-SoC
           - Allwinner sunxi
           - New ABx500 driver and sub-SoC drivers for AB8500, AB8505, AB9540
             and AB8540.
      
         - Make it possible for hogged pins to enter a sleep mode, and make it
           possible for drivers to control that mode.
      
         - Various clean-up, extensions and device tree support to various pin
           controllers."
      
      * tag 'pinctrl-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (68 commits)
        pinctrl: tegra: add clfvs function to Tegra114 support
        pinctrl: generic: rename input schmitt disable
        pinctrl/pinconfig: add debug interface
        pinctrl: samsung: remove duplicated line
        ARM: ux500: use real AB8500 IRQ numbers instead of virtual ones
        ARM: ux500: remove irq_base property from platform_data
        pinctrl/abx500: use direct IRQ defines
        pinctrl/abx500: replace IRQ offsets with table read-in values
        pinctrl/abx500: move IRQ handling to ab8500-core
        pinctrl: exynos5440: remove erroneous __init
        pinctrl/abx500: adjust offset for get_mode()
        pinctrl/abx500: add Device Tree support
        pinctrl/abx500: align GPIO cluster boundaries
        pinctrl/abx500: prevent error path from corrupting returning error
        pinctrl: sunxi: add of_xlate function
        pinctrl/lantiq: fix pin number in ltq_pmx_gpio_request_enable
        pinctrl/lantiq: add functionality to falcon_pinconf_dbg_show
        pinctrl/lantiq: fix pinconfig parameters
        pinctrl/lantiq: one of the boot leds was defined incorrectly
        pinctrl/lantiq: only probe available pad controllers
        ...
      8a3a11f9
    • Linus Torvalds's avatar
      Merge tag 'regulator-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 8909ff65
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "A fairly quiet release for the regulator API, the bulk of the changes
        being lots of small cleanups and API updates contributed by Axel Lin
        with just a small set of larger changes:
      
         - New driver for LP8755
      
         - DT support for S5M8767, TPS51632, TPS6507x and TPS65090
      
         - Support for writing a "commit changes" bit in the regmap helper
           functions."
      
      * tag 'regulator-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (60 commits)
        regulator: Fix memory garbage dev_err printout.
        regulator: max77686: Reuse rdev_get_id() function.
        regulator: tps51632: Use regulator_[get|set]_voltage_sel_regmap
        regulator: as3711: Fix checking if no platform initialization data
        regulator: s5m8767: Prevent possible NULL pointer dereference
        regulator: s5m8767: Fix dev argument for devm_kzalloc and of_get_regulator_init_data
        regulator: core: Optimize _regulator_do_set_voltage if voltage does not change
        regulator: max8998: Let regulator core handle the case selector == old_selector
        regulator: s5m8767: Use of_get_child_count()
        regulator: anatop: improve precision of delay time
        regulator: show state for GPIO-controlled regulators
        regulator: s5m8767: Fix build in non-DT case
        regulator: add device tree support for s5m8767
        regulator: palmas: Remove a redundant setting for warm_reset
        regulator: mc13xxx: Use of_get_child_count()
        regulator: max8997: Use of_get_child_count()
        regulator: tps65090: Fix using wrong dev argument for calling of_regulator_match
        regulators: anatop: add set_voltage_time_sel interface
        regulator: Add missing of_node_put()
        regulator: tps6507x: Fix using wrong dev argument for calling of_regulator_match
        ...
      8909ff65
    • Linus Torvalds's avatar
      Merge tag 'regmap-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 88cff241
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Several nice new features and performance improvements here,
        especially the first:
      
         - Support for using the cache infrastructure without the physical
           I/O, allowing devices which don't fit the physical model regmap has
           to take advantage of the cache infrastructure, contributed by
           Andrey Smirnov.
      
         - Several small improvements to the support for wake capable IRQs.
      
         - Support for asynchronous I/O, allowing us to come much closer to
           saturating fast buses like SPI.
      
         - Support for simple array caches, giving higher performance for use
           with MMIO devices.
      
         - Restoration of the use of bulk reads for handling interrupts,
           giving a performance improvement.
      
         - Support for 24 bit register addresses.
      
         - More performance improvements for debugfs."
      
      * tag 'regmap-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (24 commits)
        regmap: mmio: add register clock support
        regmap: debugfs: Factor out debugfs_tot_len calc into a function
        regmap: debugfs: Optimize seeking within blocks of registers
        regmap: debugfs: Add a `max_reg' member in struct regmap_debugfs_off_cache
        regmap: debugfs: Fix reading in register field units
        regmap: spi: Handle allocation failures gracefully
        regmap: Export regmap_async_complete()
        regmap: Export regmap_async_complete_cb
        regmap: include linux/sched.h to fix build
        regmap: spi: Support asynchronous I/O for SPI
        regmap: Add asynchronous I/O support
        regmap: Add "no-bus" option for regmap API
        regmap: regmap: avoid spurious warning in regmap_read_debugfs
        regmap: Add provisions to have user-defined write operation
        regmap: Add provisions to have user-defined read operation
        regmap: Add support for 24 bit wide register addresses
        mfd: wm5110: Mark wakes as inverted
        mfd: wm5102: Mark wakes as inverted
        regmap: irq: Support wake IRQ mask inversion
        regmap: irq: Fix sync of wake statuses to hardware
        ...
      88cff241
    • Linus Torvalds's avatar
      Merge branch 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 9ae46e67
      Linus Torvalds authored
      Pull cpuset changes from Tejun Heo:
      
       - Synchornization has seen a lot of changes with focus on decoupling
         cpuset synchronization from cgroup internal locking.
      
         After this change, there only remain a couple of mostly trivial
         dependencies on cgroup_lock outside cgroup core proper.  cgroup_lock
         is scheduled to be unexported in this devel cycle.
      
         This will finally remove the fragile locking order around cgroup
         (cgroup locking wants to / should be one of the outermost but yet has
         been acquired from deep inside individual controllers).
      
       - At this point, Li is most knowlegeable with cpuset and taking over
         the maintainership of cpuset.
      
      * 'for-3.9-cpuset' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cpuset: drop spurious retval assignment in proc_cpuset_show()
        cpuset: fix RCU lockdep splat
        cpuset: update MAINTAINERS
        cpuset: remove cpuset->parent
        cpuset: replace cpuset->stack_list with cpuset_for_each_descendant_pre()
        cpuset: replace cgroup_mutex locking with cpuset internal locking
        cpuset: schedule hotplug propagation from cpuset_attach() if the cpuset is empty
        cpuset: pin down cpus and mems while a task is being attached
        cpuset: make CPU / memory hotplug propagation asynchronous
        cpuset: drop async_rebuild_sched_domains()
        cpuset: don't nest cgroup_mutex inside get_online_cpus()
        cpuset: reorganize CPU / memory hotplug handling
        cpuset: cleanup cpuset[_can]_attach()
        cpuset: introduce cpuset_for_each_child()
        cpuset: introduce CS_ONLINE
        cpuset: introduce ->css_on/offline()
        cpuset: remove fast exit path from remove_tasks_in_empty_cpuset()
        cpuset: remove unused cpuset_unlock()
      9ae46e67
    • Linus Torvalds's avatar
      Merge branch 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 502b24c2
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "Nothing too drastic.
      
         - Removal of synchronize_rcu() from userland visible paths.
      
         - Various fixes and cleanups from Li.
      
         - cgroup_rightmost_descendant() added which will be used by cpuset
           changes (it will be a separate pull request)."
      
      * 'for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fail if monitored file and event_control are in different cgroup
        cgroup: fix cgroup_rmdir() vs close(eventfd) race
        cpuset: fix cpuset_print_task_mems_allowed() vs rename() race
        cgroup: fix exit() vs rmdir() race
        cgroup: remove bogus comments in cgroup_diput()
        cgroup: remove synchronize_rcu() from cgroup_diput()
        cgroup: remove duplicate RCU free on struct cgroup
        sched: remove redundant NULL cgroup check in task_group_path()
        sched: split out css_online/css_offline from tg creation/destruction
        cgroup: initialize cgrp->dentry before css_alloc()
        cgroup: remove a NULL check in cgroup_exit()
        cgroup: fix bogus kernel warnings when cgroup_create() failed
        cgroup: remove synchronize_rcu() from rebind_subsystems()
        cgroup: remove synchronize_rcu() from cgroup_attach_{task|proc}()
        cgroup: use new hashtable implementation
        cgroups: fix cgroup_event_listener error handling
        cgroups: move cgroup_event_listener.c to tools/cgroup
        cgroup: implement cgroup_rightmost_descendant()
        cgroup: remove unused dummy cgroup_fork_callbacks()
      502b24c2
    • Russell King's avatar
      Merge branch 'misc' into for-linus · 1b1c7409
      Russell King authored
      Conflicts:
      	arch/arm/include/asm/memory.h
      1b1c7409