1. 23 Mar, 2016 2 commits
    • Linus Torvalds's avatar
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 33c1f638
      Linus Torvalds authored
      Pull clk updates from Stephen Boyd:
       "The clk changes for this release cycle are mostly dominated by new
        device support in terms of LoC, but there has been some cleanup in the
        core as well as the usual minor clk additions to various drivers.
      
        Core:
         - parent tracking has been simplified
         - CLK_IS_ROOT is now a no-op flag, cleaning up drivers has started
         - of_clk_init() doesn't consider disabled DT nodes anymore
         - clk_unregister() had an error path bug squashed
         - of_clk_get_parent_count() has been fixed to only return unsigned ints
         - HAVE_MACH_CLKDEV is removed now that the last arch user (ARM) is gone
      
        New Drivers:
         - NXP LPC18xx creg
         - QCOM IPQ4019 GCC
         - TI dm814x ADPLL
         - i.MX6QP
      
        Updates:
         - Cyngus audio clks found on Broadcom iProc devices
         - Non-critical fixes for BCM2385 PLLs
         - Samsung exynos5433 updates for clk id errors, HDMI support,
           suspend/resume simplifications
         - USB, CAN, LVDS, and FCP clks on shmobile devices
         - sunxi got support for more clks on new SoCs and went through a
           minor refactoring/rewrite to use a simpler factor clk construct
         - rockchip added some more clk ids and added suport for fraction
           dividers
         - QCOM GDSCs in msm8996
         - A new devm helper to make adding custom actions simpler (acked by Greg)"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (197 commits)
        clk: bcm2835: fix check of error code returned by devm_ioremap_resource()
        clk: renesas: div6: use RENESAS for #define
        clk: renesas: Rename header file renesas.h
        clk: max77{686,802}: Remove CLK_IS_ROOT
        clk: versatile: Remove CLK_IS_ROOT
        clk: sunxi: Remove use of variable length array
        clk: fixed-rate: Remove CLK_IS_ROOT
        clk: qcom: Remove CLK_IS_ROOT
        doc: dt: add documentation for lpc1850-creg-clk driver
        clk: add lpc18xx creg clk driver
        clk: lpc32xx: fix compilation warning
        clk: xgene: Add missing parenthesis when clearing divider value
        clk: mb86s7x: Remove CLK_IS_ROOT
        clk: x86: Remove clkdev.h and clk.h includes
        clk: x86: Remove CLK_IS_ROOT
        clk: mvebu: Remove CLK_IS_ROOT
        clk: renesas: move drivers to renesas directory
        clk: si5{14,351,70}: Remove CLK_IS_ROOT
        clk: scpi: Remove CLK_IS_ROOT
        clk: s2mps11: Remove CLK_IS_ROOT
        ...
      33c1f638
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · a24e3d41
      Linus Torvalds authored
      Merge third patch-bomb from Andrew Morton:
      
       - more ocfs2 changes
      
       - a few hotfixes
      
       - Andy's compat cleanups
      
       - misc fixes to fatfs, ptrace, coredump, cpumask, creds, eventfd,
         panic, ipmi, kgdb, profile, kfifo, ubsan, etc.
      
       - many rapidio updates: fixes, new drivers.
      
       - kcov: kernel code coverage feature.  Like gcov, but not
         "prohibitively expensive".
      
       - extable code consolidation for various archs
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (81 commits)
        ia64/extable: use generic search and sort routines
        x86/extable: use generic search and sort routines
        s390/extable: use generic search and sort routines
        alpha/extable: use generic search and sort routines
        kernel/...: convert pr_warning to pr_warn
        drivers: dma-coherent: use memset_io for DMA_MEMORY_IO mappings
        drivers: dma-coherent: use MEMREMAP_WC for DMA_MEMORY_MAP
        memremap: add MEMREMAP_WC flag
        memremap: don't modify flags
        kernel/signal.c: add compile-time check for __ARCH_SI_PREAMBLE_SIZE
        mm/mprotect.c: don't imply PROT_EXEC on non-exec fs
        ipc/sem: make semctl setting sempid consistent
        ubsan: fix tree-wide -Wmaybe-uninitialized false positives
        kfifo: fix sparse complaints
        scripts/gdb: account for changes in module data structure
        scripts/gdb: add cmdline reader command
        scripts/gdb: add version command
        kernel: add kcov code coverage
        profile: hide unused functions when !CONFIG_PROC_FS
        hpwdt: use nmi_panic() when kernel panics in NMI handler
        ...
      a24e3d41
  2. 22 Mar, 2016 38 commits