1. 16 9月, 2013 4 次提交
  2. 14 9月, 2013 12 次提交
  3. 13 9月, 2013 17 次提交
  4. 12 9月, 2013 7 次提交
    • D
      Merge tag 'master-2013-09-09' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 732bf15e
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      This is a pull request for a few early fixes for the 3.12 stream.
      
      Alexey Khoroshilov corrects a use-after-free issue on rtl8187 found
      by the Linux Driver Verification project.
      
      Arend van Spriel provides a brcmfmac patch to fix a build issue
      reported by Randy Dunlap.
      
      Hauke Mehrtens offers a bcma fix to properly account for the storage
      width of error code values before checking them.
      
      Solomon Peachy brings a pair of cw1200 fixes to avoid hangs in that
      driver with SPI devices.  One avoids transfers in interrupt context,
      the other fixes a locking issue.
      
      Stanislaw Gruszka changes the initialization of the rt2800 driver to
      avoid a freeze, addressing a bug in the Red Hat bugzilla.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      732bf15e
    • F
      r8169: enforce RX_MULTI_EN for the 8168f. · 3ced8c95
      françois romieu 提交于
      Same narrative as eb2dc35d ("r8169: RxConfig
      hack for the 8168evl.") regarding AMD IOMMU errors.
      
      RTL_GIGA_MAC_VER_36 - 8168f as well - has not been reported to behave the
      same.
      Tested-by: NDavid R <david@unsolicited.net>
      Tested-by: NFrédéric Leroy <fredo@starox.org>
      Cc: Hayes Wang <hayeswang@realtek.com>
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3ced8c95
    • L
      Bye, bye, WfW flag · d5d04bb4
      Linus Torvalds 提交于
      This reverts the Linux for Workgroups thing.  And no, before somebody
      asks, we're not doing Linux95.  Not for a few years, at least.
      
      Sure, the flag added some color to the logo, and could have remained as
      a testament to my leet gimp skills.  But no.  And I'll do this early, to
      avoid the chance of forgetting when I'm doing the actual rc1 release on
      the road.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d5d04bb4
    • L
      Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of... · 1ae276a9
      Linus Torvalds 提交于
      Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull eCryptfs fixes from Tyler Hicks:
       "Two small fixes to the code that initializes the per-file crypto
        contexts"
      
      * tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        ecryptfs: avoid ctx initialization race
        ecryptfs: remove check for if an array is NULL
      1ae276a9
    • L
      Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 3b38f56c
      Linus Torvalds 提交于
      Pull DMA-mapping fix from Marek Szyprowski:
       "A build bugfix for the device tree support for reserved memory
        regions.  Due to superfluous include the common code failed to build
        on ARM64 and MIPS architectures.
      
        The patch that caused the build break has lived at linux-next for
        about two weeks and noone noticed the issue, what convinced me that
        everything was ok"
      
      * 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        drivers: of: fix build break if asm/dma-contiguous.h is missing
      3b38f56c
    • L
      Merge tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · b3b75684
      Linus Torvalds 提交于
      Pull dma-buf updates from Sumit Semwal:
       "Yet another small one - dma-buf framework now supports size discovery
        of the buffer via llseek"
      
      * tag 'for-3.12' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        dma-buf: Expose buffer size to userspace (v2)
        dma-buf: Check return value of anon_inode_getfile
      b3b75684
    • L
      Merge branch 'akpm' (patches from Andrew Morton) · c2d95729
      Linus Torvalds 提交于
      Merge first patch-bomb from Andrew Morton:
       - Some pidns/fork/exec tweaks
       - OCFS2 updates
       - Most of MM - there remain quite a few memcg parts which depend on
         pending core cgroups changes.  Which might have been already merged -
         I'll check tomorrow...
       - Various misc stuff all over the place
       - A few block bits which I never got around to sending to Jens -
         relatively minor things.
       - MAINTAINERS maintenance
       - A small number of lib/ updates
       - checkpatch updates
       - epoll
       - firmware/dmi-scan
       - Some kprobes work for S390
       - drivers/rtc updates
       - hfsplus feature work
       - vmcore feature work
       - rbtree upgrades
       - AOE updates
       - pktcdvd cleanups
       - PPS
       - memstick
       - w1
       - New "inittmpfs" feature, which does the obvious
       - More IPC work from Davidlohr.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (303 commits)
        lz4: fix compression/decompression signedness mismatch
        ipc: drop ipc_lock_check
        ipc, shm: drop shm_lock_check
        ipc: drop ipc_lock_by_ptr
        ipc, shm: guard against non-existant vma in shmdt(2)
        ipc: document general ipc locking scheme
        ipc,msg: drop msg_unlock
        ipc: rename ids->rw_mutex
        ipc,shm: shorten critical region for shmat
        ipc,shm: cleanup do_shmat pasta
        ipc,shm: shorten critical region for shmctl
        ipc,shm: make shmctl_nolock lockless
        ipc,shm: introduce shmctl_nolock
        ipc: drop ipcctl_pre_down
        ipc,shm: shorten critical region in shmctl_down
        ipc,shm: introduce lockless functions to obtain the ipc object
        initmpfs: use initramfs if rootfstype= or root= specified
        initmpfs: make rootfs use tmpfs when CONFIG_TMPFS enabled
        initmpfs: move rootfs code from fs/ramfs/ to init/
        initmpfs: move bdi setup from init_rootfs to init_ramfs
        ...
      c2d95729