1. 26 Nov, 2015 6 commits
  2. 18 Nov, 2015 26 commits
  3. 17 Nov, 2015 1 commit
  4. 11 Nov, 2015 7 commits
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · c5a37883
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 5dfe5b2c
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 152813e6
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · c34e6e0b
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge tag 'linux-kselftest-4.4-rc1' of... · 6a177af7
      Linus Torvalds authored
      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
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ae36ce07
      Linus Torvalds authored
      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
    • Dave Airlie's avatar
      drm/nouveau: fix build failures on all non ARM. · 10855aeb
      Dave Airlie authored
      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: default avatarDave Airlie <airlied@redhat.com>
      10855aeb