1. 12 Oct, 2012 6 commits
  2. 11 Oct, 2012 1 commit
    • 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()
  3. 10 Oct, 2012 26 commits
    • 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)
    • 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
    • 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
    • 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>
    • 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>
    • 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>
    • 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-
         - 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
         - 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
    • 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>
    • 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>
    • 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>
    • 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>
    • 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>
    • 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
      * 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
    • 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()
    • 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
         - 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 +
         - 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 +
         - 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
    • 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
    • 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
    • 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
    • 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
    • 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
       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
    • 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
    • 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
    • Linus Torvalds's avatar
      Merge tag 'mmc-merge-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 943c2ace
      Linus Torvalds authored
      Pull MMC updates from Chris Ball:
         - Add DT properties for card detection (broken-cd, cd-gpios,
         - Don't poll non-removable devices
         - Fixup/rework eMMC sleep mode/"power off notify" feature
         - Support eMMC background operations (BKOPS).  To set the one-time
           programmable fuse that enables bkops on an eMMC that doesn't
           already have it set, you can use the "mmc bkops enable" command in:
         - atmel-mci, dw_mmc, pxa-mci, dove, s3c, spear: Add device tree
         - bfin_sdh: Add support for the controller in bf60x
         - dw_mmc: Support Samsung Exynos SoCs
         - eSDHC: Add ADMA support
         - sdhci: Support testing a cd-gpio (from slot-gpio) instead of
           presence bit
         - sdhci-pltfm: Support broken-cd DT property
         - tegra: Convert to only supporting DT (mach-tegra has gone DT-only)"
      * tag 'mmc-merge-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (67 commits)
        mmc: core: Fixup broken suspend and eMMC4.5 power off notify
        mmc: sdhci-spear: Add clk_{un}prepare() support
        mmc: sdhci-spear: add device tree bindings
        mmc: sdhci-s3c: Add clk_(enable/disable) in runtime suspend/resume
        mmc: core: Replace MMC_CAP2_BROKEN_VOLTAGE with test for fixed regulator
        mmc: sdhci-pxav3: Use sdhci_get_of_property for parsing DT quirks
        mmc: dt: Support "broken-cd" property in sdhci-pltfm
        mmc: sdhci-s3c: fix the wrong number of max bus clocks
        mmc: sh-mmcif: avoid oops on spurious interrupts
        mmc: sh-mmcif: properly handle MMC_WRITE_MULTIPLE_BLOCK completion IRQ
        mmc: sdhci-s3c: Fix crash on module insertion for second time
        mmc: sdhci-s3c: Enable only required bus clock
        mmc: Revert "mmc: dw_mmc: Add check for IDMAC configuration"
        mmc: mxcmmc: fix bug that may block a data transfer forever
        mmc: omap_hsmmc: Pass on the suspend failure to the PM core
        mmc: atmel-mci: AP700x PDC is not connected to MCI
        mmc: atmel-mci: DMA can be used with other controllers
        mmc: mmci: use clk_prepare_enable and clk_disable_unprepare
        mmc: sdhci-s3c: Add device tree support
        mmc: dw_mmc: add support for exynos specific implementation of dw-mshc
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121009' of git://git.infradead.org/mtd-2.6 · 10f39f04
      Linus Torvalds authored
      Pull MTD updates from David Woodhouse:
       - Disable broken mtdchar mmap() on MMU systems
       - Additional ECC tests for NAND flash, and some test cleanups
       - New NAND and SPI chip support
       - Fixes/cleanup for SH FLCTL NAND controller driver
       - Improved hardware support for GPMI NAND controller
       - Conversions to device-tree support for various drivers
       - Removal of obsolete drivers (sbc8xxx, bcmring, etc.)
       - New LPC32xx drivers for MLC and SLC NAND
       - Further cleanup of NAND OOB/ECC handling
       - UAPI cleanup merge from David Howells (just moving files, since MTD
         headers were sorted out long ago to separate user-visible from kernel
      * tag 'for-linus-20121009' of git://git.infradead.org/mtd-2.6: (168 commits)
        mtd: Disable mtdchar mmap on MMU systems
        UAPI: (Scripted) Disintegrate include/mtd
        mtd: nand: detect Samsung K9GBG08U0A, K9GAG08U0F ID
        mtd: nand: decode Hynix MLC, 6-byte ID length
        mtd: nand: increase max OOB size to 640
        mtd: nand: add generic READ ID length calculation functions
        mtd: nand: split simple ID decode into its own function
        mtd: nand: split extended ID decoding into its own function
        mtd: nand: split BB marker options decoding into its own function
        mtd: nand: remove redundant ID read
        mtd: nand: remove unnecessary variable
        mtd: docg4: add missing HAS_IOMEM dependency
        mtd: gpmi: initialize the timing registers only one time
        mtd: gpmi: add EDO feature for imx6q
        mtd: gpmi: do not set the default values for the extra clocks
        mtd: gpmi: simplify the DLL setting code
        mtd: gpmi: add a new field for HW_GPMI_CTRL1
        mtd: gpmi: do not get the clock frequency in gpmi_begin()
        mtd: gpmi: add a new field for HW_GPMI_TIMING1
        mtd: add helpers to get the supportted ONFI timing mode
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 72055425
      Linus Torvalds authored
      Pull btrfs update from Chris Mason:
       "This is a large pull, with the bulk of the updates coming from:
         - Hole punching
         - send/receive fixes
         - fsync performance
         - Disk format extension allowing more hardlinks inside a single
           directory (btrfs-progs patch required to enable the compat bit for
           this one)
        I'm cooking more unrelated RAID code, but I wanted to make sure this
        original batch makes it in.  The largest updates here are relatively
        old and have been in testing for some time."
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (121 commits)
        btrfs: init ref_index to zero in add_inode_ref
        Btrfs: remove repeated eb->pages check in, disk-io.c/csum_dirty_buffer
        Btrfs: fix page leakage
        Btrfs: do not warn_on when we cannot alloc a page for an extent buffer
        Btrfs: don't bug on enomem in readpage
        Btrfs: cleanup pages properly when ENOMEM in compression
        Btrfs: make filesystem read-only when submitting barrier fails
        Btrfs: detect corrupted filesystem after write I/O errors
        Btrfs: make compress and nodatacow mount options mutually exclusive
        btrfs: fix message printing
        Btrfs: don't bother committing delayed inode updates when fsyncing
        btrfs: move inline function code to header file
        Btrfs: remove unnecessary IS_ERR in bio_readpage_error()
        btrfs: remove unused function btrfs_insert_some_items()
        Btrfs: don't commit instead of overcommitting
        Btrfs: confirmation of value is added before trace_btrfs_get_extent() is called
        Btrfs: be smarter about dropping things from the tree log
        Btrfs: don't lookup csums for prealloc extents
        Btrfs: cache extent state when writing out dirty metadata pages
        Btrfs: do not hold the file extent leaf locked when adding extent item
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · fc81c038
      Linus Torvalds authored
      Pull CIFS fixes from Steve French.
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: reinstate the forcegid option
        Convert properly UTF-8 to UTF-16
        [CIFS] WARN_ON_ONCE if kernel_sendmsg() returns -ENOSPC
  4. 09 Oct, 2012 7 commits