1. 26 Jul, 2012 5 commits
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · b84382f5
      Linus Torvalds authored
      Pull char/misc patches from Greg Kroah-Hartman:
       "Here's the "big" pull request for 3.6-rc1 for the char/misc drivers.
      
        It's really just a few updates to the mei driver, plus 4 other tiny
        patches, nothing big at all.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'char-misc-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        mei: use module_pci_driver
        powerpc/BSR: cleanup the error path of bsr_init
        mei: mei_irq_thread_write_handler - line break fix
        mei: streamline the _mei_irq_thread_close/ioctol functions
        mei: introduce mei_data2slots wrapper
        mei: mei_wd_host_init: update the comment
        mei: remove write only wariable wd_due_counter
        mei: mei_device can be const for mei register access functions
        mei: revamp host buffer interface function
        mei: don't query HCSR for host buffer depth
        mei: group wd_interface_reg with watchdog variables within struct mei_device
        mei: mei_irq_thread_write_handler check for overflow
        mei: make mei_write_message more readable
        mei: check for error codes that mei_flow_ctrl_creds retuns
        misc: at25: Parse dt settings
        misc: hpilo: increase number of max supported channels
        mei: mei.txt: minor grammar fixes
      b84382f5
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · fa93669a
      Linus Torvalds authored
      Pull driver core changes from Greg Kroah-Hartman:
       "Here's the big driver core pull request for 3.6-rc1.
      
        Unlike 3.5, this kernel should be a lot tamer, with the printk changes
        now settled down.  All we have here is some extcon driver updates, w1
        driver updates, a few printk cleanups that weren't needed for 3.5, but
        are good to have now, and some other minor fixes/changes in the driver
        core.
      
        All of these have been in the linux-next releases for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      * tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
        printk: Export struct log size and member offsets through vmcoreinfo
        Drivers: hv: Change the hex constant to a decimal constant
        driver core: don't trigger uevent after failure
        extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
        sysfs: fail dentry revalidation after namespace change fix
        sysfs: fail dentry revalidation after namespace change
        extcon: spelling of detach in function doc
        extcon: arizona: Stop microphone detection if we give up on it
        extcon: arizona: Update cable reporting calls and split headset
        PM / Runtime: Do not increment device usage counts before probing
        kmsg - do not flush partial lines when the console is busy
        kmsg - export "continuation record" flag to /dev/kmsg
        kmsg - avoid warning for CONFIG_PRINTK=n compilations
        kmsg - properly print over-long continuation lines
        driver-core: Use kobj_to_dev instead of re-implementing it
        driver-core: Move kobj_to_dev from genhd.h to device.h
        driver core: Move deferred devices to the end of dpm_list before probing
        driver core: move uevent call to driver_register
        driver core: fix shutdown races with probe/remove(v3)
        Extcon: Arizona: Add driver for Wolfson Arizona class devices
        ...
      fa93669a
    • Linus Torvalds's avatar
      Merge tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b13bc8dd
      Linus Torvalds authored
      Pull staging tree patches from Greg Kroah-Hartman:
       "Here's the big staging tree merge for the 3.6-rc1 merge window.
      
        There are some patches in here outside of drivers/staging/, notibly
        the iio code (which is still stradeling the staging / not staging
        boundry), the pstore code, and the tracing code.  All of these have
        gotten acks from the various subsystem maintainers to be included in
        this tree.  The pstore and tracing patches are related, and are coming
        here as they replace one of the android staging drivers.
      
        Otherwise, the normal staging mess.  Lots of cleanups and a few new
        drivers (some iio drivers, and the large csr wireless driver
        abomination.)
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fixed up trivial conflicts in drivers/staging/comedi/drivers/s626.h and
      drivers/staging/gdm72xx/netlink_k.c
      
      * tag 'staging-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1108 commits)
        staging: csr: delete a bunch of unused library functions
        staging: csr: remove csr_utf16.c
        staging: csr: remove csr_pmem.h
        staging: csr: remove CsrPmemAlloc
        staging: csr: remove CsrPmemFree()
        staging: csr: remove CsrMemAllocDma()
        staging: csr: remove CsrMemCalloc()
        staging: csr: remove CsrMemAlloc()
        staging: csr: remove CsrMemFree() and CsrMemFreeDma()
        staging: csr: remove csr_util.h
        staging: csr: remove CsrOffSetOf()
        stating: csr: remove unneeded #includes in csr_util.c
        staging: csr: make CsrUInt16ToHex static
        staging: csr: remove CsrMemCpy()
        staging: csr: remove CsrStrLen()
        staging: csr: remove CsrVsnprintf()
        staging: csr: remove CsrStrDup
        staging: csr: remove CsrStrChr()
        staging: csr: remove CsrStrNCmp
        staging: csr: remove CsrStrCmp
        ...
      b13bc8dd
    • Linus Torvalds's avatar
      Merge tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 9fc37779
      Linus Torvalds authored
      Pull USB patches from Greg Kroah-Hartman:
       "Here's the big USB patch set for the 3.6-rc1 merge window.
      
        Lots of little changes in here, primarily for gadget controllers and
        drivers.  There's some scsi changes that I think also went in through
        the scsi tree, but they merge just fine.  All of these patches have
        been in the linux-next tree for a while now.
      
        Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
      
      Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
      conflict that Jeff had already encountered)
      
      * tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
        usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
        usb: Add quirk detection based on interface information
        usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
        USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
        USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
        USB: notify phy when root hub port connect change
        USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
        USB: option: add ZTE MF821D
        USB: sierra: QMI mode MC7710 moved to qcserial
        USB: qcserial: adding Sierra Wireless devices
        USB: qcserial: support generic Qualcomm serial ports
        USB: qcserial: make probe more flexible
        USB: qcserial: centralize probe exit path
        USB: qcserial: consolidate usb_set_interface calls
        USB: ehci-s5p: Add support for device tree
        USB: ohci-exynos: Add support for device tree
        USB: ehci-omap: fix compile failure(v1)
        usb: host: tegra: pass correct pointer in ehci_setup()
        USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
        USB: serial: keyspan: Removed unrequired parentheses.
        ...
      9fc37779
    • Linus Torvalds's avatar
      Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · 5e23ae49
      Linus Torvalds authored
      Pull libata updates from Jeff Garzik:
       "Notable changes:
      
         - Updating libata to directly bind with ACPI / runtime power mgmt.
           This is a pre-req for SATA ZPODD (CD-ROM power management).
      
           Touches ACPI (exports++) and SCSI in minor ways.  Has been in
           linux-next for weeks.
      
           The rest of this should come via SCSI tree, as it involves a lot of
           updates to the 'sr' driver etc.
      
        Other, minor changes:
      
         - module_pci_driver() removes a lot of common boilerplate from each
           PCI driver
      
         - minor coding style, whitespace cleanups
      
         - pata_pcmcia bug fix, caught by Coccinelle
      
         - pata_imx, sata_dwc_460ex minor vendor updates
      
         - ahci_platform: use simple PM ops, and thereby add hibernation cb's
      
         - Add a few device-specific quirks"
      
      * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
        [libata] pata_cmd64x: whitespace cleanup
        libata-acpi: fix up for acpi_pm_device_sleep_state API
        sata_dwc_460ex: device tree may specify dma_channel
        ahci, trivial: fixed coding style issues related to braces
        ahci_platform: add hibernation callbacks
        libata-eh.c: local functions should not be exposed globally
        libata-transport.c: local functions should not be exposed globally
        sata_dwc_460ex: support hardreset
        ata: use module_pci_driver
        drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
        pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
        ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
        [libata] Prevent interface errors with Seagate FreeAgent GoFlex
        drivers/acpi/glue: revert accidental license-related 6b66d958 bits
        libata-acpi: add missing inlines in libata.h
        libata: tell scsi layer device supports runtime power off
        libata: detect Device Attention support
        libata-acpi: register/unregister device to/from power resource
        libata-acpi: add ata port runtime D3Cold support
        libata-acpi: set acpi state for SATA port
        ...
      5e23ae49
  2. 25 Jul, 2012 23 commits
    • Jeff Garzik's avatar
      [libata] pata_cmd64x: whitespace cleanup · 641589bf
      Jeff Garzik authored
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      641589bf
    • Stephen Rothwell's avatar
      libata-acpi: fix up for acpi_pm_device_sleep_state API · 354b2eac
      Stephen Rothwell authored
      After merging the libata tree, today's [2012-07-01] linux-next build (x86_64
      allmodconfig) failed like this:
      
      drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state':
      drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state'
      include/acpi/acpi_bus.h:418:5: note: declared here
      
      Caused by commit 3bd46600 ("libata-acpi: add ata port runtime D3Cold
      support") from the libata tree interacting with commit ee85f543
      ("ACPI/PM: specify lowest allowed state for device sleep state") from the
      pci tree.
      
      This patch adds ACPI_STATE_D3 as the new third parameter to
      acpi_pm_device_sleep_state()
      Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      354b2eac
    • Jeff Garzik's avatar
      Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream · 8407884d
      Jeff Garzik authored
      Two bits were appended to the end of the bitfield
      list in struct scsi_device.  Resolve that conflict
      by including both bits.
      
      Conflicts:
      	include/scsi/scsi_device.h
      8407884d
    • Thang Q. Nguyen's avatar
      sata_dwc_460ex: device tree may specify dma_channel · dc7f71f4
      Thang Q. Nguyen authored
      Only channel 0 is currently support and the driver code is fixed on
      channel 0. This patch lets device node specifying dma-channel in case
      it is not 0. If no dma-channel property is specified, channel 0 is
      used as default.
      Signed-off-by: default avatarThang Q. Nguyen <tqnguyen@apm.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      dc7f71f4
    • Jeffrin Jose's avatar
      ahci, trivial: fixed coding style issues related to braces · facb8fa6
      Jeffrin Jose authored
      Fixed coding style issues related to braces found
      by checkpatch.pl in drivers/ata/ahci.c
      Signed-off-by: default avatarJeffrin Jose <ahiliation@yahoo.co.in>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      facb8fa6
    • Shiraz Hashim's avatar
      ahci_platform: add hibernation callbacks · 18c25ff4
      Shiraz Hashim authored
      Use existing suspend, resume implementation for hibernation callbacks.
      Signed-off-by: default avatarShiraz Hashim <shiraz.hashim@st.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      18c25ff4
    • H Hartley Sweeten's avatar
      libata-eh.c: local functions should not be exposed globally · 60428407
      H Hartley Sweeten authored
      The function ata_ering_clear_cb is only referenced in this file and
      should be marked static to prevent it from being exposed globally.
      
      This quiets the sparse warning:
      
      warning: symbol 'ata_ering_clear_cb' was not declared. Should it be static?
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      60428407
    • H Hartley Sweeten's avatar
      libata-transport.c: local functions should not be exposed globally · b0e73af7
      H Hartley Sweeten authored
      Functions not referenced outside of a source file should be marked
      static to prevent it from being exposed globally.
      
      This quiets the sparse warnings:
      
      warning: symbol 'ata_is_port' was not declared. Should it be static?
      warning: symbol 'ata_is_link' was not declared. Should it be static?
      warning: symbol 'ata_is_ata_dev' was not declared. Should it be static?
      Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      b0e73af7
    • Thang Q. Nguyen's avatar
      sata_dwc_460ex: support hardreset · 3a8b788f
      Thang Q. Nguyen authored
      The hardreset operation is currently not supported. This causes
      sometime the SATA driver does cause kernel crash because of
      none-determined state.a This patch will fix the issue.
      Signed-off-by: default avatarThang Q. Nguyen <tqnguyen@apm.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      3a8b788f
    • Axel Lin's avatar
      ata: use module_pci_driver · 2fc75da0
      Axel Lin authored
      This patch converts the drivers in drivers/ata/* to use module_pci_driver()
      macro which makes the code smaller and a bit simpler.
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Cc: Alan Cox <alan@linux.intel.com>
      Cc: Jeff Garzik <jgarzik@pobox.com>
      Cc: Mikael Pettersson <mikpe@it.uu.se>
      Cc: Mark Lord <kernel@teksavvy.com>
      Cc: Jeremy Higdon <jeremy@sgi.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      2fc75da0
    • Julia Lawall's avatar
      drivers/ata/pata_pcmcia.c: adjust suspicious bit operation · b08f5bc4
      Julia Lawall authored
      IO_DATA_PATH_WIDTH_8 is 0, so a bit-and with it is always false.  The
      value IO_DATA_PATH_WIDTH covers the bits of the IO_DATA_PATH constants, so
      first pick those bits and then make the test using !=.
      
      This problem was found using Coccinelle (http://coccinelle.lip6.fr/).
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      b08f5bc4
    • Fabio Estevam's avatar
      pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare · a18dada0
      Fabio Estevam authored
      With the new i.mx clock framework, we need to use
      clk_prepare_enable/clk_disable_unprepare.
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      a18dada0
    • Mark Nelson's avatar
      ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2 · ff0173c1
      Mark Nelson authored
      Like e65cc194 (ahci: Enable SB600 64bit
      DMA on MSI K9A2 Platinum) and 3c4aa91f
      (ahci: Enable SB600 64bit DMA on Asus M3A), this patch enables 64bit DMA
      for the AHCI SATA controller of another board that has the SB600
      southbridge.
      
      In this case though we're enabling 64bit DMA for another MSI motherboard,
      the K9AGM2 or MS-7327. It is new enough that all of the BIOS releases
      since the initial release (1.0 from 2007-02-09) work correctly with 64bit
      DMA enabled.
      Signed-off-by: default avatarMark Nelson <mdnelson8@gmail.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      ff0173c1
    • Daniel J Blueman's avatar
      [libata] Prevent interface errors with Seagate FreeAgent GoFlex · c531077f
      Daniel J Blueman authored
      When using my Seagate FreeAgent GoFlex eSATAp external disk enclosure,
      interface errors are always seen until 1.5Gbps is negotiated [1]. This
      occurs using any disk in the enclosure, and when the disk is connected
      directly with a generic passive eSATAp cable, we see stable 3Gbps
      operation as expected.
      
      Blacklist 3Gbps mode to avoid dataloss and the ~30s delay bus reset
      and renegotiation incurs.
      Signed-off-by: default avatarDaniel J Blueman <daniel@quora.org>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      c531077f
    • Jeff Garzik's avatar
      drivers/acpi/glue: revert accidental license-related 6b66d958 bits · 91e4d5a1
      Jeff Garzik authored
      Commit 6b66d958 should not have changed
      EXPORT_SYMBOL_GPL to EXPORT_SYMBOL.
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      91e4d5a1
    • Lin Ming's avatar
      libata-acpi: add missing inlines in libata.h · e91df93e
      Lin Ming authored
      Adds inline for ata_acpi_unregister/ata_acpi_bind/ata_acpi_unbind
      in drivers/ata/libata.h for !CONFIG_ATA_ACPI to fix below warnings.
      
      warning: 'ata_acpi_unregister' defined but not used [-Wunused-function]
      warning: 'ata_acpi_bind' defined but not used [-Wunused-function]
      warning: 'ata_acpi_unbind' defined but not used [-Wunused-function]
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      e91df93e
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · bdc0077a
      Linus Torvalds authored
      Pull first round of SCSI updates from James Bottomley:
       "The most important feature of this patch set is the new async
        infrastructure that makes sure async_synchronize_full() synchronizes
        all domains and allows us to remove all the hacks (like having
        scsi_complete_async_scans() in the device base code) and means that
        the async infrastructure will "just work" in future.
      
        The rest is assorted driver updates (aacraid, bnx2fc, virto-scsi,
        megaraid, bfa, lpfc, qla2xxx, qla4xxx) plus a lot of infrastructure
        work in sas and FC.
      
        Signed-off-by: James Bottomley <JBottomley@Parallels.com>"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (97 commits)
        [SCSI] Revert "[SCSI] fix async probe regression"
        [SCSI] cleanup usages of scsi_complete_async_scans
        [SCSI] queue async scan work to an async_schedule domain
        [SCSI] async: make async_synchronize_full() flush all work regardless of domain
        [SCSI] async: introduce 'async_domain' type
        [SCSI] bfa: Fix to set correct return error codes and misc cleanup.
        [SCSI] aacraid: Series 7 Async. (performance) mode support
        [SCSI] aha152x: Allow use on 64bit systems
        [SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
        [SCSI] bfa: squelch lockdep complaint with a spin_lock_init
        [SCSI] qla2xxx: remove unnecessary reads of PCI_CAP_ID_EXP
        [SCSI] qla4xxx: remove unnecessary read of PCI_CAP_ID_EXP
        [SCSI] ufs: fix incorrect return value about SUCCESS and FAILED
        [SCSI] ufs: reverse the ufshcd_is_device_present logic
        [SCSI] ufs: use module_pci_driver
        [SCSI] usb-storage: update usb devices for write cache quirk in quirk list.
        [SCSI] usb-storage: add support for write cache quirk
        [SCSI] set to WCE if usb cache quirk is present.
        [SCSI] virtio-scsi: hotplug support for virtio-scsi
        [SCSI] virtio-scsi: split scatterlist per target
        ...
      bdc0077a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · 801b0365
      Linus Torvalds authored
      Pull GFS2 updates from Steven Whitehouse.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Eliminate 64-bit divides
        GFS2: Reduce file fragmentation
        GFS2: kernel panic with small gfs2 filesystems - 1 RG
        GFS2: Fixing double brelse'ing bh allocated in gfs2_meta_read when EIO occurs
        GFS2: Combine functions get_local_rgrp and gfs2_inplace_reserve
        GFS2: Add kobject release method
        GFS2: Size seq_file buffer more carefully
        GFS2: Use seq_vprintf for glocks debugfs file
        seq_file: Add seq_vprintf function and export it
        GFS2: Use lvbs for storing rgrp information with mount option
        GFS2: Cache last hash bucket for glock seq_files
        GFS2: Increase buffer size for glocks and glstats debugfs files
        GFS2: Fix error handling when reading an invalid block from the journal
        GFS2: Add "top dir" flag support
        GFS2: Fold quota data into the reservations struct
        GFS2: Extend the life of the reservations
      801b0365
    • Linus Torvalds's avatar
      Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 614a6d43
      Linus Torvalds authored
      Pull cgroup changes from Tejun Heo:
       "Nothing too interesting.  A minor bug fix and some cleanups."
      
      * 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: Update remount documentation
        cgroup: cgroup_rm_files() was calling simple_unlink() with the wrong inode
        cgroup: Remove populate() documentation
        cgroup: remove hierarchy_mutex
      614a6d43
    • Linus Torvalds's avatar
      Merge branch 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · a08489c5
      Linus Torvalds authored
      Pull workqueue changes from Tejun Heo:
       "There are three major changes.
      
         - WQ_HIGHPRI has been reimplemented so that high priority work items
           are served by worker threads with -20 nice value from dedicated
           highpri worker pools.
      
         - CPU hotplug support has been reimplemented such that idle workers
           are kept across CPU hotplug events.  This makes CPU hotplug cheaper
           (for PM) and makes the code simpler.
      
         - flush_kthread_work() has been reimplemented so that a work item can
           be freed while executing.  This removes an annoying behavior
           difference between kthread_worker and workqueue."
      
      * 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix spurious CPU locality WARN from process_one_work()
        kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
        kthread_worker: reorganize to prepare for flush_kthread_work() reimplementation
        workqueue: simplify CPU hotplug code
        workqueue: remove CPU offline trustee
        workqueue: don't butcher idle workers on an offline CPU
        workqueue: reimplement CPU online rebinding to handle idle workers
        workqueue: drop @bind from create_worker()
        workqueue: use mutex for global_cwq manager exclusion
        workqueue: ROGUE workers are UNBOUND workers
        workqueue: drop CPU_DYING notifier operation
        workqueue: perform cpu down operations from low priority cpu_notifier()
        workqueue: reimplement WQ_HIGHPRI using a separate worker_pool
        workqueue: introduce NR_WORKER_POOLS and for_each_worker_pool()
        workqueue: separate out worker_pool flags
        workqueue: use @pool instead of @gcwq or @cpu where applicable
        workqueue: factor out worker_pool from global_cwq
        workqueue: don't use WQ_HIGHPRI for unbound workqueues
      a08489c5
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 08d9329c
      Linus Torvalds authored
      Pull misc udf, ext2, ext3, and isofs fixes from Jan Kara:
       "Assorted, mostly trivial, fixes for udf, ext2, ext3, and isofs.  I'm
        on vacation and scarcely checking email since we are expecting baby
        any day now but these fixes should be safe to go in and I don't want
        to delay them unnecessarily."
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: avoid info leak on export
        isofs: avoid info leak on export
        udf: Improve table length check to avoid possible overflow
        ext3: Check return value of blkdev_issue_flush()
        jbd: Check return value of blkdev_issue_flush()
        udf: Do not decrement i_blocks when freeing indirect extent block
        udf: Fix memory leak when mounting
        ext2: cleanup the confused goto label
        UDF: Remove unnecessary variable "offset" from udf_fill_inode
        udf: stop using s_dirt
        ext3: force ro mount if ext3_setup_super() fails
        quota: fix checkpatch.pl warning by replacing <asm/uaccess.h> with <linux/uaccess.h>
      08d9329c
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 2c05b2c8
      Linus Torvalds authored
      Pull m68knommu arch update from Greg Ungerer:
       "Quite a varied set of changes this time.
         - A little more merge cleanup, this time the assembler entry code.
         - New sub-architecture support for the ColdFire 5251/5253 and 5441x
           CPU families.
         - Specific clk support code for the ColdFire 520x and 532x CPU
           familes.
         - Refactoring of the ColdFire GPIO support.
         - PCI bus support for some ColdFire CPUS that have PCI hardware (54xx
           family).  This showed up a few problems with ColdFire cache,
           allocating coherent memory and bi-directional DMA support.  Fixes
           for those too."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (21 commits)
        m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs
        m68k: add PCI bus code support for the ColdFire M54xx SoC family
        m68k: add IO access definitions to support PCI on ColdFire platforms
        m68k: add PCI bus support definitions for the ColdFire M54xx SoC family
        m68k: common PCI support definitions and code
        m68k: add support for DMA_BIDIRECTIONAL in dma support functions
        m68k: fix ColdFire clear cache operation
        m68k: use simpler dma_alloc_coherent() for ColdFire CPUs
        m68knommu: platform support for 8390 based ethernet used on some boards
        m68knommu: Add clk definitions for m532x.
        m68knommu: Add clk definitions for m520x.
        m68knommu: Add rtc device for m5441x.
        m68knommu: add definitions for the third interrupt controller on devices that don't have a third interrupt controller.
        m68knommu: Add support for the Coldfire m5441x.
        m68knommu: use MCF_IRQ_PIT1 instead of MCFINT_VECBASE + MCFINT_PIT1
        coldfire-qspi: Add support for the Coldfire 5251/5253.
        m68knommu: Add support for the Coldfire 5251/5253
        m68knommu: refactor Coldfire GPIO not to require GPIOLIB, eliminate mcf_gpio_chips.
        m68k: merge the MMU and non-MMU versions of the entry.S code
        m68k: use jbsr to call functions instead of bsrl
        ...
      2c05b2c8
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · c511dc1f
      Linus Torvalds authored
      Pull slave-dmaengine update from Vinod Koul:
       "This time we have a new dmaengine driver from the tegra folks.  Also
        we have Guennadi's cleanup of sh drivers which incudes a library for
        sh drivers.  And the usual odd fixes in bunch of drivers and some nice
        cleanup of dw_dmac from Andy."
      
      Fix up conflicts in drivers/mmc/host/sh_mmcif.c
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
        dmaengine: Cleanup logging messages
        mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
        dma: sh: provide a migration path for slave drivers to stop using .private
        dma: sh: use an integer slave ID to improve API compatibility
        dmaengine: shdma: prepare to stop using struct dma_chan::private
        sh: remove unused DMA device pointer from SIU platform data
        ASoC: siu: don't use DMA device for channel filtering
        dmaengine: shdma: (cosmetic) simplify a static function
        dmaengine: at_hdmac: add a few const qualifiers
        dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
        dw_dmac: mark dwc_dump_lli inline
        dma: mxs-dma: Export missing symbols from mxs-dma.c
        dma: shdma: convert to the shdma base library
        ASoC: fsi: prepare for conversion to the shdma base library
        usb: renesas_usbhs: prepare for conversion to the shdma base library
        ASoC: siu: prepare for conversion to the shdma base library
        serial: sh-sci: prepare for conversion to the shdma base library
        mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
        mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
        dma: shdma: prepare for conversion to the shdma base library
        ...
      c511dc1f
  3. 24 Jul, 2012 12 commits
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux · 9161c3b7
      Linus Torvalds authored
      Pull common clk framework changes from Michael Turquette:
       "This includes a small number of core framework improvments, platform
        ports and new DT bindings."
      
      Fix up trivial conflicts in drivers/clk/Makefile
      
      * tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (21 commits)
        clk: fix compile for OF && !COMMON_CLK
        clk: fix clk_get on of_clk_get_by_name return check
        clk: mxs: clk_register_clkdev mx28 usb clocks
        clk: add highbank clock support
        dt: add clock binding doc to primecell bindings
        clk: add DT fixed-clock binding support
        clk: add DT clock binding support
        ARM: integrator: convert to common clock
        clk: add versatile ICST307 driver
        ARM: integrator: put symbolic bus names on devices
        ARM: u300: convert to common clock
        clk: cache parent clocks only for muxes
        clk: wm831x: Add initial WM831x clock driver
        clk: Constify struct clk_init_data
        clk: Add CLK_IS_BASIC flag to identify basic clocks
        clk: Add support for rate table based dividers
        clk: Add support for power of two type dividers
        clk: mxs: imx28: decrease the frequency of ref_io1 for SSP2 and SSP3
        clk: mxs: add clkdev lookup for pwm
        clk: mxs: Fix the GPMI clock name
        ...
      9161c3b7
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 97027da6
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "The most important part of these updates is the IOMMU groups code
        enhancement written by Alex Williamson.  It abstracts the problem that
        a given hardware IOMMU can't isolate any given device from any other
        device (e.g.  32 bit PCI devices can't usually be isolated).  Devices
        that can't be isolated are grouped together.  This code is required
        for the upcoming VFIO framework.
      
        Another IOMMU-API change written by me is the introduction of domain
        attributes.  This makes it easier to handle GART-like IOMMUs with the
        IOMMU-API because now the start-address and the size of the domain
        address space can be queried.
      
        Besides that there are a few cleanups and fixes for the NVidia Tegra
        IOMMU drivers and the reworked init-code for the AMD IOMMU.  The
        latter is from my patch-set to support interrupt remapping.  The rest
        of this patch-set requires x86 changes which are not mergabe yet.  So
        full support for interrupt remapping with AMD IOMMUs will come in a
        future merge window."
      
      * tag 'iommu-updates-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (33 commits)
        iommu/amd: Fix hotplug with iommu=pt
        iommu/amd: Add missing spin_lock initialization
        iommu/amd: Convert iommu initialization to state machine
        iommu/amd: Introduce amd_iommu_init_dma routine
        iommu/amd: Move unmap_flush message to amd_iommu_init_dma_ops()
        iommu/amd: Split enable_iommus() routine
        iommu/amd: Introduce early_amd_iommu_init routine
        iommu/amd: Move informational prinks out of iommu_enable
        iommu/amd: Split out PCI related parts of IOMMU initialization
        iommu/amd: Use acpi_get_table instead of acpi_table_parse
        iommu/amd: Fix sparse warnings
        iommu/tegra: Don't call alloc_pdir with as->lock
        iommu/tegra: smmu: Fix unsleepable memory allocation at alloc_pdir()
        iommu/tegra: smmu: Remove unnecessary sanity check at alloc_pdir()
        iommu/exynos: Implement DOMAIN_ATTR_GEOMETRY attribute
        iommu/tegra: Implement DOMAIN_ATTR_GEOMETRY attribute
        iommu/msm: Implement DOMAIN_ATTR_GEOMETRY attribute
        iommu/omap: Implement DOMAIN_ATTR_GEOMETRY attribute
        iommu/vt-d: Implement DOMAIN_ATTR_GEOMETRY attribute
        iommu/amd: Implement DOMAIN_ATTR_GEOMETRY attribute
        ...
      97027da6
    • Linus Torvalds's avatar
      Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 6dd53aa4
      Linus Torvalds authored
      Pull PCI changes from Bjorn Helgaas:
       "Host bridge hotplug:
          - Add MMCONFIG support for hot-added host bridges (Jiang Liu)
        Device hotplug:
          - Move fixups from __init to __devinit (Sebastian Andrzej Siewior)
          - Call FINAL fixups for hot-added devices, too (Myron Stowe)
          - Factor out generic code for P2P bridge hot-add (Yinghai Lu)
          - Remove all functions in a slot, not just those with _EJx (Amos
            Kong)
        Dynamic resource management:
          - Track bus number allocation (struct resource tree per domain)
            (Yinghai Lu)
          - Make P2P bridge 1K I/O windows work with resource reassignment
            (Bjorn Helgaas, Yinghai Lu)
          - Disable decoding while updating 64-bit BARs (Bjorn Helgaas)
        Power management:
          - Add PCIe runtime D3cold support (Huang Ying)
        Virtualization:
          - Add VFIO infrastructure (ACS, DMA source ID quirks) (Alex
            Williamson)
          - Add quirks for devices with broken INTx masking (Jan Kiszka)
        Miscellaneous:
          - Fix some PCI Express capability version issues (Myron Stowe)
          - Factor out some arch code with a weak, generic, pcibios_setup()
            (Myron Stowe)"
      
      * tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (122 commits)
        PCI: hotplug: ensure a consistent return value in error case
        PCI: fix undefined reference to 'pci_fixup_final_inited'
        PCI: build resource code for M68K architecture
        PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_width()
        PCI: reorder __pci_assign_resource() (no change)
        PCI: fix truncation of resource size to 32 bits
        PCI: acpiphp: merge acpiphp_debug and debug
        PCI: acpiphp: remove unused res_lock
        sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()
        PCI: call final fixups hot-added devices
        PCI: move final fixups from __init to __devinit
        x86/PCI: move final fixups from __init to __devinit
        MIPS/PCI: move final fixups from __init to __devinit
        PCI: support sizing P2P bridge I/O windows with 1K granularity
        PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)
        PCI: disable MEM decoding while updating 64-bit MEM BARs
        PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, too
        PCI: never discard enable/suspend/resume_early/resume fixups
        PCI: release temporary reference in __nv_msi_ht_cap_quirk()
        PCI: restructure 'pci_do_fixups()'
        ...
      6dd53aa4
    • Linus Torvalds's avatar
      Merge tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux · f14121ab
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
       "A small set of changes for devicetree:
         - Couple of Documentation fixes
         - Addition of new helper function of_node_full_name
         - Improve of_parse_phandle_with_args return values
         - Some NULL related sparse fixes"
      
      Grant's busy packing.
      
      * tag 'dt-for-3.6' of git://sources.calxeda.com/kernel/linux:
        of: mtd: nuke useless const qualifier
        devicetree: add helper inline for retrieving a node's full name
        of: return -ENOENT when no property
        usage-model.txt: fix typo machine_init->init_machine
        of: Fix null pointer related warnings in base.c file
        LED: Fix missing semicolon in OF documentation
        of: fix a few typos in the binding documentation
      f14121ab
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 914311c9
      Linus Torvalds authored
      Pull pin control changes from Linus Walleij:
       "These are the accumulated pin control patches for v3.6:
         - Various cleanups to the U300 driver
         - Refactor the pin control core to automatically remove any GPIO
           ranges when the drivers are removed, instead of having the drivers
           do this explicitly.
         - Add a function for registering a batch of GPIO ranges.
         - Fix a number of incorrect but non-regressive error checks.
         - Incremental improvements to the COH901, i.MX and Nomadik drivers
         - Add a one-register-per-pin entirely Device Tree-based pin control
           driver from Tony Lindgren."
      
      * tag 'pinctrl-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: Add one-register-per-pin type device tree based pinctrl driver
        pinctrl/nomadik: add spi2_oc1_2 pin group
        pinctrl/nomadik: kerneldoc fix
        pinctrl/nomadik: use devm_* allocators for gpio probe
        pinctrl/nomadik: add pin group to mco function
        pinctrl/nomadik: add hsit_a_2 pin group
        pinctrl/nomadik: add pin group smcs1 and smps0
        pinctrl/nomadik: fix hsir_a_1_pins pin list
        pinctrl: pinctrl-imx: fix map setting problem if NO_PAD_CTL is set
        pinctrl/coh901: use clk_prepare_[en|dis]able()
        pinctrl/pinctrl-tegra: remove IS_ERR checking of pmx->pctl
        pinctrl/pinctrl-spear: remove IS_ERR checking of pmx->pctl
        pinctrl/u300: drop unused variable
        pinctrl: select the proper symbol
        pinctrl: add pinctrl_add_gpio_ranges function
        pinctrl: remove pinctrl_remove_gpio_range
        pinctrl/pinctrl-core: cleanup pinctrl_register
        pinctrl/u300: delete pointless debug print
        pinctrl/pinctrl-u300: remove devm_kfree at driver unload
      914311c9
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 5dedb9f3
      Linus Torvalds authored
      Pull InfiniBand/RDMA changes from Roland Dreier:
       - Updates to the qib low-level driver
       - First chunk of changes for SR-IOV support for mlx4 IB
       - RDMA CM support for IPv6-only binding
       - Other misc cleanups and fixes
      
      Fix up some add-add conflicts in include/linux/mlx4/device.h and
      drivers/net/ethernet/mellanox/mlx4/main.c
      
      * tag 'rdma-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (30 commits)
        IB/qib: checkpatch fixes
        IB/qib: Add congestion control agent implementation
        IB/qib: Reduce sdma_lock contention
        IB/qib: Fix an incorrect log message
        IB/qib: Fix QP RCU sparse warnings
        mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct and paravirtualize them
        mlx4_core: Allow guests to have IB ports
        mlx4_core: Implement mechanism for reserved Q_Keys
        net/mlx4_core: Free ICM table in case of error
        IB/cm: Destroy idr as part of the module init error flow
        mlx4_core: Remove double function declarations
        IB/mlx4: Fill the masked_atomic_cap attribute in query device
        IB/mthca: Fill in sq_sig_type in query QP
        IB/mthca: Warning about event for non-existent QPs should show event type
        IB/qib: Fix sparse RCU warnings in qib_keys.c
        net/mlx4_core: Initialize IB port capabilities for all slaves
        mlx4: Use port management change event instead of smp_snoop
        IB/qib: RCU locking for MR validation
        IB/qib: Avoid returning EBUSY from MR deregister
        IB/qib: Fix UC MR refs for immediate operations
        ...
      5dedb9f3
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · ddb03448
      Linus Torvalds authored
      Pull i2c updates from Jean Delvare:
       "The most important changes here are a big cleanup of the i2c-piix4
        driver, cleanups and interrupt support to the i2c-i801 driver, and
        support for the SCCB protocol."
      
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-omap: Add support for I2C_M_STOP message flag
        i2c: Fall back to emulated SMBus if the operation isn't supported natively
        i2c: Add SCCB support
        i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
        i2c-i801: Enable IRQ for byte_by_byte transactions
        i2c-i801: Enable interrupts on ICH5/7/8/9/10
        i2c-i801: Enable IRQ for SMBus transactions
        i2c-i801: Consolidate polling
        i2c-i801: Drop ENABLE_INT9
        i2c-i801: Rename some SMBHSTCNT bit constants
        i2c-i801: Check and return errors during byte-by-byte transfers
        i2c-i801: Clear only status bits in HST_STS
        i2c-i801: Refactor use of LAST_BYTE in i801_block_transaction_byte_by_byte
        i2c-smbus: Use module_i2c_driver()
        i2c/writing-clients: Mention module_i2c_driver()
        i2c-piix4: Support AMD auxiliary SMBus controller
        i2c-piix4: Separate registration and probing code
        i2c-piix4: Eliminate piix4_smba global variable
        i2c/busses: Use module_pci_driver
        i2c: Update Guenter Roeck's e-mail address
      ddb03448
    • Linus Torvalds's avatar
      Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · dbf7b591
      Linus Torvalds authored
      Pull sound update from Takashi Iwai:
       "This is a fairly quiet release in all sound area.  Only a little bit
        of changes in the core side while most of changes are seen in the
        drivers.
      
        HD-audio:
         - A few new codec additions for Nvidia, Realtek and VIA
         - Intel Haswell audio support
         - Support for "phantom" jacks for consistent jack reporting
         - Major clean-ups in HDMI/DP driver codes
         - A workaround for inverted digital-mic pins with Realtek codecs
         - Removal of beep_mode=2 option
      
        ASoC:
         - Added the ability to add and remove DAPM paths dynamically, mostly
           for reparenting on clock changes
         - New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
           reference platform and ttc-dkp
         - New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
           Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
         - New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500,
           TI Isabelle and Wolfson Microelectronics WM5102 and WM5110
         - DAPM fixes for the recent locking changes
         - Fix for _PRE and _POST widgets (which have been broken for a few
           releases now)
         - A couple of minor driver updates
      
        Misc
         - Conversion to new dev_pm_ops in platform and PCI drivers
         - LTC support and some fixes in PCXHR driver
         - A few fixes and PM support for ISA OPti9xx and WSS cards
         - Some TLV code cleanup
         - Move driver-specific headers from include/sound to local dirs"
      
      * tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (212 commits)
        ASoC: dapm: Fix _PRE and _POST events for DAPM performance improvements
        ALSA: hda - add dock support for Thinkpad X230 Tablet
        ALSA: hda - Turn on PIN_OUT from hdmi playback prepare.
        ASoC imx-audmux: add MX31_AUDMUX_PORT7_SSI_PINS_7 define
        ASoC: littlemill: Add userspace control of the WM1250 I/O
        ASoC: wm8994: Update micdet for irqdomain conversion
        ALSA: hda - make sure alc268 does not OOPS on codec parse
        ALSA: hda - Add support for Realtek ALC282
        ALSA: hda - Fix index number conflicts of phantom jacks
        ALSA: opti9xx: Fix section mismatch by PM support
        ALSA: snd-opti9xx: Implement suspend/resume
        ALSA: hda - Add new GPU codec ID to snd-hda
        ALSA: hda - Fix driver type of Haswell controller to AZX_DRIVER_SCH
        ALSA: hda - add Haswell HDMI codec id
        ALSA: hda - Add DeviceID for Haswell HDA
        ALSA: wss_lib: Fix resume on Yamaha OPL3-SAx
        ALSA: wss_lib: fix suspend/resume
        ALSA: es1938: replace TLV_DB_RANGE_HEAD with DECLARE_TLV_DB_RANGE
        ALSA: tlv: add DECLARE_TLV_DB_RANGE()
        ALSA: tlv: add DECLARE_TLV_CONTAINER()
        ...
      dbf7b591
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · d14b7a41
      Linus Torvalds authored
      Pull trivial tree from Jiri Kosina:
       "Trivial updates all over the place as usual."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
        Fix typo in include/linux/clk.h .
        pci: hotplug: Fix typo in pci
        iommu: Fix typo in iommu
        video: Fix typo in drivers/video
        Documentation: Add newline at end-of-file to files lacking one
        arm,unicore32: Remove obsolete "select MISC_DEVICES"
        module.c: spelling s/postition/position/g
        cpufreq: Fix typo in cpufreq driver
        trivial: typo in comment in mksysmap
        mach-omap2: Fix typo in debug message and comment
        scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
        Change email address for Steve Glendinning
        Btrfs: fix typo in convert_extent_bit
        via: Remove bogus if check
        netprio_cgroup.c: fix comment typo
        backlight: fix memory leak on obscure error path
        Documentation: asus-laptop.txt references an obsolete Kconfig item
        Documentation: ManagementStyle: fixed typo
        mm/vmscan: cleanup comment error in balance_pgdat
        mm: cleanup on the comments of zone_reclaim_stat
        ...
      d14b7a41
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · e8ff13b0
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "The list of changes worth pointing out explicitly:
      
        - We are getting 'UHID', which is a new framework for implementing HID
          transport drivers in userspace (this is different from HIDRAW, which
          is transport-independent and provides report parsing facilities;
          uhid is for the other (transport) part of the pipeline).
      
          It's needed for (and currently being used by) Bluetooth-LowEnergy,
          as its specification mandates things we don't want in the kernel.
      
          Written by David Herrmann.
      
        - there have been quite a few bugs in runtime suspend/resume paths
          (probably never reported to actually happen in the wild, but still).
          Alan Stern fixed those.
      
        - a few other driver updates and fixes and random new device support."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
        HID: add ASUS AIO keyboard model AK1D
        HID: add support for Cypress barcode scanner 04B4:ED81
        HID: Allow drivers to be their own listener
        HID: usbhid: fix error paths in suspend
        HID: usbhid: check for suspend or reset before restarting
        HID: usbhid: replace HID_REPORTED_IDLE with HID_SUSPENDED
        HID: usbhid: inline some simple routines
        HID: usbhid: fix autosuspend calls
        HID: usbhid: fix use-after-free bug
        HID: hid-core: optimize in case of hidraw
        HID: hidraw: fix list->buffer memleak
        HID: uhid: Fix sending events with invalid data
        HID: roccat: added sensor sysfs attribute for Savu
        HID: Add driver for Holtek based keyboards with broken HID
        HID: Add suport for the brightness control keys on HP keyboards
        HID: magicmouse: Implement Multi-touch Protocol B (MT-B)
        HID: magicmouse: Removing report_touches switch
        HID: roccat: rename roccat_common functions to roccat_common2
        HID: roccat: fix wrong hid_err usage on struct usb_device
        HID: roccat: move functionality to roccat-common
        ...
      e8ff13b0
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 0cd5ff59
      Linus Torvalds authored
      Pull hwmon updates from Guenter Roeck:
       "New drivers for DA9052/53 PMIC as well as HIH-6130/HIH-6131 humidity
        and temperature sensors.
      
        Convert drivers to use devm_ functions and to use dev_pm_ops.  Address
        a couple of Coverity errors/warnings as well as compile warnings.
        Some functional improvements in applesmc driver."
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (72 commits)
        hwmon: (applesmc) Ignore some temperature registers
        hwmon: (applesmc) Allow negative temperature values
        hwmon: (s3c-hwmon) Use devm_kzalloc instead of kzalloc
        hwmon: (w83781d) Fix compile warning
        hwmon: (applesmc) Shorten minimum wait time
        hwmon: (exynos4_tmu) Use struct dev_pm_ops for power management
        hwmon: (gpio-fan) Use struct dev_pm_ops for power management
        hwmon: (abituguru3) Use struct dev_pm_ops for power management
        hwmon: (abituguru) Use struct dev_pm_ops for power management
        hwmon: (acpi_power_meter) Fix unintentional integer overflow
        hwmon: (acpi_power_meter) Cleanup and optimizations
        hwmon: Honeywell Humidicon HIH-6130/HIH-6131 humidity and temperature sensor driver
        hwmon: (applesmc) Skip sensor mapping
        hwmon: (ntc_thermistor) Ensure that data->name string is terminated
        hwmon: (w83l785ts) Convert to use devm_ functions
        hwmon: (w83l785ts) Simplify code and improve readability
        hwmon: (smsc47m192) Convert to use devm_ functions
        hwmon: (smsc47m1) Convert to use devm_ functions
        hwmon: (smsc47b397) Convert to use devm_ functions
        hwmon: (k8temp) Convert to use devm_ functions
        ...
      0cd5ff59
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 3539fc54
      Linus Torvalds authored
      Pull watchdog changes from Wim Van Sebroeck:
       - conversion of iTCO_wdt and orion_wdt to the generic watchdog API
       - uses module_platform_driver() for s3c2410_wdt
       - Adds support for Jetway JNF99 Motherboard
       - various fixes
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: orion_wdt: Convert driver to watchdog core
        watchdog: s3c2410_wdt: Use module_platform_driver()
        watchdog: sch311x_wdt: Fix Polarity when starting watchdog
        Watchdog: OMAP: Fix the runtime pm code to avoid module getting stuck intransition state.
        watchdog: ie6xx_wdt: section mismatch in ie6xx_wdt_probe()
        watchdog: bcm63xx_wdt: fix driver section mismatch
        watchdog: iTCO_wdt.c: convert to watchdog core
        char/ipmi: remove local ioctl defines replaced by generic ones
        watchdog: xilinx: Read clock frequency directly from DT node
        watchdog: coh901327_wdt: use clk_prepare/unprepare
        watchdog: f71808e_wdt: Add support for Jetway JNF99 motherboard
      3539fc54