Skip to content
  1. Dec 20, 2012
    • Jesper Nilsson's avatar
      Merge tag 'disintegrate-cris-20121009' of... · e61ac0b0
      Jesper Nilsson authored
      Merge tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers into for-linus2
      
      UAPI Disintegration 2012-10-09
      
      * tag 'disintegrate-cris-20121009' of git://git.infradead.org/users/dhowells/linux-headers:
        UAPI: (Scripted) Disintegrate arch/cris/include/asm
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
        UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch
      e61ac0b0
    • James Hogan's avatar
      CRIS: use kbuild.h instead of defining macros in asm-offset.c · 8e6b4dd1
      James Hogan authored
      This is modelled on commits such as the one below:
      
      Commit fc1c3a00
      
       ("sh: use kbuild.h
      instead of defining macros in asm-offsets.c") introduced in v2.6.26.
      
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
      8e6b4dd1
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · f01af9f8
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
        well as an addition of a pte_accessible() define for sparc64 and a
        hugetlb fix from Dave Kleikamp."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
        sparc64: Fix ECB looping constructs in AES code.
        sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
        sparc64: Fix AES ctr mode block size.
        sparc64: Fix unrolled AES 256-bit key loops.
        sparc64: Define pte_accessible()
        sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
      f01af9f8
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 9eb127cc
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Really fix tuntap SKB use after free bug, from Eric Dumazet.
      
       2) Adjust SKB data pointer to point past the transport header before
          calling icmpv6_notify() so that the headers are in the state which
          that function expects.  From Duan Jiong.
      
       3) Fix ambiguities in the new tuntap multi-queue APIs.  From Jason
          Wang.
      
       4) mISDN needs to use del_timer_sync(), from Konstantin Khlebnikov.
      
       5) Don't destroy mutex after freeing up device private in mac802154,
          fix also from Konstantin Khlebnikov.
      
       6) Fix INET request socket leak in TCP and DCCP, from Christoph Paasch.
      
       7) SCTP HMAC kconfig rework, from Neil Horman.
      
       8) Fix SCTP jprobes function signature, otherwise things explode, from
          Daniel Borkmann.
      
       9) Fix typo in ipv6-offload Makefile variable reference, from Simon
          Arlott.
      
      10) Don't fail USBNET open just because remote wakeup isn't supported,
          from Oliver Neukum.
      
      11) be2net driver bug fixes from Sathya Perla.
      
      12) SOLOS PCI ATM driver bug fixes from Nathan Williams and David
          Woodhouse.
      
      13) Fix MTU changing regression in 8139cp driver, from John Greene.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (45 commits)
        solos-pci: ensure all TX packets are aligned to 4 bytes
        solos-pci: add firmware upgrade support for new models
        solos-pci: remove superfluous debug output
        solos-pci: add GPIO support for newer versions on Geos board
        8139cp: Prevent dev_close/cp_interrupt race on MTU change
        net: qmi_wwan: add ZTE MF880
        drivers/net: Use of_match_ptr() macro in smsc911x.c
        drivers/net: Use of_match_ptr() macro in smc91x.c
        ipv6: addrconf.c: remove unnecessary "if"
        bridge: Correctly encode addresses when dumping mdb entries
        bridge: Do not unregister all PF_BRIDGE rtnl operations
        use generic usbnet_manage_power()
        usbnet: generic manage_power()
        usbnet: handle PM failure gracefully
        ksz884x: fix receive polling race condition
        qlcnic: update driver version
        qlcnic: fix unused variable warnings
        net: fec: forbid FEC_PTP on SoCs that do not support
        be2net: fix wrong frag_idx reported by RX CQ
        be2net: fix be_close() to ensure all events are ack'ed
        ...
      9eb127cc
    • Linus Torvalds's avatar
      Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of... · e3279550
      Linus Torvalds authored
      Merge tags 'dt-for-linus', 'gpio-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
      
      Pull devicetree, gpio and spi bugfixes from Grant Likely:
       "Device tree v3.8 bug fix:
         - Fixes an undefined struct device build error and a missing symbol
           export.
      
        GPIO device driver bug fixes:
         - gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
         - gpio/ich: Add missing spinlock init
      
        SPI device driver bug fixes:
         - Most of this is bug fixes to the core code and the sh-hspi and
           s3c64xx device drivers.
      
         - There is also a patch here to add DT support to the Atmel driver.
           This one should have been in the first round, but I missed it.
           It's a low risk change contained within a single driver and the
           Atmel maintainer has requested it."
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS
        of: Fix export of of_find_matching_node_and_match()
      
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
        gpio/ich: Add missing spinlock init
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        spi/sh-hspi: fix return value check in hspi_probe().
        spi: fix tegra SPI binding examples
        spi/atmel: add DT support
        of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.
        spi: Change FIFO flush operation and spi channel off
        spi: Keep chipselect assertion during one message
      e3279550
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · dcd6a97d
      Linus Torvalds authored
      Pull drm bugfix from Dave Airlie:
       "Just a single urgent regression fix, seeing a few wierd behaviours I'd
        like not to persist."
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
        drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling
      dcd6a97d
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 7005cd39
      Linus Torvalds authored
      Pull random updates from Ted Ts'o:
       "A few /dev/random improvements for the v3.8 merge window."
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: Mix cputime from each thread that exits to the pool
        random: prime last_data value per fips requirements
        random: fix debug format strings
        random: make it possible to enable debugging without rebuild
      7005cd39
    • David S. Miller's avatar
      sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code. · 62ba63dc
      David S. Miller authored
      
      
      We use the FPU and therefore cannot sleep during the crypto
      loops.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      62ba63dc
    • David S. Miller's avatar
      sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code. · b3a37947
      David S. Miller authored
      
      
      We use the FPU and therefore cannot sleep during the crypto
      loops.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b3a37947
    • David S. Miller's avatar
      sparc64: Fix ECB looping constructs in AES code. · ce688951
      David S. Miller authored
      
      
      Things works better when you increment the source buffer pointer
      properly.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ce688951
    • David S. Miller's avatar
      sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code. · b35d282e
      David S. Miller authored
      
      
      We use the FPU and therefore cannot sleep during the crypto
      loops.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b35d282e
    • David S. Miller's avatar
      sparc64: Fix AES ctr mode block size. · a8d97cef
      David S. Miller authored
      
      
      Like the generic versions, we need to support a block size
      of '1' for CTR mode AES.
      
      This was discovered thanks to all of the new test cases added by
      Jussi Kivilinna.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a8d97cef
    • David S. Miller's avatar
      sparc64: Fix unrolled AES 256-bit key loops. · 9f28ffc0
      David S. Miller authored
      
      
      The basic scheme of the block mode assembler is that we start by
      enabling the FPU, loading the key into the floating point registers,
      then iterate calling the encrypt/decrypt routine for each block.
      
      For the 256-bit key cases, we run short on registers in the unrolled
      loops.
      
      So the {ENCRYPT,DECRYPT}_256_2() macros reload the key registers that
      get clobbered.
      
      The unrolled macros, {ENCRYPT,DECRYPT}_256(), are not mindful of this.
      
      So if we have a mix of multi-block and single-block calls, the
      single-block unrolled 256-bit encrypt/decrypt can run with some
      of the key registers clobbered.
      
      Handle this by always explicitly loading those registers before using
      the non-unrolled 256-bit macro.
      
      This was discovered thanks to all of the new test cases added by
      Jussi Kivilinna.
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9f28ffc0
    • David Woodhouse's avatar
      solos-pci: ensure all TX packets are aligned to 4 bytes · 152a2a8b
      David Woodhouse authored
      
      
      The FPGA can't handled unaligned DMA (yet). So copy into an aligned buffer,
      if skb->data isn't suitably aligned.
      
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      152a2a8b
    • Nathan Williams's avatar
    • Nathan Williams's avatar
    • Nathan Williams's avatar
      solos-pci: add GPIO support for newer versions on Geos board · f9baad02
      Nathan Williams authored
      
      
      dwmw2: Tidy up a little, simpler matching on which GPIO is being accessed,
             only register on newer boards, register under PCI device instead of
             duplicating them under each ATM device.
      
      Signed-off-by: default avatarNathan Williams <nathan@traverse.com.au>
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f9baad02
    • John Greene's avatar
      8139cp: Prevent dev_close/cp_interrupt race on MTU change · 83c34fd0
      John Greene authored
      commit:  cb64edb6
      
       upstream
      
      Above commit may introduce a race between cp_interrupt and dev_close
      / change MTU / dev_open up state. Changes cp_interrupt to tolerate
      this.  Change spin_locking in cp_interrupt to avoid possible
      but unobserved race.
      
      Reported-by: default avatar"Francois Romieu" <romieu@fr.zoreil.com>
      
      Tested on virtual hardware, Tx MTU size up to 4096, max tx payload
          was ping -s 4068 for MTU of 4096. No real hardware, need test
          assist.
      
      Signed-off-by: default avatar"John Greene" <jogreene@redhat.com>
      CC: "David S. Miller" <davem@davemloft.net>
      CC: "David Woodhouse" <David.Woodhouse@intel.com>
      Tested-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      83c34fd0
    • Gregory CLEMENT's avatar
      gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG · bc1008cf
      Gregory CLEMENT authored
      
      
      When building without device tree support (for the mv78x00 SoCs for
      example), the build failed because of_irq_count is undeclared. However
      mvebu-gpio is not designed to build without device tree support. So
      make it depends on OF_CONFIG, remove the #ifdef OF_CONFIG line and the
      platform_device_id.
      
      Tested on RD-78x00-mASA, DB-78460-BP, DB-88F6710-BP-DDR3,
      DB-MV784MP-GP, Mirabox and OpenBlocks AX3.
      
      Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      bc1008cf
    • Jean Delvare's avatar
      gpio/ich: Add missing spinlock init · d39a948f
      Jean Delvare authored
      
      
      As reported by CONFIG_DEBUG_SPINLOCK=y.
      
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      Acked-by: default avatarPeter Tyser <ptyser@xes-inc.com>
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      d39a948f
    • Maarten Lankhorst's avatar
      drm/ttm: fix delayed ttm_bo_cleanup_refs_and_unlock delayed handling · 0953e76e
      Maarten Lankhorst authored
      Fix regression introduced by 85b144f8
      
      
      "drm/ttm: call ttm_bo_cleanup_refs with reservation and lru lock held, v3"
      
      Slowpath ttm_bo_cleanup_refs_and_unlock accidentally tried to increase
      refcount on &bo->sync_obj instead of bo->sync_obj.
      
      The compiler didn't complain since sync_obj_ref takes a void pointer,
      so it was still valid c.
      
      This could result in lockups, memory corruptions, and warnings like
      these when graphics card VRAM usage is high:
      
      ------------[ cut here ]------------
      WARNING: at include/linux/kref.h:42 radeon_fence_ref+0x2c/0x40()
      Hardware name: System Product Name
      Pid: 157, comm: X Not tainted 3.7.0-rc7-00520-g85b144f-dirty #174
      Call Trace:
      [<ffffffff81058c84>] ? warn_slowpath_common+0x74/0xb0
      [<ffffffff8129273c>] ? radeon_fence_ref+0x2c/0x40
      [<ffffffff8125e95c>] ? ttm_bo_cleanup_refs_and_unlock+0x18c/0x2d0
      [<ffffffff8125f17c>] ? ttm_mem_evict_first+0x1dc/0x2a0
      [<ffffffff81264452>] ? ttm_bo_man_get_node+0x62/0xb0
      [<ffffffff8125f4ce>] ? ttm_bo_mem_space+0x28e/0x340
      [<ffffffff8125fb0c>] ? ttm_bo_move_buffer+0xfc/0x170
      [<ffffffff810de172>] ? kmem_cache_alloc+0xb2/0xc0
      [<ffffffff8125fc15>] ? ttm_bo_validate+0x95/0x110
      [<ffffffff8125ff7c>] ? ttm_bo_init+0x2ec/0x3b0
      [<ffffffff8129419a>] ? radeon_bo_create+0x18a/0x200
      [<ffffffff81293e80>] ? radeon_bo_clear_va+0x40/0x40
      [<ffffffff812a5342>] ? radeon_gem_object_create+0x92/0x160
      [<ffffffff812a575c>] ? radeon_gem_create_ioctl+0x6c/0x150
      [<ffffffff812a529f>] ? radeon_gem_object_free+0x2f/0x40
      [<ffffffff81246b60>] ? drm_ioctl+0x420/0x4f0
      [<ffffffff812a56f0>] ? radeon_gem_pwrite_ioctl+0x20/0x20
      [<ffffffff810f53a4>] ? do_vfs_ioctl+0x2e4/0x4e0
      [<ffffffff810e5588>] ? vfs_read+0x118/0x160
      [<ffffffff810f55ec>] ? sys_ioctl+0x4c/0xa0
      [<ffffffff810e5851>] ? sys_read+0x51/0xa0
      [<ffffffff814b0612>] ? system_call_fastpath+0x16/0x1b
      
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Acked-by: default avatarPaul Menzel <paulepanter@users.sourceforge.net>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      0953e76e
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux · 2f0bf925
      Linus Torvalds authored
      Pull Xtensa patchset from Chris Zankel:
       "This contains support of device trees, many fixes, and code clean-ups"
      
      * tag 'xtensa-20121218' of git://github.com/czankel/xtensa-linux: (33 commits)
        xtensa: don't try to build DTB when OF is disabled
        xtensa: set the correct ethernet address for xtfpga
        xtensa: clean up files to make them code-style compliant
        xtensa: provide endianness macro for sparse
        xtensa: fix RASID SR initialization
        xtensa: initialize CPENABLE SR when core has one
        xtensa: reset all timers on initialization
        Use for_each_compatible_node() macro.
        xtensa: add XTFPGA DTS
        xtensa: add support for the XTFPGA boards
        xtensa: add device trees support
        xtensa: add IRQ domains support
        xtensa: add U-Boot image support (uImage).
        xtensa: clean up boot make rules
        xtensa: fix mb and wmb definitions
        xtensa: add s32c1i-based spinlock implementations
        xtensa: add s32c1i-based bitops implementations
        xtensa: add s32c1i-based atomic ops implementations
        xtensa: add s32c1i sanity check
        xtensa: add trap_set_handler function
        ...
      2f0bf925
    • Linus Torvalds's avatar
      Merge branch 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1bd12c91
      Linus Torvalds authored
      Pull one final 386 removal patch from Peter Anvin.
      
      IRQ 13 FPU error handling is gone.  That was not one of the proudest
      moments in PC history.
      
      * 'x86/nuke386' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, 386 removal: Remove support for IRQ 13 FPU error reporting
      1bd12c91
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3dbff0d5
      Linus Torvalds authored
      Pull small x86 fixes from Peter Anvin:
       "A collection of very small fixes, mostly pure documentation."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, doc: Document that bootloader ID 4 is used also by iPXE
        x86, doc: Add a formal bootloader ID for kexec-tools
        x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
      3dbff0d5
    • Bjørn Mork's avatar
      net: qmi_wwan: add ZTE MF880 · f8b84034
      Bjørn Mork authored
      
      
      The driver description files gives these names to the vendor specific
      functions on this modem:
      
       diag: VID_19D2&PID_0284&MI_00
       nmea: VID_19D2&PID_0284&MI_01
       at:   VID_19D2&PID_0284&MI_02
       mdm:  VID_19D2&PID_0284&MI_03
       net:  VID_19D2&PID_0284&MI_04
      
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f8b84034
    • Sachin Kamat's avatar
      drivers/net: Use of_match_ptr() macro in smsc911x.c · d62fdf8b
      Sachin Kamat authored
      
      
      Add CONFIG_OF guard and use of_match_ptr macro.
      
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d62fdf8b
    • Sachin Kamat's avatar
      drivers/net: Use of_match_ptr() macro in smc91x.c · 89ce376c
      Sachin Kamat authored
      
      
      This eliminates having an #ifdef returning NULL for the case
      when OF is disabled.
      
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      89ce376c
    • Cong Ding's avatar
      ipv6: addrconf.c: remove unnecessary "if" · bd779028
      Cong Ding authored
      
      
      the value of err is always negative if it goes to errout, so we don't need to
      check the value of err.
      
      Signed-off-by: default avatarCong Ding <dinggnu@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bd779028
    • Vlad Yasevich's avatar
      bridge: Correctly encode addresses when dumping mdb entries · 09d7cf7d
      Vlad Yasevich authored
      
      
      When dumping mdb table, set the addresses the kernel returns
      based on the address protocol type.
      
      Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
      Acked-by: default avatarCong Wang <amwang@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09d7cf7d
    • Vlad Yasevich's avatar
      bridge: Do not unregister all PF_BRIDGE rtnl operations · 63233159
      Vlad Yasevich authored
      
      
      Bridge fdb and link rtnl operations are registered in
      core/rtnetlink.  Bridge mdb operations are registred
      in bridge/mdb.  When removing bridge module, do not
      unregister ALL PF_BRIDGE ops since that would remove
      the ops from rtnetlink as well.  Do remove mdb ops when
      bridge is destroyed.
      
      Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      63233159
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd · ca2a88f5
      Linus Torvalds authored
      Pull MTD updates from David Woodhouse:
       - Various cleanups especially in NAND tests
       - Add support for NAND flash on BCMA bus
       - DT support for sh_flctl and denali NAND drivers
       - Kill obsolete/superceded drivers (fortunet, nomadik_nand)
       - Fix JFFS2 locking bug in ENOMEM failure path
       - New SPI flash chips, as usual
       - Support writing in 'reliable mode' for DiskOnChip G4
       - Debugfs support in nandsim
      
      * tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd: (96 commits)
        mtd: nand: typo in nand_id_has_period() comments
        mtd: nand/gpio: use io{read,write}*_rep accessors
        mtd: block2mtd: throttle writes by calling balance_dirty_pages_ratelimited.
        mtd: nand: gpmi: reset BCH earlier, too, to avoid NAND startup problems
        mtd: nand/docg4: fix and improve read of factory bbt
        mtd: nand/docg4: reserve bb marker area in ecclayout
        mtd: nand/docg4: add support for writing in reliable mode
        mtd: mxc_nand: reorder part_probes to let cmdline override other sources
        mtd: mxc_nand: fix unbalanced clk_disable() in error path
        mtd: nandsim: Introduce debugfs infrastructure
        mtd: physmap_of: error checking to prevent a NULL pointer dereference
        mtg: docg3: potential divide by zero in doc_write_oob()
        mtd: bcm47xxnflash: writing support
        mtd: tests/read: initialize buffer for whole next page
        mtd: at91: atmel_nand: return bit flips for the PMECC read_page()
        mtd: fix recovery after failed write-buffer operation in cfi_cmdset_0002.c
        mtd: nand: onfi need to be probed in 8 bits mode
        mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width
        mtd: nand: print flash size during detection
        mted: nand_wait_ready timeout fix
        ...
      ca2a88f5
    • Oliver Neukum's avatar
      use generic usbnet_manage_power() · a5e40708
      Oliver Neukum authored
      
      
      This covers the drivers that can use a primitive
      implementation.
      
      Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5e40708
    • Oliver Neukum's avatar
      usbnet: generic manage_power() · 2dd7c8cf
      Oliver Neukum authored
      
      
      Centralise common code for manage_power() in usbnet
      by making a generic simple implementation
      
      Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2dd7c8cf
    • Oliver Neukum's avatar
      usbnet: handle PM failure gracefully · a1c088e0
      Oliver Neukum authored
      
      
      If a device fails to do remote wakeup, this is no reason
      to abort an open totally. This patch just continues without
      runtime PM.
      
      Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a1c088e0
    • Lennert Buytenhek's avatar
      ksz884x: fix receive polling race condition · 4945106d
      Lennert Buytenhek authored
      
      
      The ksz884x driver does receive processing in a custom tasklet, and
      seems to be assuming that since it takes its private interface spinlock
      with spin_lock_irq(), it won't be running concurrently with its own
      interrupt handler, as it cannot be preempted by it, but since its
      interrupt handler doesn't do any locking whatsoever, the receive
      processing tasklet and interrupt handler can end up running concurrently
      on different CPUs.
      
      As a result of this, the ksz884x receive path ends up locking up fairly
      easily, when the receive processing tasklet's reenabling of receive
      interrupts (due to it being done with polling the receive ring) races
      with the interrupt handler's disabling of receive interrupts (due to a
      new receive interrupt coming in) resulting in the receive interrupt
      being masked but the receive processing tasklet not being scheduled.
      
      Fix this by making the ksz884x interrupt handler take its private
      interface spinlock.  This requires upgrading the spin_lock() in the
      transmit cleanup tasklet to a spin_lock_irq(), as otherwise the IRQ
      handler can preempt transmit cleanup and deadlock the system, but
      with those two changes, no more receive lockups have been observed.
      
      Reported-by: default avatarChris Healy <cphealy@gmail.com>
      Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
      
      ----
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4945106d
    • Signed-off-by: Sony Chacko's avatar
      341abdbe
    • Shahed Shaikh's avatar
      qlcnic: fix unused variable warnings · 5d17f36b
      Shahed Shaikh authored
      
      
      qlcnic_hw.c:370: warning: variable cmd_desc set but not used
      qlcnic_hw.c:368: warning: variable consumer set but not used
      qlcnic_main.c:448: warning: variable ref_count set but not used
      qlcnic_main.c:534: warning: variable mem_base set but not used
      qlcnic_ctx.c:137: warning: variable tmp_tmpl set but not used
      qlcnic_ctx.c:133: warning: variable version set but not used
      qlcnic_minidump.c:200: warning: variable opcode set but not used
      
      Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
      Signed-off-by: default avatarSony Chacko <sony.chacko@qlogic.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5d17f36b
    • Bjørn Mork's avatar
      watchdog: Fix disable/enable regression · 3935e895
      Bjørn Mork authored
      Commit 8d451690
      
       ("watchdog: Fix CPU hotplug regression") causes an
      oops or hard lockup when doing
      
       echo 0 > /proc/sys/kernel/nmi_watchdog
       echo 1 > /proc/sys/kernel/nmi_watchdog
      
      and the kernel is booted with nmi_watchdog=1 (default)
      
      Running laptop-mode-tools and disconnecting/connecting AC power will
      cause this to trigger, making it a common failure scenario on laptops.
      
      Instead of bailing out of watchdog_disable() when !watchdog_enabled we
      can initialize the hrtimer regardless of watchdog_enabled status.  This
      makes it safe to call watchdog_disable() in the nmi_watchdog=0 case,
      without the negative effect on the enabled => disabled => enabled case.
      
      All these tests pass with this patch:
      - nmi_watchdog=1
        echo 0 > /proc/sys/kernel/nmi_watchdog
        echo 1 > /proc/sys/kernel/nmi_watchdog
      
      - nmi_watchdog=0
        echo 0 > /sys/devices/system/cpu/cpu1/online
      
      - nmi_watchdog=0
        echo mem > /sys/power/state
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51661
      
      Cc: <stable@vger.kernel.org> # v3.7
      Cc: Norbert Warmuth <nwarmuth@t-online.de>
      Cc: Joseph Salisbury <joseph.salisbury@canonical.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      3935e895
    • John W. Linville's avatar
      Merge branch 'master' of... · d67df2b9
      John W. Linville authored
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      d67df2b9
    • Linus Torvalds's avatar
      Merge tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm · 74779e22
      Linus Torvalds authored
      Pull pwm changes from Thierry Reding:
       "A new driver has been added for the SPEAr platform and the
        TWL4030/6030 driver has been replaced by two drivers that control the
        regular PWMs and the PWM driven LEDs provided by the chips.
      
        The vt8500, tiecap, tiehrpwm, i.MX, LPC32xx and Samsung drivers have
        all been improved and the device tree bindings now support the PWM
        signal polarity."
      
      Fix up trivial conflicts due to __devinit/exit removal.
      
      * tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (21 commits)
        pwm: samsung: add missing s3c->pwm_id assignment
        pwm: lpc32xx: Set the chip base for dynamic allocation
        pwm: lpc32xx: Properly disable the clock on device removal
        pwm: lpc32xx: Fix the PWM polarity
        pwm: i.MX: eliminate build warning
        pwm: Export of_pwm_xlate_with_flags()
        pwm: Remove pwm-twl6030 driver
        pwm: New driver to support PWM driven LEDs on TWL4030/6030 series of PMICs
        pwm: New driver to support PWMs on TWL4030/6030 series of PMICs
        pwm: pwm-tiehrpwm: pinctrl support
        pwm: tiehrpwm: Add device-tree binding
        pwm: pwm-tiehrpwm: Adding TBCLK gating support.
        pwm: pwm-tiecap: pinctrl support
        pwm: tiecap: Add device-tree binding
        pwm: Add TI PWM subsystem driver
        pwm: Device tree support for PWM polarity
        pwm: vt8500: Ensure PWM clock is enabled during pwm_config
        pwm: vt8500: Fix build error
        pwm: spear: Staticize spear_pwm_config()
        pwm: Add SPEAr PWM chip driver support
        ...
      74779e22