1. 16 11月, 2015 23 次提交
  2. 13 11月, 2015 3 次提交
    • A
      stmmac: avoid ipq806x constant overflow warning · 49e4a229
      Arnd Bergmann 提交于
      Building dwmac-ipq806x on a 64-bit architecture produces a harmless
      warning from gcc:
      
      stmmac/dwmac-ipq806x.c: In function 'ipq806x_gmac_probe':
      include/linux/bitops.h:6:19: warning: overflow in implicit constant conversion [-Woverflow]
        val = QSGMII_PHY_CDR_EN |
      stmmac/dwmac-ipq806x.c:333:8: note: in expansion of macro 'QSGMII_PHY_CDR_EN'
       #define QSGMII_PHY_CDR_EN   BIT(0)
       #define BIT(nr)   (1UL << (nr))
      
      This is a result of the type conversion rules in C, when we take the
      logical OR of multiple different types. In particular, we have
      and unsigned long
      
      	QSGMII_PHY_CDR_EN == BIT(0) == (1ul << 0) == 0x0000000000000001ul
      
      and a signed int
      
      	0xC << QSGMII_PHY_TX_DRV_AMP_OFFSET == 0xc0000000
      
      which together gives a signed long value
      
      	0xffffffffc0000001l
      
      and when this is passed into a function that takes an unsigned int type,
      gcc warns about the signed overflow and the loss of the upper 32-bits that
      are all ones.
      
      This patch adds 'ul' type modifiers to the literal numbers passed in
      here, so now the expression remains an 'unsigned long' with the upper
      bits all zero, and that avoids the signed overflow and the warning.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: b1c17215 ("stmmac: add ipq806x glue layer")
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      49e4a229
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 382a483e
      David S. Miller 提交于
      Pablo Neira Ayuso:
      
      ====================
      Netfilter fixes for net
      
      The following patchset contains Netfilter fixes for your net tree. This
      large batch that includes fixes for ipset, netfilter ingress, nf_tables
      dynamic set instantiation and a longstanding Kconfig dependency problem.
      More specifically, they are:
      
      1) Add missing check for empty hook list at the ingress hook, from
         Florian Westphal.
      
      2) Input and output interface are swapped at the ingress hook,
         reported by Patrick McHardy.
      
      3) Resolve ipset extension alignment issues on ARM, patch from Jozsef
         Kadlecsik.
      
      4) Fix bit check on bitmap in ipset hash type, also from Jozsef.
      
      5) Release buckets when all entries have expired in ipset hash type,
         again from Jozsef.
      
      6) Oneliner to initialize conntrack tuple object in the PPTP helper,
         otherwise the conntrack lookup may fail due to random bits in the
         structure holes, patch from Anthony Lineham.
      
      7) Silence a bogus gcc warning in nfnetlink_log, from Arnd Bergmann.
      
      8) Fix Kconfig dependency problems with TPROXY, socket and dup, also
         from Arnd.
      
      9) Add __netdev_alloc_pcpu_stats() to allow creating percpu counters
         from atomic context, this is required by the follow up fix for
         nf_tables.
      
      10) Fix crash from the dynamic set expression, we have to add new clone
          operation that should be defined when a simple memcpy is not enough.
          This resolves a crash when using per-cpu counters with new Patrick
          McHardy's flow table nft support.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      382a483e
    • F
      r8169: fix kasan reported skb use-after-free. · 39174291
      françois romieu 提交于
      Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>
      Reported-by: NDave Jones <davej@codemonkey.org.uk>
      Fixes: d7d2d89d ("r8169: Add software counter for multicast packages")
      Acked-by: NEric Dumazet <edumazet@google.com>
      Acked-by: NCorinna Vinschen <vinschen@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      39174291
  3. 11 11月, 2015 14 次提交
    • L
      Merge branch 'akpm' (patches from Andrew) · c5a37883
      Linus Torvalds 提交于
      Merge final patch-bomb from Andrew Morton:
       "Various leftovers, mainly Christoph's pci_dma_supported() removals"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        pci: remove pci_dma_supported
        usbnet: remove ifdefed out call to dma_supported
        kaweth: remove ifdefed out call to dma_supported
        sfc: don't call dma_supported
        nouveau: don't call pci_dma_supported
        netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
        cx23885: use pci_set_dma_mask insted of pci_dma_supported
        cx25821: use pci_set_dma_mask insted of pci_dma_supported
        cx88: use pci_set_dma_mask insted of pci_dma_supported
        saa7134: use pci_set_dma_mask insted of pci_dma_supported
        saa7164: use pci_set_dma_mask insted of pci_dma_supported
        tw68-core: use pci_set_dma_mask insted of pci_dma_supported
        pcnet32: use pci_set_dma_mask insted of pci_dma_supported
        lib/string.c: add ULL suffix to the constant definition
        hugetlb: trivial comment fix
        selftests/mlock2: add ULL suffix to 64-bit constants
        selftests/mlock2: add missing #define _GNU_SOURCE
      c5a37883
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5dfe5b2c
      Linus Torvalds 提交于
      Pull misc kbuild updates from Michal Marek:
       "This is the non-critical part of kbuild:
      
         - several coccinelle updates
         - make deb-pkg creates an armhf package if CONFIG_VFP=y
         - make tags understands some more powerpc macros"
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        coccinelle: Improve checking for missing NULL terminators
        coccinelle: ifnullfree: handle various destroy functions
        coccinelle: ifnullfree: various cleanups
        cocinelle: iterators: semantic patch to delete unneeded of_node_put
        deb-pkg: Add automatic support for armhf architecture
        scripts/coccinelle: fix typos
        coccinelle: misc: remove "complex return code" warnings
        Coccinelle: fix incorrect -include option transformation
        coccinelle: tests: improve odd_ptr_err.cocci
        coccinelle: misc: move constants to the right
        scripts/tags.sh: Teach tags about some powerpc macros
      5dfe5b2c
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 152813e6
      Linus Torvalds 提交于
      Pull kconfig updates from Michal Marek:
      
       - 'make xconfig' ported to Qt5, dropping support for Qt3
      
       - merge_config.sh supports a single-input-file mode and also respects
         $KCONFIG_CONFIG
      
       - Fix for incorrect display of >= and > in dependency expressions
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: (44 commits)
        Add current selection check.
        Use pkg-config to find Qt 4 and 5 instead of direct qmake
        kconfig: Fix copy&paste error
        kconfig/merge_config.sh: Accept a single file
        kconfig/merge_config.sh: Support KCONFIG_CONFIG
        Update the buildsystem for KConfig finding Qt
        Port xconfig to Qt5 - Update copyright.
        Port xconfig to Qt5 - Fix goParent issue.
        Port xconfig to Qt5 - on Back clicked, deselect old item.
        Port xconfig to Qt5 - Add(back) one click checkbox toggle.
        Port xconfig to Qt5 - Add(back) lineedit editing.
        Port xconfig to Qt5 - Remove some commented code.
        Port xconfig to Qt5 - Source format.
        Port xconfig to Qt5 - Add horizontal scrollbar, and scroll per pixel.
        Port xconfig to Qt5 - Change ConfigItem constructor parent type.
        Port xconfig to Qt5 - Disable ConfigList soring
        Port xconfig to Qt5 - Remove ConfigList::updateMenuList template.
        Port xconfig to Qt5 - Add ConfigList::mode to initializer list.
        Port xconfig to Qt5 - Add ConfigItem::nextItem to initializer list.
        Port xconfig to Qt5 - Tree widget set column titles.
        ...
      152813e6
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · c34e6e0b
      Linus Torvalds 提交于
      Pull kbuild update from Michal Marek:
       "The kbuild branch for v4.4-rc1 only has one commit: A new make
        kselftest-clean target cleans tools/testing/selftests"
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kselftest: add kselftest-clean rule
      c34e6e0b
    • L
      Merge tag 'linux-kselftest-4.4-rc1' of... · 6a177af7
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest updates from Shuah Khan:
       "This 12 patch update for 4.4-rc1 consists of a new pstore test and
        fixes to existing tests"
      
      * tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
        selftests: breakpoint: Actually build it
        selftests: vm: Try harder to allocate huge pages
        selftests: Make scripts executable
        selftests: kprobe: Choose an always-defined function to probe
        selftests: memfd: Stop unnecessary rebuilds
        selftests: Add missing #include directives
        selftests/seccomp: Be more precise with syscall arguments.
        selftests/seccomp: build and pass on arm64
        selftests: memfd_test: Revised STACK_SIZE to make it 16-byte aligned
        selftests/pstore: add pstore test scripts going with reboot
        selftests/pstore: add pstore test script for pre-reboot
        selftests: add .gitignore for efivarfs
      6a177af7
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ae36ce07
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Two build fixes, one for VC4, one for nouveau where the ARM only code
        is doing something a bit strange.  While people are discussing that,
        just workaround it and fix the build for now.  The code in question
        will never get used on anything non-ARM anyways.
      
        Also one fix for AST that SuSE had been hiding in their kernel, that
        allows all fbdev apps to work on that driver"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/nouveau: fix build failures on all non ARM.
        drm/ast: Initialized data needed to map fbdev memory
        drm/vc4: Add dependency on HAVE_DMA_ATTRS, and select DRM_GEM_CMA_HELPER
      ae36ce07
    • D
      drm/nouveau: fix build failures on all non ARM. · 10855aeb
      Dave Airlie 提交于
      gk20a is an ARM only GPU, so we can just do the correct thing on
      ARM but fail on other architectures. The other option was to use
      SWIOTLB as the define, which means phys_to_page exists, but
      this seems clearer.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      10855aeb
    • E
      drm/ast: Initialized data needed to map fbdev memory · 28fb4cb7
      Egbert Eich 提交于
      Due to a missing initialization there was no way to map fbdev memory.
      Thus for example using the Xserver with the fbdev driver failed.
      This fix adds initialization for fix.smem_start and fix.smem_len
      in the fb_info structure, which fixes this problem.
      Requested-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: stable@vger.kernel.org
      Signed-off-by: NEgbert Eich <eich@suse.de>
      [pulled from SuSE tree by me - airlied]
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      28fb4cb7
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2df4ee78
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix null deref in xt_TEE netfilter module, from Eric Dumazet.
      
       2) Several spots need to get to the original listner for SYN-ACK
          packets, most spots got this ok but some were not.  Whilst covering
          the remaining cases, create a helper to do this.  From Eric Dumazet.
      
       3) Missiing check of return value from alloc_netdev() in CAIF SPI code,
          from Rasmus Villemoes.
      
       4) Don't sleep while != TASK_RUNNING in macvtap, from Vlad Yasevich.
      
       5) Use after free in mvneta driver, from Justin Maggard.
      
       6) Fix race on dst->flags access in dst_release(), from Eric Dumazet.
      
       7) Add missing ZLIB_INFLATE dependency for new qed driver.  From Arnd
          Bergmann.
      
       8) Fix multicast getsockopt deadlock, from WANG Cong.
      
       9) Fix deadlock in btusb, from Kuba Pawlak.
      
      10) Some ipv6_add_dev() failure paths were not cleaning up the SNMP6
          counter state.  From Sabrina Dubroca.
      
      11) Fix packet_bind() race, which can cause lost notifications, from
          Francesco Ruggeri.
      
      12) Fix MAC restoration in qlcnic driver during bonding mode changes,
          from Jarod Wilson.
      
      13) Revert bridging forward delay change which broke libvirt and other
          userspace things, from Vlad Yasevich.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
        Revert "bridge: Allow forward delay to be cfgd when STP enabled"
        bpf_trace: Make dependent on PERF_EVENTS
        qed: select ZLIB_INFLATE
        net: fix a race in dst_release()
        net: mvneta: Fix memory use after free.
        net: Documentation: Fix default value tcp_limit_output_bytes
        macvtap: Resolve possible __might_sleep warning in macvtap_do_read()
        mvneta: add FIXED_PHY dependency
        net: caif: check return value of alloc_netdev
        net: hisilicon: NET_VENDOR_HISILICON should depend on HAS_DMA
        drivers: net: xgene: fix RGMII 10/100Mb mode
        netfilter: nft_meta: use skb_to_full_sk() helper
        net_sched: em_meta: use skb_to_full_sk() helper
        sched: cls_flow: use skb_to_full_sk() helper
        netfilter: xt_owner: use skb_to_full_sk() helper
        smack: use skb_to_full_sk() helper
        net: add skb_to_full_sk() helper and use it in selinux_netlbl_skbuff_setsid()
        bpf: doc: correct arch list for supported eBPF JIT
        dwc_eth_qos: Delete an unnecessary check before the function call "of_node_put"
        bonding: fix panic on non-ARPHRD_ETHER enslave failure
        ...
      2df4ee78
    • L
      Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block · 3419b450
      Linus Torvalds 提交于
      Pull block IO poll support from Jens Axboe:
       "Various groups have been doing experimentation around IO polling for
        (really) fast devices.  The code has been reviewed and has been
        sitting on the side for a few releases, but this is now good enough
        for coordinated benchmarking and further experimentation.
      
        Currently O_DIRECT sync read/write are supported.  A framework is in
        the works that allows scalable stats tracking so we can auto-tune
        this.  And we'll add libaio support as well soon.  Fow now, it's an
        opt-in feature for test purposes"
      
      * 'for-4.4/io-poll' of git://git.kernel.dk/linux-block:
        direct-io: be sure to assign dio->bio_bdev for both paths
        directio: add block polling support
        NVMe: add blk polling support
        block: add block polling support
        blk-mq: return tag/queue combo in the make_request_fn handlers
        block: change ->make_request_fn() and users to return a queue cookie
      3419b450
    • L
      Merge tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs · 01504f5e
      Linus Torvalds 提交于
      Pull UBI/UBIFS updates from Richard Weinberger:
      
       - access time support for UBIFS by Dongsheng Yang
      
       - random cleanups and bug fixes all over the place
      
      * tag 'upstream-4.4-rc1' of git://git.infradead.org/linux-ubifs:
        ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs
        ubifs: make ubifs_[get|set]xattr atomic
        UBIFS: Delete unnecessary checks before the function call "iput"
        UBI: Remove in vain semicolon
        UBI: Fastmap: Fix PEB array type
        UBIFS: Fix possible memory leak in ubifs_readdir()
        fs/ubifs: remove unnecessary new_valid_dev check
        ubi: fastmap: Implement produce_free_peb()
        UBIFS: print verbose message when rescanning a corrupted node
        UBIFS: call dbg_is_power_cut() instead of reading c->dbg->pc_happened
        UBI: drop null test before destroy functions
        UBI: Update comments to reflect UBI_METAONLY flag
        UBI: Fix debug message
        UBI: Fix typo in comment
        UBI: Fastmap: Simplify expression
        UBIFS: fix a typo in comment of ubifs_budget_req
        UBIFS: use kmemdup rather than duplicating its implementation
      01504f5e
    • L
      Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 4bde961e
      Linus Torvalds 提交于
      Pull UML updates from Richard Weinberger:
      
       - a new hrtimer based clocksource by Anton Ivanov
      
       - ptrace() enhancments by Richard Weinberger
      
       - random cleanups and bug fixes all over the place
      
      * 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: Switch clocksource to hrtimers
        um: net: replace GFP_KERNEL with GFP_ATOMIC when spinlock is held
        um: Report host OOM more nicely
        um: Simplify STUB_DATA loading
        um: Remove dead symbol from i386 syscall stub
        um: Remove dead code from x86_64 syscall stub
        um: Get rid of open coded NR_SYSCALLS
        um: Store syscall number after syscall_trace_enter()
        um: Define PTRACE_OLDSETOPTIONS
      4bde961e
    • C
      pci: remove pci_dma_supported · 247e75db
      Christoph Hellwig 提交于
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: Helge Deller <deller@gmx.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      247e75db
    • C
      usbnet: remove ifdefed out call to dma_supported · 704c16db
      Christoph Hellwig 提交于
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Cc: Oliver Neukum <oneukum@suse.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      704c16db