Skip to content
  1. Jan 21, 2016
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 0c582826
      Linus Torvalds authored
      Pull non-urgent ARM SoC fixes from Olof Johansson:
       "As usual, we queue up a few fixes that don't seem urgent enough to go
        in through -rc.
      
         - MAINTAINERS updates to add a list for brcmstb and fix a typo
         - A handful of fixes for OMAP 81xx, a recently resurrected platform
           so these can't be considered real regressions and thus got queued.
         - A couple of other small fixes for scoop, sa1100 and davinci"
      
      * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP2+: Fix randconfig build warning for dm814_pllss_data
        ARM: sa1100/simpad: Be sure to clamp return value
        ARM: scoop: Be sure to clamp return value
        ARM: davinci: fix a problematic usage of WARN()
        ARM: davinci: only select WT cache if cache is enabled
        ARM: OMAP2+: Remove useless check for legacy booting for dm814x
        ARM: OMAP2+: Enable GPIO for dm814x
        ARM: dts: Fix dm814x pinctrl address and mask
        ARM: dts: Fix dm8148 control modules ranges
        ARM: OMAP2+: Fix timer entries for dm814x
        ARM: dts: Fix some mux and divider clocks to get dm814x-evm booting
        ARM: OMAP2+: Add DPPLS clock manager for dm814x
        clk: ti: Add few dm814x clock aliases
        ARM: dts: Fix dm814x entries for pllss and prcm
        MAINTAINERS: gpio-brcmstb: Remove stray '>'
        MAINTAINERS: brcmstb: Include Broadcom internal mailing-list
      0c582826
    • Linus Torvalds's avatar
      Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · e3de671d
      Linus Torvalds authored
      Pull asm-generic updates from Arnd Bergmann:
       "The asm-generic tree this time contains one series from Nicolas Pitre
        that makes the optimized do_div() implementation from the ARM
        architecture available to all architectures.
      
        This also adds stricter type checking for callers of do_div, which has
        uncovered a number of bugs in existing code, and fixes up the ones we
        have found"
      
      * tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        ARM: asm/div64.h: adjust to generic codde
        __div64_32(): make it overridable at compile time
        __div64_const32(): abstract out the actual 128-bit cross product code
        do_div(): generic optimization for constant divisor on 32-bit machines
        div64.h: optimize do_div() for power-of-two constant divisors
        mtd/sm_ftl.c: fix wrong do_div() usage
        drm/mgag200/mgag200_mode.c: fix wrong do_div() usage
        hid-sensor-hub.c: fix wrong do_div() usage
        ti/fapll: fix wrong do_div() usage
        ti/clkt_dpll: fix wrong do_div() usage
        tegra/clk-divider: fix wrong do_div() usage
        imx/clk-pllv2: fix wrong do_div() usage
        imx/clk-pllv1: fix wrong do_div() usage
        nouveau/nvkm/subdev/clk/gk20a.c: fix wrong do_div() usage
      e3de671d
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 71e4634e
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "The highlights this round include:
      
         - Introduce configfs support for unlocked configfs_depend_item()
           (krzysztof + andrezej)
         - Conversion of usb-gadget target driver to new function registration
           interface (andrzej + sebastian)
         - Enable qla2xxx FC target mode support for Extended Logins (himansu +
           giridhar)
         - Enable qla2xxx FC target mode support for Exchange Offload (himansu +
           giridhar)
         - Add qla2xxx FC target mode irq affinity notification + selective
           command queuing.  (quinn + himanshu)
         - Fix iscsi-target deadlock in se_node_acl configfs deletion (sagi +
           nab)
         - Convert se_node_acl configfs deletion + se_node_acl->queue_depth to
           proper se_session->sess_kref + target_get_session() usage.  (hch +
           sagi + nab)
         - Fix long-standing race between se_node_acl->acl_kref get and
           get_initiator_node_acl() lookup.  (hch + nab)
         - Fix target/user block-size handling, and make sure netlink reaches
           all network namespaces (sheng + andy)
      
        Note there is an outstanding bug-fix series for remote I_T nexus port
        TMR LUN_RESET has been posted and still being tested, and will likely
        become post -rc1 material at this point"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (56 commits)
        scsi: qla2xxxx: avoid type mismatch in comparison
        target/user: Make sure netlink would reach all network namespaces
        target: Obtain se_node_acl->acl_kref during get_initiator_node_acl
        target: Convert ACL change queue_depth se_session reference usage
        iscsi-target: Fix potential dead-lock during node acl delete
        ib_srpt: Convert acl lookup to modern get_initiator_node_acl usage
        tcm_fc: Convert acl lookup to modern get_initiator_node_acl usage
        tcm_fc: Wait for command completion before freeing a session
        target: Fix a memory leak in target_dev_lba_map_store()
        target: Support aborting tasks with a 64-bit tag
        usb/gadget: Remove set-but-not-used variables
        target: Remove an unused variable
        target: Fix indentation in target_core_configfs.c
        target/user: Allow user to set block size before enabling device
        iser-target: Fix non negative ERR_PTR isert_device_get usage
        target/fcoe: Add tag support to tcm_fc
        qla2xxx: Check for online flag instead of active reset when transmitting responses
        qla2xxx: Set all queues to 4k
        qla2xxx: Disable ZIO at start time.
        qla2xxx: Move atioq to a different lock to reduce lock contention
        ...
      71e4634e
    • Dan Williams's avatar
      Do not enable CONFIG_IO_STRICT_DEVMEM by default · 19a3dd76
      Dan Williams authored
      Larry Finger reports:
       "My PowerBook G4 Aluminum with a 32-bit PPC processor fails to boot for
        the 4.4-git series".
      
      This is likely due to X still needing /dev/mem access on this platform.
      
      CONFIG_IO_STRICT_DEVMEM is not yet safe to turn on when
      CONFIG_STRICT_DEVMEM=y.
      
      Remove the default so that old configurations do not change behavior.
      
      Fixes: 90a545e9
      
       ("restrict /dev/mem to idle io memory ranges")
      Reported-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
      Link: http://marc.info/?l=linux-kernel&m=145332012023825&w=2
      
      
      Acked-by: default avatarKees Cook <keescook@chromium.org>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      19a3dd76
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 9fa68606
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "Here is my second pull request for this window:
      
        A few driver fixes have piled up and one missed rcar bindings patch
        which got somehow lost in for-linus branch so cherry-picked that one.
      
        Fixes are for dw, at_hdmac, edma"
      
      * tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: rcar-dmac: Document SoC specific bindings
        dmaengine: at_xdmac: fix resume for cyclic transfers
        dmaengine: dw: fix cyclic transfer callbacks
        dmaengine: dw: fix cyclic transfer setup
        dmaengine: edma: Fix paRAM slot allocation for entry channel 0
      9fa68606
    • Linus Torvalds's avatar
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 90bf353b
      Linus Torvalds authored
      Pull misc kbuild updates from Michal Marek:
       - Fix for make O=... perf-tar*
       - make tags revamp and fix for the fallout.  Patch for warnings about
         line breaks inside DEFINE_PER_CPU macros is pending
       - New coccinelle test
      
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        coccinelle: tests: unsigned value cannot be lesser than zero
        tags: Unify emacs and exuberant rules
        tags: Drop the _PE rule
        tags: Do not try to index defconfigs
        tags: Process Kconfig files in a single pass
        tags: Fix erroneous pattern match in a comment
        aic7xxx: Avoid name collision with <linux/list.h>
        tags: Treat header files as C code
        package Makefile: fix perf-tar targets when outdir is set
        scripts/tags.sh: Teach tags about more powerpc macros
      90bf353b
    • Linus Torvalds's avatar
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · af75d517
      Linus Torvalds authored
      Pull kconfig updates from Michal Marek:
       - Fix for make xconfig segfault
       - Handle long strings in config symbol values
       - Fix for mixing boolean and kconfig ternary type
      
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kconfig: fix qconf segfault by deleting heap objects
        kconfig: return 'false' instead of 'no' in bool function
        kconfig: allow kconfig to handle longer path names
      af75d517
    • Linus Torvalds's avatar
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · d9569f00
      Linus Torvalds authored
      Pull kbuild updates from Michal Marek:
       - Make <modname>-m in makefiles work like <modname>-y and fix the
         fallout
       - Minor genksyms fix
       - Fix race with make -j install modules_install
       - Move -Wsign-compare from make W=1 to W=2
       - Other minor fixes
      
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        kbuild: Demote 'sign-compare' warning to W=2
        Makefile: revert "Makefile: Document ability to make file.lst and file.S" partially
        kbuild: Do not run modules_install and install in paralel
        genksyms: Handle string literals with spaces in reference files
        fixdep: constify strrcmp arguments
        ath10k: Fix build with CONFIG_THERMAL=m
        Revert "drm: Hack around CONFIG_AGP=m build failures"
        kbuild: Allow to specify composite modules with modname-m
        staging/ad7606: Actually build the interface modules
      d9569f00
    • David Howells's avatar
      FRV: Mark architecture orphaned · 0cf0305f
      David Howells authored
      
      
      Mark the FRV architecture orphaned in the MAINTAINERS file.
      
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0cf0305f
    • Simon Horman's avatar
      MAINTAINERS: Update mailing list for Renesas SoC Development · 4a121096
      Simon Horman authored
      
      
      Update the mailing list used for development of support for
      Renesas SoCs and related drivers.
      
      Up until now the linux-sh mailing list has been used, however,
      Renesas SoCs are now much wider than the SH architecture and there
      is some desire from some for the linux-sh list to refocus on
      discussion of the work on the SH architecture.
      
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      Acked-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
      Acked-by: default avatarMagnus Damm <damm@opensource.se>
      Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Acked-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
      Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Acked-by: default avatarRich Felker <dalias@libc.org>
      Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      4a121096
    • Arnd Bergmann's avatar
      mm: avoid uninitialized variable in tracepoint · 629d9d1c
      Arnd Bergmann authored
      
      
      A newly added tracepoint in the hugepage code uses a variable in the
      error handling that is not initialized at that point:
      
      include/trace/events/huge_memory.h:81:230: error: 'isolated' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      
      The result is relatively harmless, as the trace data will in rare
      cases contain incorrect data.
      
      This works around the problem by adding an explicit initialization.
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Fixes: 7d2eba05
      
       ("mm: add tracepoint for scanning pages")
      Reviewed-by: default avatarEbru Akagunduz <ebru.akagunduz@gmail.com>
      Acked-by: default avatarDavid Rientjes <rientjes@google.com>
      Cc: Kirill A. Shutemov <kirill@shutemov.name>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      629d9d1c
  2. Jan 20, 2016