1. 11 Oct, 2012 2 commits
  2. 10 Oct, 2012 33 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux · 12250d84
      Linus Torvalds authored
      Pull i2c-embedded changes from Wolfram Sang:
       "The changes for i2c-embedded include:
      
         - massive rework of the omap driver
         - massive rework of the at91 driver.  In fact, the old driver gets
           removed; I am okay with this approach since the old driver was
           depending on BROKEN and its limitations made it practically
           unusable, so people used bitbanging instead.  But even if there are
           users, there is no platform_data or module parameter which would
           need to be converted.  It is just another driver doing I2C
           transfers, just way better.  Modifications of arch/arm/at91 related
           files have proper acks from the maintainer.
         - new driver for R-Car I2C
         - devicetree and generic_clock conversions and fixes
         - usual driver fixes and changes.
      
        The rework patches have come a long way and lots of people have been
        involved in creating/testing them.  Most patches have been in
        linux-next at least since 3.6-rc5.  A few have been added in the last
        week, I have to admit.
      
        An unexpected (but welcome :)) peak in private life is the cause for
        that.  The "late" patches shouldn't cause any merge conflicts and I
        will have a special eye on them during the stabilization phase.  This
        is an exception and I want to have the patches in place properly in
        time again for the next kernels."
      
      * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (44 commits)
        MXS: Implement DMA support into mxs-i2c
        i2c: add Renesas R-Car I2C driver
        i2c: s3c2410: use clk_prepare_enable and clk_disable_unprepare
        ARM: OMAP: convert I2C driver to PM QoS for MPU latency constraints
        i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
        i2c: algo: pca: Fix chip reset function for PCA9665
        i2c: mpc: Wait for STOP to hit the bus
        i2c: davinci: preparation for switch to common clock framework
        omap-i2c: fix incorrect log message when using a device tree
        i2c: omap: sanitize exit path
        i2c: omap: switch over to autosuspend API
        i2c: omap: remove unnecessary pm_runtime_suspended check
        i2c: omap: switch to threaded IRQ support
        i2c: omap: remove redundant status read
        i2c: omap: get rid of the "complete" label
        i2c: omap: resize fifos before each message
        i2c: omap: simplify IRQ exit path
        i2c: omap: always return IRQ_HANDLED
        i2c: omap: simplify errata check
        i2c: omap: bus: add a receiver flag
        ...
      12250d84
    • Linus Torvalds's avatar
      Merge tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · da06a8d7
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "A series of fixes (and in some cases, some cleanups):
      
        Via Tony Lindgren:
         - A collection of OMAP regression fixes, in particular because
           firmware no longer sets up all pin states before starting the
           kernel.
         - cpufreq fixes for OMAP (Rafael is on vacation and this was
           pre-agreed).
         - A longer series of misc regression fixes and cleanups, warning
           removals, etc for OMAP
      
        From Arnd Bergmann:
         - A series of warning fixes for various platforms (defconfig builds)
      
        Misc:
         - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc."
      
      * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
        ARM: pxa: armcore: fix PCI PIO warnings
        ARM: integrator: use __iomem pointers for MMIO, part 2
        ARM: assabet: fix bogus warning in get_assabet_scr (again)
        ARM: shmobile: mark shmobile_init_late as __init
        ARM: integrator_cp: fix build failure
        ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
        ARM: OMAP3: fix workaround for EMU clockdomain
        arm/omap: Replace board_ref_clock with enum values
        ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
        arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
        arch/arm/mach-omap2: Remove unecessary semicolon
        arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
        ARM/dts: omap5-evm: pinmux configuration for audio
        ARM/dts: Add pinctrl driver entries for omap5
        ARM/dts: omap4-panda: pinmux configuration for audio
        ARM/dts: omap4-sdp: pinmux configuration for audio
        ARM/dts: omap5-evm: Disable unused McBSP3
        ARM/dts: omap4-sdp: Disable unused McBSP3
        ARM/dts: omap4-panda: Disable unused audio IPs
        ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
        ...
      da06a8d7
    • Ian Kent's avatar
      autofs4 - fix reset pending flag on mount fail · 49999ab2
      Ian Kent authored
      In autofs4_d_automount(), if a mount fail occurs the AUTOFS_INF_PENDING
      mount pending flag is not cleared.
      
      One effect of this is when using the "browse" option, directory entry
      attributes show up with all "?"s due to the incorrect callback and
      subsequent failure return (when in fact no callback should be made).
      Signed-off-by: default avatarIan Kent <ikent@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      49999ab2
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Fixups from Andrew) · 14ffe009
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "Followups, fixes and some random stuff I found on the internet."
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (11 patches)
        perf: fix duplicate header inclusion
        memcg, kmem: fix build error when CONFIG_INET is disabled
        rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS
        rapidio: fix comment
        lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf
        rapidio: update for destination ID allocation
        rapidio: update asynchronous discovery initialization
        rapidio: use msleep in discovery wait
        mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip()
        arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups
        arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code
      14ffe009
    • Linus Torvalds's avatar
      Merge branch 'for-3.7/core' of git://git.kernel.dk/linux-block · ce40be7a
      Linus Torvalds authored
      Pull block IO update from Jens Axboe:
       "Core block IO bits for 3.7.  Not a huge round this time, it contains:
      
         - First series from Kent cleaning up and generalizing bio allocation
           and freeing.
      
         - WRITE_SAME support from Martin.
      
         - Mikulas patches to prevent O_DIRECT crashes when someone changes
           the block size of a device.
      
         - Make bio_split() work on data-less bio's (like trim/discards).
      
         - A few other minor fixups."
      
      Fixed up silent semantic mis-merge as per Mikulas Patocka and Andrew
      Morton.  It is due to the VM no longer using a prio-tree (see commit
      6b2dbba8: "mm: replace vma prio_tree with an interval tree").
      
      So make set_blocksize() use mapping_mapped() instead of open-coding the
      internal VM knowledge that has changed.
      
      * 'for-3.7/core' of git://git.kernel.dk/linux-block: (26 commits)
        block: makes bio_split support bio without data
        scatterlist: refactor the sg_nents
        scatterlist: add sg_nents
        fs: fix include/percpu-rwsem.h export error
        percpu-rw-semaphore: fix documentation typos
        fs/block_dev.c:1644:5: sparse: symbol 'blkdev_mmap' was not declared
        blockdev: turn a rw semaphore into a percpu rw semaphore
        Fix a crash when block device is read and block size is changed at the same time
        block: fix request_queue->flags initialization
        block: lift the initial queue bypass mode on blk_register_queue() instead of blk_init_allocated_queue()
        block: ioctl to zero block ranges
        block: Make blkdev_issue_zeroout use WRITE SAME
        block: Implement support for WRITE SAME
        block: Consolidate command flag and queue limit checks for merges
        block: Clean up special command handling logic
        block/blk-tag.c: Remove useless kfree
        block: remove the duplicated setting for congestion_threshold
        block: reject invalid queue attribute values
        block: Add bio_clone_bioset(), bio_clone_kmalloc()
        block: Consolidate bio_alloc_bioset(), bio_kmalloc()
        ...
      ce40be7a
    • Linus Torvalds's avatar
      Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · ba0a5a36
      Linus Torvalds authored
      Pull a firewire fix from Stefan Richter:
       "Fixes an old bug of the /dev/fw* ioctl ABI."
      
      * tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel)
      ba0a5a36
    • Linus Torvalds's avatar
      Merge tag 'vfio-for-v3.7-rc1' of git://github.com/awilliam/linux-vfio · 3dddebe0
      Linus Torvalds authored
      Pull vfio fixes from Alex Williamson:
       "This includes a fix for PCI BAR mmaps after recent mm changes, fixing
        an interrupt race, and fixing a consistency bug in interrupt state
        when switching interrupt modes."
      
      * tag 'vfio-for-v3.7-rc1' of git://github.com/awilliam/linux-vfio:
        vfio: Fix PCI INTx disable consistency
        vfio: Move PCI INTx eventfd setting earlier
        vfio: Fix PCI mmap after b3b9c293
      3dddebe0
    • Michel Lespinasse's avatar
      perf: fix duplicate header inclusion · ec073619
      Michel Lespinasse authored
      #include <stdbool.h> somehow got duplicated on its way to linus's tree
      (probably as a conflict resolution as things got sent through multiple
      trees)
      Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ec073619
    • David Rientjes's avatar
      memcg, kmem: fix build error when CONFIG_INET is disabled · cd59085a
      David Rientjes authored
      Commit e1aab161 ("socket: initial cgroup code.") causes a build
      error when CONFIG_INET is disabled in Linus' tree:
      
        net/built-in.o: In function `sk_update_clone':
        net/core/sock.c:1336: undefined reference to `sock_update_memcg'
      
      sock_update_memcg() is only defined when CONFIG_INET is enabled, so fix
      it by defining the dummy function without this option.
      Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
      Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Cc: Glauber Costa <glommer@parallels.com>
      Cc: Michal Hocko <mhocko@suse.cz>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cd59085a
    • Kevin Hilman's avatar
      rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS · 8dc08395
      Kevin Hilman authored
      Commit 6b8029fa ("rtc: kconfig: remove unnecessary dependencies")
      removed various 'depends on RTC_CLASS' dependencies but also removed a
      few 'default RTC_CLASS' statements, which actually changed default
      behavior.
      
      This resulted in the various RTC interfaces (sysfs, proc, dev) all being
      disabled by default, even when RTC_CLASS is enabled:
      
         # CONFIG_RTC_INTF_SYSFS is not set
         # CONFIG_RTC_INTF_PROC is not set
         # CONFIG_RTC_INTF_DEV is not set
      
      which is different from previous behavior (all of these where enabled.)
      
      To fix, add back the 'default RTC_CLASS' statments to each of the
      RTC_INTF_* options.
      
      I noticed this because some RTC tests started failing on my TI OMAP
      platforms because /dev/rtc0 was not present anymore, even though the
      driver was present and RTC_CLASS was enabled.
      Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
      Acked-by: default avatarVenu Byravarasu <vbyravarasu@nvidia.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8dc08395
    • Chad Reese's avatar
      rapidio: fix comment · fdb8d561
      Chad Reese authored
      The resource index for the mailboxes was incorrect.
      Signed-off-by: default avatarChad Reese <kreese@caviumnetworks.com>
      Acked-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fdb8d561
    • Ezequiel Garcia's avatar
      lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf · 3e1aa66b
      Ezequiel Garcia authored
      Previously kvasprintf() allocation was being done through kmalloc(),
      thus producing an inaccurate trace report.
      
      This is a common problem: in order to get accurate callsite tracing, a
      lib/utils function shouldn't allocate kmalloc but instead use
      kmalloc_track_caller.
      Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
      Cc: Sam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3e1aa66b
    • Alexandre Bounine's avatar
      rapidio: update for destination ID allocation · 4ed134be
      Alexandre Bounine authored
      Address comments provided by Andrew Morton:
      https://lkml.org/lkml/2012/10/3/550
      
       - Keeps consistent kerneldoc compatible comments style for new static
         functions.
       - Removes unnecessary complexity from destination ID allocation
         routine.
       - Uses kcalloc() for code clarity.
      Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
      Cc: Matt Porter <mporter@kernel.crashing.org>
      Cc: Li Yang <leoli@freescale.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4ed134be
    • Alexandre Bounine's avatar
      rapidio: update asynchronous discovery initialization · 2574740d
      Alexandre Bounine authored
      Update discovery process initialization based on Andrew Morton's comments:
      https://lkml.org/lkml/2012/10/3/552.
      
      This update processes all enumerating mports first and schedules discovery
      work after that. If the initialization routine fails to allocate resources
      needed to execute discovery, it abandons discovery for all ports.
      Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
      Cc: Matt Porter <mporter@kernel.crashing.org>
      Cc: Li Yang <leoli@freescale.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2574740d
    • Alexandre Bounine's avatar
      rapidio: use msleep in discovery wait · f4c9c0e8
      Alexandre Bounine authored
      Use msleep() for code clarity as suggested by Andrew Morton in his
      comments for the original patch: https://lkml.org/lkml/2012/10/3/546.
      Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
      Cc: Matt Porter <mporter@kernel.crashing.org>
      Cc: Li Yang <leoli@freescale.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f4c9c0e8
    • Bartlomiej Zolnierkiewicz's avatar
      mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip() · 62726059
      Bartlomiej Zolnierkiewicz authored
      {get,clear,set}_pageblock_skip() use incorrect bit ranges (please compare
      to bit ranges used by {get,set}_pageblock_flags() used for migration
      types) and can overwrite pageblock migratetype of the next pageblock in
      the bitmap.
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
      Acked-by: default avatarMel Gorman <mgorman@suse.de>
      Tested-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
      Acked-by: default avatarMinchan Kim <minchan@kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      62726059
    • Yasuaki Ishimatsu's avatar
      arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups · 1633dbba
      Yasuaki Ishimatsu authored
      Followups to d760afd4 ("memory-hotplug: suppress "Trying to free
      nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning").
      
       - use unsigned long type, as overflows are conceivable
      
       - rename `i' to the less-misleading and more informative `section'
      
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1633dbba
    • Andrew Morton's avatar
      arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code · 158544b1
      Andrew Morton authored
      Fix
      
        arch/powerpc/platforms/pseries/hotplug-memory.c: In function 'pseries_remove_memblock':
        arch/powerpc/platforms/pseries/hotplug-memory.c:103:17: error: unused variable 'pfn' [-Werror=unused-variable]
      
      Caused by commit d760afd4 ("memory-hotplug: suppress "Trying to free
      nonexistent resource <XXXXXXXXXXXXXXXX-YYYYYYYYYYYYYYYY>" warning").
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
      Tested-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Tested-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
      Tested-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      158544b1
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · e626d177
      Linus Torvalds authored
      Pull hwmon updates from Jean Delvare:
       "Only trivial things this time"
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: Drop needless includes of <linux/delay.h>
        hwmon: Add missing inclusions of <linux/err.h>
        hwmon: Add missing inclusions of <linux/jiffies.h>
        hwmon: Fix spelling of Celsius
        hwmon: Update Alexey Fisher's name
      e626d177
    • Alex Williamson's avatar
      vfio: Fix PCI INTx disable consistency · 899649b7
      Alex Williamson authored
      The virq_disabled flag tracks the userspace view of INTx masking
      across interrupt mode changes, but we're not consistently applying
      this to the interrupt and masking handler notion of the device.
      Currently if the user sets DisINTx while in MSI or MSIX mode, then
      returns to INTx mode (ex. rebooting a qemu guest), the hardware has
      DisINTx+, but the management of INTx thinks it's enabled, making it
      impossible to actually clear DisINTx.  Fix this by updating the
      handler state when INTx is re-enabled.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      899649b7
    • Alex Williamson's avatar
      vfio: Move PCI INTx eventfd setting earlier · 9dbdfd23
      Alex Williamson authored
      We need to be ready to recieve an interrupt as soon as we call
      request_irq, so our eventfd context setting needs to be moved
      earlier.  Without this, an interrupt from our device or one
      sharing the interrupt line can pass a NULL into eventfd_signal
      and oops.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      9dbdfd23
    • Alex Williamson's avatar
      vfio: Fix PCI mmap after b3b9c293 · 34002f54
      Alex Williamson authored
      Our mmap path mistakely relied on vma->vm_pgoff to get set in
      remap_pfn_range.  After b3b9c293, that path only applies to
      copy-on-write mappings.  Set it in our own code.
      Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      34002f54
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · df632d3c
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Features include:
      
         - Remove CONFIG_EXPERIMENTAL dependency from NFSv4.1
           Aside from the issues discussed at the LKS, distros are shipping
           NFSv4.1 with all the trimmings.
         - Fix fdatasync()/fsync() for the corner case of a server reboot.
         - NFSv4 OPEN access fix: finally distinguish correctly between
           open-for-read and open-for-execute permissions in all situations.
         - Ensure that the TCP socket is closed when we're in CLOSE_WAIT
         - More idmapper bugfixes
         - Lots of pNFS bugfixes and cleanups to remove unnecessary state and
           make the code easier to read.
         - In cases where a pNFS read or write fails, allow the client to
           resume trying layoutgets after two minutes of read/write-
           through-mds.
         - More net namespace fixes to the NFSv4 callback code.
         - More net namespace fixes to the NFSv3 locking code.
         - More NFSv4 migration preparatory patches.
           Including patches to detect network trunking in both NFSv4 and
           NFSv4.1
         - pNFS block updates to optimise LAYOUTGET calls."
      
      * tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (113 commits)
        pnfsblock: cleanup nfs4_blkdev_get
        NFS41: send real read size in layoutget
        NFS41: send real write size in layoutget
        NFS: track direct IO left bytes
        NFSv4.1: Cleanup ugliness in pnfs_layoutgets_blocked()
        NFSv4.1: Ensure that the layout sequence id stays 'close' to the current
        NFSv4.1: Deal with seqid wraparound in the pNFS return-on-close code
        NFSv4 set open access operation call flag in nfs4_init_opendata_res
        NFSv4.1: Remove the dependency on CONFIG_EXPERIMENTAL
        NFSv4 reduce attribute requests for open reclaim
        NFSv4: nfs4_open_done first must check that GETATTR decoded a file type
        NFSv4.1: Deal with wraparound when updating the layout "barrier" seqid
        NFSv4.1: Deal with wraparound issues when updating the layout stateid
        NFSv4.1: Always set the layout stateid if this is the first layoutget
        NFSv4.1: Fix another refcount issue in pnfs_find_alloc_layout
        NFSv4: don't put ACCESS in OPEN compound if O_EXCL
        NFSv4: don't check MAY_WRITE access bit in OPEN
        NFS: Set key construction data for the legacy upcall
        NFSv4.1: don't do two EXCHANGE_IDs on mount
        NFS: nfs41_walk_client_list(): re-lock before iterating
        ...
      df632d3c
    • Jean Delvare's avatar
      hwmon: Drop needless includes of <linux/delay.h> · 0657777f
      Jean Delvare authored
      These drivers use no sleep or delay functions so they don't need to
      include <linux/delay.h>.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Cc: Rudolf Marek <r.marek@assembler.cz>
      0657777f
    • Jean Delvare's avatar
      hwmon: Add missing inclusions of <linux/err.h> · fa845740
      Jean Delvare authored
      These drivers use IS_ERR so they should include <linux/err.h>.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Acked-by: default avatarLuca Tettamanti <kronos.it@gmail.com>
      Cc: Henrik Rydberg <rydberg@euromail.se>
      fa845740
    • Jean Delvare's avatar
      hwmon: Add missing inclusions of <linux/jiffies.h> · dcd8f392
      Jean Delvare authored
      Many hwmon drivers use jiffies but omit the inclusion of the header
      file. Fix that, and also fix one driver which was including the header
      file but didn't need it.
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Acked-by: default avatarLuca Tettamanti <kronos.it@gmail.com>
      Cc: Marc Hulsman <m.hulsman@tudelft.nl>
      Cc: Rudolf Marek <r.marek@assembler.cz>
      dcd8f392
    • Peter Meerwald's avatar
      hwmon: Fix spelling of Celsius · 4d7e47bc
      Peter Meerwald authored
      Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      4d7e47bc
    • Oleksij Rempel's avatar
      hwmon: Update Alexey Fisher's name · 9292f055
      Oleksij Rempel authored
      My name was change after migration.
      Signed-off-by: default avatarOleksij Rempel <bug-track@fisher-privat.net>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      9292f055
    • Linus Torvalds's avatar
      Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm · 2474542f
      Linus Torvalds authored
      Pull pwm changes from Thierry Reding:
       "All legacy PWM providers have now been moved to the PWM subsystem.
        The plan for 3.8 is to adapt all board files to provide a lookup table
        for PWM devices in order to get rid of the global namespace.
        Subsequently, users of the legacy pwm_request() and pwm_free()
        functions can be migrated to the new pwm_get() and pwm_put()
        functions.  Once this has been completed, the legacy API and the
        compatibility code in the core can be removed.
      
        In addition to the above, these changes also add support for
        configuring the polarity of a PWM signal (currently only supported on
        ECAP and EHRPWM) and include a much needed rework of the i.MX driver.
        Managed functions to obtain and release a PWM device (devm_pwm_get()
        and devm_pwm_put()) have been added and the pwm-backlight driver has
        been updated to use them.  If the PWM subsystem hasn't been enabled,
        dummy functions are provided that allow the subsystem to safely
        compile out.
      
        Some common checks on input parameters have been moved to the core and
        removed from the drivers.  Finally, a small fix corrects the
        description of the PWM specifier's second cell in the device tree
        representation."
      
      * tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (23 commits)
        pwm: dt: Fix description of second PWM cell
        pwm: Check for negative duty-cycle and period
        pwm: Add Ingenic JZ4740 support
        MIPS: JZ4740: Export timer API
        pwm: Move PUV3 PWM driver to PWM framework
        unicore32: pwm: Use managed resource allocations
        unicore32: pwm: Remove unnecessary indirection
        unicore32: pwm: Use module_platform_driver()
        unicore32: pwm: Properly remap memory-mapped registers
        pwm-backlight: Use devm_pwm_get() instead of pwm_get()
        pwm: Move AB8500 PWM driver to PWM framework
        pwm: Fix compilation error when CONFIG_PWM is not defined
        pwm: i.MX: fix clock lookup
        pwm: i.MX: use per clock unconditionally
        pwm: i.MX: add devicetree support
        pwm: i.MX: Use module_platform_driver
        pwm: i.MX: add functions to enable/disable pwm.
        pwm: i.MX: remove unnecessary if in pwm_[en|dis]able
        pwm: i.MX: factor out SoC specific functions
        pwm: pwm-tiehrpwm: Add support for configuring polarity of PWM
        ...
      2474542f
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds · c7a6ced9
      Linus Torvalds authored
      Pull LED subsystem update from Bryan Wu.
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (24 commits)
        leds: add output driver configuration for pca9633 led driver
        leds: lm3642: Use regmap_update_bits() in lm3642_chip_init()
        leds: Add new LED driver for lm3642 chips
        leds-lp5523: Fix riskiness of the page fault
        leds-lp5523: turn off the LED engines on unloading the driver
        leds-lm3530: Fix smatch warnings
        leds-lm3530: Use devm_regulator_get function
        leds: leds-gpio: adopt pinctrl support
        leds: Add new LED driver for lm355x chips
        leds-lp5523: use the i2c device id rather than fixed name
        leds-lp5523: add new device id for LP55231
        leds-lp5523: support new LP55231 device
        leds: triggers: send uevent when changing triggers
        leds-lp5523: minor code style fixes
        leds-lp5523: change the return type of lp5523_set_mode()
        leds-lp5523: set the brightness to 0 forcely on removing the driver
        leds-lp5523: add channel name in the platform data
        leds: leds-gpio: Use of_get_child_count() helper
        leds: leds-gpio: Use platform_{get,set}_drvdata
        leds: leds-gpio: use of_match_ptr()
        ...
      c7a6ced9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a188e7e9
      Linus Torvalds authored
      Pull scsi target updates from Nicholas Bellinger:
       "Things have been calm for the most part with no new fabric drivers in
        flight for v3.7 (we're up to eight now !), so this update is primarily
        focused on addressing a few long-standing items within target-core and
        iscsi-target fabric code.
      
        The highlights include:
      
         - target: Simplify fabric sense data length handling (roland)
         - qla2xxx: Fix endianness of task management response code (roland)
         - target: fix truncation of mode data, support zero allocation length
           (paolo)
         - target: Properly support zero-length commands in normal processing
           path (paolo)
         - iscsi-target: Correctly set 0xffffffff field within ISCSI_OP_REJECT
           PDU (ronnie + nab)
         - iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG
           demo-mode (ronnie + nab)
         - target/file: Re-enable optional fd_buffered_io=1 operation (nab +
           hch)
         - iscsi-target: Add MaxXmitDataSegmenthLength forr target ->
           initiator MDRSL declaration (nab)
         - target: Add target_submit_cmd_map_sgls for SGL fabric memory
           passthrough (nab + hch)
         - tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls (hch +
           nab)
         - tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls (nab
           + hch)
      
        The last series for adding a new target_submit_cmd_map_sgls() fabric
        caller (as requested by hch) that accepts pre-allocated SGL memory
        (using existing logic), along with converting tcm_loop + tcm_vhost has
        only been in -next for the last days, but has gotten enough review
        +testing and is clear enough a mechanical change that I think it's
        reasonable to merge for -rc1 code.
      
        Thanks again to everyone who contributed this round! Extra special
        thanks to Roland (PureStorage) for tracking down the qla2xxx target
        TMR response code endian issue, and to Paolo (Redhat) for resolving
        the long standing zero-length CDB issues within target-core between
        virtual and pSCSI backends."
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (44 commits)
        iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values
        iscsit: proper endianess conversions
        iscsit: use the itt_t abstract type
        iscsit: add missing endianess conversion in iscsit_check_inaddr_any
        iscsit: remove incorrect unlock in iscsit_build_sendtargets_resp
        iscsit: mark various functions static
        target/iscsi: precedence bug in iscsit_set_dataout_sequence_values()
        target/usb-gadget: strlen() doesn't count the terminator
        target/usb-gadget: remove duplicate initialization
        tcm_vhost: Convert I/O path to use target_submit_cmd_map_sgls
        target: Add control CDB READ payload zero work-around
        tcm_loop: Convert I/O path to use target_submit_cmd_map_sgls
        target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough
        iscsi-target: Add explicit set of cache_dynamic_acls=1 for TPG demo-mode
        iscsi-target: Change iscsi_target_seq_pdu_list.c to honor MaxXmitDataSegmentLength
        iscsi-target: Add MaxXmitDataSegmentLength connection recovery check
        iscsi-target: Convert incoming PDU payload checks to MaxXmitDataSegmentLength
        iscsi-target: Enable MaxXmitDataSegmentLength operation in login path
        iscsi-target: Add base MaxXmitDataSegmentLength code
        target/file: Re-enable optional fd_buffered_io=1 operation
        ...
      a188e7e9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e1b28147
      Linus Torvalds authored
      Pull second s390 update from Martin Schwidefsky:
       "The big thing in this pull request is the UAPI patch from David, and
        worth mentioning is the page table dumper.  The rest are small
        improvements and bug fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/entry: fix svc number for TIF_SYSCALL system call restart
        s390/mm,vmem: fix vmem_add_mem()/vmem_remove_range()
        s390/vmalloc: have separate modules area
        s390/zcrypt: remove duplicated include from zcrypt_pcixcc.c
        s390/css_chars: remove superfluous ifdef
        s390/chsc: make headers usable
        s390/mm: let kernel text section always begin at 1MB
        s390/mm: fix mapping of read-only kernel text section
        s390/mm: add page table dumper
        s390: add support to start the kernel in 64 bit mode.
        s390/mm,pageattr: remove superfluous EXPORT_SYMBOLs
        s390/mm,pageattr: add more page table walk sanity checks
        s390/mm: fix pmd_huge() usage for kernel mapping
        s390/dcssblk: cleanup device attribute usage
        s390/mm: use pfmf instruction to initialize storage keys
        s390/facilities: cleanup PFMF and HPAGE machine facility detection
        UAPI: (Scripted) Disintegrate arch/s390/include/asm
      e1b28147
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ba706765
      Linus Torvalds authored
      Pull nouveau drm fixes from Dave Airlie:
       "Just a bunch of nouveau fixes, Ben wants to get some alternate
        versions into stable."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau/timer: bump ptimer's alarm delay from u32 to u64
        drm/nouveau/fan: fix a typo in PWM's input clock calculation
        drm/nv50/clk: wire up pll_calc hook
        drm/nouveau: remove unused _nouveau_parent_ctor
        drm/nouveau/bios: fix shadowing of ACPI ROMs larger than 64KiB
      ba706765
  3. 09 Oct, 2012 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 42859eea
      Linus Torvalds authored
      Pull generic execve() changes from Al Viro:
       "This introduces the generic kernel_thread() and kernel_execve()
        functions, and switches x86, arm, alpha, um and s390 over to them."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (26 commits)
        s390: convert to generic kernel_execve()
        s390: switch to generic kernel_thread()
        s390: fold kernel_thread_helper() into ret_from_fork()
        s390: fold execve_tail() into start_thread(), convert to generic sys_execve()
        um: switch to generic kernel_thread()
        x86, um/x86: switch to generic sys_execve and kernel_execve
        x86: split ret_from_fork
        alpha: introduce ret_from_kernel_execve(), switch to generic kernel_execve()
        alpha: switch to generic kernel_thread()
        alpha: switch to generic sys_execve()
        arm: get rid of execve wrapper, switch to generic execve() implementation
        arm: optimized current_pt_regs()
        arm: introduce ret_from_kernel_execve(), switch to generic kernel_execve()
        arm: split ret_from_fork, simplify kernel_thread() [based on patch by rmk]
        generic sys_execve()
        generic kernel_execve()
        new helper: current_pt_regs()
        preparation for generic kernel_thread()
        um: kill thread->forking
        um: let signal_delivered() do SIGTRAP on singlestepping into handler
        ...
      42859eea
    • Linus Torvalds's avatar
      Merge branch 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · f59b51fe
      Linus Torvalds authored
      Pull UML changes from Richard Weinberger:
       "UML receives this time only cleanups.
      
        The most outstanding change is the 'include "foo.h"' do 'include
        <foo.h>' conversion done by Al Viro.
      
        It touches many files, that's why the diffstat is rather big."
      
      * 'for-linus-37rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        typo in UserModeLinux-HOWTO
        hppfs: fix the return value of get_inode()
        hostfs: drop vmtruncate
        um: get rid of pointless include "..." where include <...> will do
        um: move sysrq.h out of include/shared
        um/x86: merge 32 and 64 bit variants of ptrace.h
        um/x86: merge 32 and 64bit variants of checksum.h
      f59b51fe
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · aac2b1f5
      Linus Torvalds authored
      Pull networking updates from David Miller:
      
       1) UAPI changes for networking from David Howells
      
       2) A netlink dump is an operation we can sleep within, and therefore we
          need to make sure the dump provider module doesn't disappear on us
          meanwhile.  Fix from Gao Feng.
      
       3) Now that tunnels support GRO, we have to be more careful in
          skb_gro_reset_offset() otherwise we OOPS, from Eric Dumazet.
      
       4) We can end up processing packets for VLANs we aren't actually
          configured to be on, fix from Florian Zumbiehl.
      
       5) Fix routing cache removal regression in redirects and IPVS.  The
          core issue on the IPVS side is that it wants to rewrite who the
          nexthop is and we have to explicitly accomodate that case.  From
          Julian Anastasov.
      
       6) Error code return fixes all over the networking drivers from Peter
          Senna Tschudin.
      
       7) Fix routing cache removal regressions in IPSEC, from Steffen
          Klassert.
      
       8) Fix deadlock in RDS during pings, from Jeff Liu.
      
       9) Neighbour packet queue can trigger skb_under_panic() because we do
          not reset the network header of the SKB in the right spot.  From
          Ramesh Nagappa.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (61 commits)
        RDS: fix rds-ping spinlock recursion
        netdev/phy: Prototype of_mdio_find_bus()
        farsync: fix support for over 30 cards
        be2net: Remove code that stops further access to BE NIC based on UE bits
        pch_gbe: Fix build error by selecting all the possible dependencies.
        e1000e: add device IDs for i218
        ixgbe/ixgbevf: Limit maximum jumbo frame size to 9.5K to avoid Tx hangs
        ixgbevf: Set the netdev number of Tx queues
        UAPI: (Scripted) Disintegrate include/linux/tc_ematch
        UAPI: (Scripted) Disintegrate include/linux/tc_act
        UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv6
        UAPI: (Scripted) Disintegrate include/linux/netfilter_ipv4
        UAPI: (Scripted) Disintegrate include/linux/netfilter_bridge
        UAPI: (Scripted) Disintegrate include/linux/netfilter_arp
        UAPI: (Scripted) Disintegrate include/linux/netfilter/ipset
        UAPI: (Scripted) Disintegrate include/linux/netfilter
        UAPI: (Scripted) Disintegrate include/linux/isdn
        UAPI: (Scripted) Disintegrate include/linux/caif
        net: fix typo in freescale/ucc_geth.c
        vxlan: fix more sparse warnings
        ...
      aac2b1f5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 23d5385f
      Linus Torvalds authored
      Pull sparc update from David Miller:
       "This is just the UAPI commits for sparc via David Howells."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        UAPI: (Scripted) Disintegrate arch/sparc/include/asm
      23d5385f
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma · b7e97d22
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       "This time we have Andy updates on dw_dmac which is attempting to make
        this IP block available as PCI and platform device though not fully
        complete this time.
      
        We also have TI EDMA moving the dma driver to use dmaengine APIs, also
        have a new driver for mmp-tdma, along with bunch of small updates.
      
        Now for your excitement the merge is little unusual here, while
        merging the auto merge on linux-next picks wrong choice for pl330
        (drivers/dma/pl330.c) and this causes build failure.  The correct
        resolution is in linux-next.  (DMA: PL330: Fix build error) I didn't
        back merge your tree this time as you are better than me so no point
        in doing that for me :)"
      
      Fixed the pl330 conflict as in linux-next, along with trivial header
      file conflicts due to changed includes.
      
      * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (29 commits)
        dma: tegra: fix interrupt name issue with apb dma.
        dw_dmac: fix a regression in dwc_prep_dma_memcpy
        dw_dmac: introduce software emulation of LLP transfers
        dw_dmac: autoconfigure data_width or get it via platform data
        dw_dmac: autoconfigure block_size or use platform data
        dw_dmac: get number of channels from hardware if possible
        dw_dmac: fill optional encoded parameters in register structure
        dw_dmac: mark dwc_dump_chan_regs as inline
        DMA: PL330: return ENOMEM instead of 0 from pl330_alloc_chan_resources
        DMA: PL330: Remove redundant runtime_suspend/resume functions
        DMA: PL330: Remove controller clock enable/disable
        dmaengine: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
        DMA: PL330: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
        ARM: EXYNOS: Set the capability of pdm0 and pdm1 as DMA_PRIVATE
        dma: tegra: use list_move_tail instead of list_del/list_add_tail
        mxs/dma: Enlarge the CCW descriptor area to 4 pages
        dw_dmac: utilize slave_id to pass request line
        dmaengine: mmp_tdma: add dt support
        dmaengine: mmp-pdma support
        spi: davici - make davinci select edma
        ...
      b7e97d22