1. 13 Nov, 2012 20 commits
  2. 12 Nov, 2012 3 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.8d' of... · 045020e7
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.8d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      IIO cleanups and fixes from Jonathan:
      
      "4th set of IIO driver updates and new functionality for the 3.8 cycle.
      
      2 drivers going through final cleanup and moving out of staging.
      
      Addition to the core of support for multiple buffers from a single
      datastream.  This functionality is core in allowing multiple users
      of interrupt driven data streams from the devices.  First user
      will shortly be an input bridge driver.  This has been in review
      / revision for over a year resulting in a far cleaner result.
      Much of the work had been in precursor patches. Here we just
      add the buffer set tear up and down support + switch to multiple
      buffer pushing in the drivers (a one line change in all users).
      Thanks to those who have tested / reviewed this set."
      045020e7
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-for-3.8c' of... · fa7952bf
      Greg Kroah-Hartman authored
      Merge tag 'iio-for-3.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
      
      IIO patches from Jonathan:
      
      "Third round of IIO subsystem updates for the 3.8 cycle.
      
      Here we have a series of fixes to the adis16400 driver. These
      were part of a previous pull request for the 3.7 cycle but
      Greg suggested delaying them given their large and invasive
      nature and the fact they aren't fixing regressions (as the
      relevant code was never correct).
      
      The support added for the adis16334 missed a number of small
      differences between this and the parts supported.  This series
      deals with those and also cleans up some related code."
      fa7952bf
    • Greg Kroah-Hartman's avatar
      Merge 3.7-rc5 into staging-next · f8b06550
      Greg Kroah-Hartman authored
      f8b06550
  3. 11 Nov, 2012 1 commit
  4. 10 Nov, 2012 16 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · b251f0f3
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "Bug fixes galore, mostly in drivers as is often the case:
      
        1) USB gadget and cdc_eem drivers need adjustments to their frame size
           lengths in order to handle VLANs correctly.  From Ian Coolidge.
      
        2) TIPC and several network drivers erroneously call tasklet_disable
           before tasklet_kill, fix from Xiaotian Feng.
      
        3) r8169 driver needs to apply the WOL suspend quirk to more chipsets,
           fix from Cyril Brulebois.
      
        4) Fix multicast filters on RTL_GIGA_MAC_VER_35 r8169 chips, from
           Nathan Walp.
      
        5) FDB netlink dumps should use RTM_NEWNEIGH as the message type, not
           zero.  From John Fastabend.
      
        6) Fix smsc95xx tx checksum offload on big-endian, from Steve
           Glendinning.
      
        7) __inet_diag_dump() needs to repsect and report the error value
           returned from inet_diag_lock_handler() rather than ignore it.
           Otherwise if an inet diag handler is not available for a particular
           protocol, we essentially report success instead of giving an error
           indication.  Fix from Cyrill Gorcunov.
      
        8) When the QFQ packet scheduler sees TSO/GSO packets it does not
           handle things properly, and in fact ends up corrupting it's
           datastructures as well as mis-schedule packets.  Fix from Paolo
           Valente.
      
        9) Fix oopser in skb_loop_sk(), from Eric Leblond.
      
        10) CXGB4 passes partially uninitialized datastructures in to FW
            commands, fix from Vipul Pandya.
      
        11) When we send unsolicited ipv6 neighbour advertisements, we should
            send them to the link-local allnodes multicast address, as per
            RFC4861.  Fix from Hannes Frederic Sowa.
      
        12) There is some kind of bug in the usbnet's kevent deferral
            mechanism, but more immediately when it triggers an uncontrolled
            stream of kernel messages spam the log.  Rate limit the error log
            message triggered when this problem occurs, as sending thousands
            of error messages into the kernel log doesn't help matters at all,
            and in fact makes further diagnosis more difficult.
      
            From Steve Glendinning.
      
        13) Fix gianfar restore from hibernation, from Wang Dongsheng.
      
        14) The netlink message attribute sizes are wrong in the ipv6 GRE
            driver, it was using the size of ipv4 addresses instead of ipv6
            ones :-) Fix from Nicolas Dichtel."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        gre6: fix rtnl dump messages
        gianfar: ethernet vanishes after restoring from hibernation
        usbnet: ratelimit kevent may have been dropped warnings
        ipv6: send unsolicited neighbour advertisements to all-nodes
        net: usb: cdc_eem: Fix rx skb allocation for 802.1Q VLANs
        usb: gadget: g_ether: fix frame size check for 802.1Q
        cxgb4: Fix initialization of SGE_CONTROL register
        isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES
        cxgb4: Initialize data structures before using.
        af-packet: fix oops when socket is not present
        pkt_sched: enable QFQ to support TSO/GSO
        net: inet_diag -- Return error code if protocol handler is missed
        net: bnx2x: Fix typo in bnx2x driver
        smsc95xx: fix tx checksum offload for big endian
        rtnetlink: Use nlmsg type RTM_NEWNEIGH from dflt fdb dump
        ptp: update adjfreq callback description
        r8169: allow multicast packets on sub-8168f chipset.
        r8169: Fix WoL on RTL8168d/8111d.
        drivers/net: use tasklet_kill in device remove/close process
        tipc: do not use tasklet_disable before tasklet_kill
      b251f0f3
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 2b1768f3
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Several build/bug fixes for sparc, including:
      
        1) Configuring a mix of static vs.  modular sparc64 crypto modules
           didn't work, remove an ill-conceived attempt to only have to build
           the device match table for these drivers once to fix the problem.
      
           Reported by Meelis Roos.
      
        2) Make the montgomery multiple/square and mpmul instructions actually
           usable in 32-bit tasks.  Essentially this involves providing 32-bit
           userspace with a way to use a 64-bit stack when it needs to.
      
        3) Our sparc64 atomic backoffs don't yield cpu strands properly on
           Niagara chips.  Use pause instruction when available to achieve
           this, otherwise use a benign instruction we know blocks the strand
           for some time.
      
        4) Wire up kcmp
      
        5) Fix the build of various drivers by removing the unnecessary
           blocking of OF_GPIO when SPARC.
      
        6) Fix unintended regression wherein of_address_to_resource stopped
           being provided.  Fix from Andreas Larsson.
      
        7) Fix NULL dereference in leon_handle_ext_irq(), also from Andreas
           Larsson."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix build with mix of modular vs. non-modular crypto drivers.
        sparc: Support atomic64_dec_if_positive properly.
        of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again
        sparc32, leon: Check for existent irq_map entry in leon_handle_ext_irq
        sparc: Add sparc support for platform_get_irq()
        sparc: Allow OF_GPIO on sparc.
        qlogicpti: Fix build warning.
        sparc: Wire up sys_kcmp.
        sparc64: Improvde documentation and readability of atomic backoff code.
        sparc64: Use pause instruction when available.
        sparc64: Fix cpu strand yielding.
        sparc64: Make montmul/montsqr/mpmul usable in 32-bit threads.
      2b1768f3
    • Jonathan Cameron's avatar
      iio:adc:max1363 move from staging. · 168c9d95
      Jonathan Cameron authored
      Now this driver is using kfifo we can move it out of staging.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      168c9d95
    • Jonathan Cameron's avatar
      staging:iio:adc:max1363 cleanup regulator handling. · b77b8f8c
      Jonathan Cameron authored
      For historical reasons the regulator handling was a little clunky. This
      patch brings it inline with a more standard ordering wrt to allocation
      of the iio_device.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      b77b8f8c
    • Jonathan Cameron's avatar
      0d9fa2ce
    • Jonathan Cameron's avatar
    • Jonathan Cameron's avatar
      staging:iio:adc:max1363 drop references to 'ring' given now using a fifo · ec443728
      Jonathan Cameron authored
      Seems worth clearing the old naming out to avoid any confusion in the future.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      ec443728
    • Jonathan Cameron's avatar
      staging:iio:adc:max1363 consolidate files. · b3bcbfcf
      Jonathan Cameron authored
      For a long while now the max1363 core has selected the
      buffer anyway. For a while I meant to make the separation
      work again, but given how long it has been it is probably
      time to conclude it will never happen and settle for tidying
      up what we have.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      b3bcbfcf
    • Jonathan Cameron's avatar
      staging:iio:adc:max1363 ring_sw->kfifo conversion · 0d331e4f
      Jonathan Cameron authored
      We are moving towards scrapping ring_sw so this move
      is necessary.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      0d331e4f
    • Jonathan Cameron's avatar
      staging:iio: add a callback buffer for in kernel push interface · 92d1079b
      Jonathan Cameron authored
      This callback buffer is meant to be opaque to users, but basically
      adds a very simple pass through buffer to which data may be
      pushed when it is inserted into the buffer list.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      92d1079b
    • Jonathan Cameron's avatar
      staging:iio:in kernel users: Add a data field for channel specific info. · 0464415d
      Jonathan Cameron authored
      Used to allow information about a given channel mapping to be passed
      through from board files to the consumer drivers.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      0464415d
    • Jonathan Cameron's avatar
      staging:iio: Add support for multiple buffers · 84b36ce5
      Jonathan Cameron authored
      Route all buffer writes through the demux.
      Addition or removal of a buffer results in tear down and
      setup of all the buffers for a given device.
      Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
      Tested-by: default avatarsrinivas pandruvada <srinivas.pandruvada@intel.com>
      84b36ce5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · affd9a8d
      Linus Torvalds authored
      Pull cifs fixes from Jeff Layton.
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Do not lookup hashed negative dentry in cifs_atomic_open
        cifs: fix potential buffer overrun in cifs.idmap handling code
      affd9a8d
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 487bda54
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       - correct argument type (pgprot_t) when calling __ioremap()
       - PCI_IOBASE virtual address change
       - use architected event for CPU cycle counter
       - fix ELF core dumping
       - select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
       - missing completion for secondary CPU boot
       - booting on systems with all memory beyond 4GB
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: fix booting on systems with no memory below 4GB
        arm64: smp: add missing completion for secondary boot
        arm64: compat: select CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        arm64: elf: fix core dumping definitions for GP and FP registers
        arm64: perf: use architected event for CPU cycle counter
        arm64: Move PCI_IOBASE closer to MODULES_VADDR
        arm64: Use pgprot_t as the last argument when invoking __ioremap()
      487bda54
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.7-rc5-tag' of... · 0020dd0b
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen fixes from Konrad Rzeszutek Wilk:
       "There are three ARM compile fixes (we forgot to export certain
        functions and if the drivers are built as an module - we go belly-up).
      
        There is also an mismatch of irq_enter() / exit_idle() calls sequence
        which were fixed some time ago in other piece of codes, but failed to
        appear in the Xen code.
      
        Lastly a fix for to help in the field with troubleshooting in case we
        cannot get the appropriate parameter and also fallback code when
        working with very old hypervisors."
      
      Bug-fixes:
       - Fix compile issues on ARM.
       - Fix hypercall fallback code for old hypervisors.
       - Print out which HVM parameter failed if it fails.
       - Fix idle notifier call after irq_enter.
      
      * tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen/arm: Fix compile errors when drivers are compiled as modules (export more).
        xen/arm: Fix compile errors when drivers are compiled as modules.
        xen/generic: Disable fallback build on ARM.
        xen/events: fix RCU warning, or Call idle notifier after irq_enter()
        xen/hvm: If we fail to fetch an HVM parameter print out which flag it is.
        xen/hypercall: fix hypercall fallback code for very old hypervisors
      0020dd0b
    • David S. Miller's avatar
      sparc64: Fix build with mix of modular vs. non-modular crypto drivers. · 226f7cea
      David S. Miller authored
      We tried linking in a single built object to hold the device table,
      but only works if all of the sparc64 crypto modules get built the same
      way (modular vs. non-modular).
      
      Just include the device ID stub into each driver source file so that
      the table gets compiled into the correct result in all cases.
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      226f7cea