1. 09 Dec, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b19d69c7
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are a bunch of USB fixes for 3.13-rc3.
      
        Nothing major, but we seem to have an argument about a XHCI fix, so
        I'm not including a revert that Sarah requested, because that breaks a
        USB network driver, and I can't revert the USB network driver fix
        without reintroducing other bugs that it fixed.  So as it is,
        everything should now be working.  Worse case, I can revert the XHCI
        fix before 3.13-final is out, but it seems to work well here with my
        testing, so all should be good.
      
        Other than that, some driver updates based on reports"
      
      * tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
        usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
        usb: ohci-pxa27x: include linux/dma-mapping.h
        USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem
        usb: tools: fix a regression issue that gcc can't link to pthread
        USB: switch maintainership of chipidea to Peter
        USB: pl2303: fixed handling of CS5 setting
        USB: ftdi_sio: fixed handling of unsupported CSIZE setting
        USB: mos7840: correct handling of CS5 setting
        USB: spcp8x5: correct handling of CS5 setting
        usb: wusbcore: fix deadlock in wusbhc_gtk_rekey
        usb: wusbcore: do device lookup while holding the hc mutex
        usb: wusbcore: send keepalives to unauthenticated devices
        USB: option: support new huawei devices
        USB: serial: option: blacklist interface 1 for Huawei E173s-6
        usb: xhci: Link TRB must not occur within a USB payload burst
        usb: gadget: f_mass_storage: call try_to_freeze only when its safe
        usb: gadget: tcm_usb_gadget: mark bot_cleanup_old_alt static
        usb: gadget: ffs: fix sparse warning
        usb: gadget: zero: module parameters can be static
        usb: gadget: storage: fix sparse warning
        ...
      b19d69c7
    • Linus Torvalds's avatar
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 7d49efe2
      Linus Torvalds authored
      Pull ARM64 fixes from Catalin Marinas:
       - Page table fixes (PROT_NONE, shareability attribute, TLB
         invalidation)
       - Secondary CPUs entry endianness fix
       - Make NR_CPUS default to 8
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: Fix PMD_SECT_PROT_NONE definition
        arm64: Fix memory shareability attribute for ioremap_wc/cache
        arm64: kernel: add code to set cpu boot mode to secondary_entry shim
        arm64: make default NR_CPUS 8
        arm64: ensure completion of TLB invalidatation
      7d49efe2
  2. 06 Dec, 2013 16 commits
  3. 05 Dec, 2013 17 commits
  4. 04 Dec, 2013 5 commits
    • Huang Rui's avatar
      usb: tools: fix a regression issue that gcc can't link to pthread · cb292ce2
      Huang Rui authored
      Reproduce:
      ray@hr-bak:~/usb$ make -C tools/usb/
      make: Entering directory `/home/ray/usb/tools/usb'
      gcc -Wall -Wextra -g -lpthread -I../include -o testusb testusb.c
      /tmp/cc0EMxfy.o: In function `main':
      /home/ray/usb/tools/usb/testusb.c:508: undefined reference to `pthread_create'
      /home/ray/usb/tools/usb/testusb.c:531: undefined reference to `pthread_join'
      collect2: error: ld returned 1 exit status
      make: *** [testusb] Error 1
      make: Leaving directory `/home/ray/usb/tools/usb'
      
      Comments:
      In the latest version (4.7.3) of gcc compiler, it requres that
      libraries must follow the object or source files like below:
      
      "gcc hello.c -lpthread" instead of "gcc -lpthread hello.c"
      
      And it isn't encountered at gcc version 4.7.2.
      So this patch fix to move the pthread option after testusb.c.
      Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      cb292ce2
    • H. Peter Anvin's avatar
      x86, bitops: Correct the assembly constraints to testing bitops · e0f6dec3
      H. Peter Anvin authored
      In checkin:
      
      0c44c2d0 x86: Use asm goto to implement better modify_and_test() functions
      
      the various functions which do modify and test were unified and
      optimized using "asm goto".  However, this change missed the detail
      that the bitops require an "Ir" constraint rather than an "er"
      constraint ("I" = integer constant from 0-31, "e" = signed 32-bit
      integer constant).  This would cause code to miscompile if these
      functions were used on constant bit positions 32-255 and the build to
      fail if used on constant bit positions above 255.
      
      Add the constraints as a parameter to the GEN_BINARY_RMWcc() macro to
      avoid this problem.
      Reported-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/529E8719.4070202@zytor.com
      e0f6dec3
    • Helge Deller's avatar
      nfs: fix do_div() warning by instead using sector_div() · 3873d064
      Helge Deller authored
      When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
      shown below.  Fix this warning by instead using sector_div() which is provided
      by the kernel.h header file.
      
      fs/nfs/blocklayout/extents.c: In function ‘normalize’:
      include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
      fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
      nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
      fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
      include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
       extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      3873d064
    • Trond Myklebust's avatar
    • Trond Myklebust's avatar
      NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery · f22e5edd
      Trond Myklebust authored
      Andy Adamson reports:
      
      The state manager is recovering expired state and recovery OPENs are being
      processed. If kswapd is pruning inodes at the same time, a deadlock can occur
      when kswapd calls evict_inode on an NFSv4.1 inode with a layout, and the
      resultant layoutreturn gets an error that the state mangager is to handle,
      causing the layoutreturn to wait on the (NFS client) cl_rpcwaitq.
      
      At the same time an open is waiting for the inode deletion to complete in
      __wait_on_freeing_inode.
      
      If the open is either the open called by the state manager, or an open from
      the same open owner that is holding the NFSv4 sequence id which causes the
      OPEN from the state manager to wait for the sequence id on the Seqid_waitqueue,
      then the state is deadlocked with kswapd.
      
      The fix is simply to have layoutreturn ignore all errors except NFS4ERR_DELAY.
      We already know that layouts are dropped on all server reboots, and that
      it has to be coded to deal with the "forgetful client model" that doesn't
      send layoutreturns.
      Reported-by: default avatarAndy Adamson <andros@netapp.com>
      Link: http://lkml.kernel.org/r/1385402270-14284-1-git-send-email-andros@netapp.comSigned-off-by: default avatarTrond Myklebust <Trond.Myklebust@primarydata.com>
      f22e5edd