* linux-next: manual merge of the staging tree with the net-next tree
From: Stephen Rothwell @ 2016-12-07 4:04 UTC (permalink / raw)
To: Greg KH, David Miller, Networking; +Cc: linux-next, linux-kernel, Jarod Wilson
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/slicoss/slicoss.c
between commit:
a52ad514fdf3 ("net: deprecate eth_change_mtu, remove usage")
from the net-next tree and commit:
0af72df267f2 ("staging: slicoss: remove the staging driver")
from the staging tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2016-12-07 1:37 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel
Hi all,
After merging the tip tree, today's linux-next build (powerpc64le perf)
failed like this:
LINK /home/sfr/next/perf/fixdep
/bin/sh: 1: /home/sfr/next/perf//fixdep: Permission denied
tools/build/Makefile.build:91: recipe for target '/home/sfr/next/perf/pmu-events/jevents.o' failed
$ ls -l /home/sfr/next/perf/fixdep
-rwxr-xr-x 1 sfr users 71104 Dec 7 12:26 /home/sfr/next/perf/fixdep
I am not sure what caused this, but redoing the build succeeded, so I
have just filed this report and left it for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: mmotm 2016-11-30-15-46 uploaded
From: Stephen Rothwell @ 2016-12-07 0:11 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
mhocko, broonie
In-Reply-To: <20161201114431.2a2cb11d@canb.auug.org.au>
Hi Andrew,
On Thu, 1 Dec 2016 11:44:31 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 30 Nov 2016 15:47:33 -0800 akpm@linux-foundation.org wrote:
> >
> > * ima-define-a-canonical-binary_runtime_measurements-list-format.patch
>
> This patch tries to patch the file
>
> Documentation/kernel-parameters.txt
>
> but that file has been renamed to
>
> Documentation/admin-guide/kernel-parameters.rst
>
> in linux-next. I just dropped the hunk from the patch.
I dropped this hunk again.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm 2016-12-06-15-45 uploaded
From: akpm @ 2016-12-06 23:46 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-12-06-15-45 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.9-rc8:
(patches marked "*" will be included in linux-next)
origin.patch
* zram-restrict-add-remove-attributes-to-root-only.patch
* radix-tree-test-suite-fix-compilation.patch
* kcov-add-missing-include-linux-schedh.patch
i-need-old-gcc.patch
* kthread-add-__printf-attributes.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* prctl-remove-one-shot-limitation-for-changing-exe-link.patch
* prctl-remove-one-shot-limitation-for-changing-exe-link-fix.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* scripts-bloat-o-meter-dont-use-readlines.patch
* scripts-bloat-o-meter-compile-number-regex.patch
* scripts-tagssh-handle-omap-platforms-properly.patch
* m32r-add-simple-dma.patch
* m32r-fix-build-warning.patch
* pcmcia-m32r_pcc-check-return-from-request_irq.patch
* pcmcia-m32r_pcc-use-common-error-path.patch
* pcmcia-m32r_pcc-check-return-from-add_pcc_socket.patch
* ocfs2-dlm-clean-up-useless-bug_on-default-case-in-dlm_finalize_reco_handler.patch
* ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
* ocfs2-dlm-clean-up-deadcode-in-dlm_master_request_handler.patch
* ocfs2-clean-up-unused-page-parameter-in-ocfs2_write_end_nolock.patch
* ocfs2-fix-double-put-of-recount-tree-in-ocfs2_lock_refcount_tree.patch
* fs-ocfs2-use-time64_t-to-represent-orphan-scan-times.patch
* fs-ocfs2-replace-current_time-macro.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-memcontrol-use-special-workqueue-for-creating-per-memcg-caches.patch
* slub-move-synchronize_sched-out-of-slab_mutex-on-shrink.patch
* slub-avoid-false-postive-warning.patch
* mm-check-kmem_create_cache-flags-are-commons.patch
* mm-slab-faster-active-and-free-stats.patch
* mm-slab-maintain-total-slab-count-instead-of-active-count.patch
* dont-touch-single-threaded-ptes-which-are-on-the-right-node.patch
* dont-touch-single-threaded-ptes-which-are-on-the-right-node-v3.patch
* vmscan-set-correct-defer-count-for-shrinker.patch
* mm-compaction-allow-compaction-for-gfp_nofs-requests.patch
* mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
* mm-gup-make-unnecessarily-global-vma_permits_fault-static.patch
* mm-hugetlb-use-the-right-pte-val-for-compare-in-hugetlb_cow.patch
* mm-hugetlb-use-huge_pte_lock-instead-of-opencoding-the-lock.patch
* kmemleak-fix-reference-to-documentation.patch
* mm-dont-steal-highatomic-pageblock.patch
* mm-prevent-double-decrease-of-nr_reserved_highatomic.patch
* mm-try-to-exhaust-highatomic-reserve-before-the-oom.patch
* mm-make-unreserve-highatomic-functions-reliable.patch
* mm-vmallocc-simplify-proc-vmallocinfo-implementation.patch
* mm-thp-avoid-unlikely-branches-for-split_huge_pmd.patch
* mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist.patch
* mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist-checkpatch-fixes.patch
* mm-compaction-fix-nr_isolated_-stats-for-pfn-based-migration.patch
* shmem-avoid-maybe-uninitialized-warning.patch
* mm-use-the-correct-page-size-when-removing-the-page.patch
* mm-update-mmu_gather-range-correctly.patch
* mm-hugetlb-add-tlb_remove_hugetlb_entry-for-handling-hugetlb-pages.patch
* mm-add-tlb_remove_check_page_size_change-to-track-page-size-change.patch
* mm-remove-the-page-size-change-check-in-tlb_remove_page.patch
* mm-fixup-get_user_pages-comments.patch
* mm-mempolicyc-forbid-static-or-relative-flags-for-local-numa-mode.patch
* powerpc-mm-allow-memory-hotplug-into-a-memoryless-node.patch
* mm-remove-x86-only-restriction-of-movable_node.patch
* mm-enable-config_movable_node-on-non-x86-arches.patch
* of-fdt-mark-hotpluggable-memory.patch
* dt-add-documentation-of-hotpluggable-memory-property.patch
* mm-pkeys-generate-pkey-system-call-code-only-if-arch_has_pkeys-is-selected.patch
* mm-disable-numa-migration-faults-for-dax-vmas.patch
* mm-disable-numa-migration-faults-for-dax-vmas-fix.patch
* mm-cma-make-linux-cmah-standalone-includible.patch
* filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert.patch
* filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert-fix.patch
* writeback-remove-redundant-if-check.patch
* shmem-fix-compilation-warnings-on-unused-functions.patch
* mm-dont-cap-request-size-based-on-read-ahead-setting.patch
* include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch
* mm-khugepaged-close-use-after-free-race-during-shmem-collapsing.patch
* mm-khugepaged-fix-radix-tree-node-leak-in-shmem-collapse-error-path.patch
* mm-workingset-turn-shadow-node-shrinker-bugs-into-warnings.patch
* lib-radix-tree-native-accounting-of-exceptional-entries.patch
* lib-radix-tree-check-accounting-of-existing-slot-replacement-users.patch
* lib-radix-tree-add-entry-deletion-support-to-__radix_tree_replace.patch
* lib-radix-tree-update-callback-for-changing-leaf-nodes.patch
* mm-workingset-move-shadow-entry-tracking-to-radix-tree-exceptional-tracking.patch
* mm-workingset-restore-refault-tracking-for-single-page-files.patch
* mm-workingset-update-shadow-limit-to-reflect-bigger-active-list.patch
* mm-remove-free_unmap_vmap_area_noflush.patch
* mm-remove-free_unmap_vmap_area_addr.patch
* mm-refactor-__purge_vmap_area_lazy.patch
* mm-add-vfree_atomic.patch
* kernel-fork-use-vfree_atomic-to-free-thread-stack.patch
* x86-ldt-use-vfree_atomic-to-free-ldt-entries.patch
* mm-mark-all-calls-into-the-vmalloc-subsystem-as-potentially-sleeping.patch
* mm-turn-vmap_purge_lock-into-a-mutex.patch
* mm-add-preempt-points-into-__purge_vmap_area_lazy.patch
* mm-move-vma_is_anonymous-check-within-pmd_move_must_withdraw.patch
* mm-thp-page-cache-support-for-ppc64.patch
* mm-thp-page-cache-support-for-ppc64-fix.patch
* mm-debug-print-raw-struct-page-data-in-__dump_page.patch
* mm-rmap-handle-anon_vma_prepare-common-case-inline.patch
* mm-rmap-handle-anon_vma_prepare-common-case-inline-checkpatch-fixes.patch
* mm-page_alloc-keep-pcp-count-and-list-contents-in-sync-if-struct-page-is-corrupted.patch
* mm-add-three-more-cond_resched-in-swapoff.patch
* mm-add-cond_resched-in-gather_pte_stats.patch
* mm-make-transparent-hugepage-size-public.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* z3fold-make-pages_nr-atomic.patch
* z3fold-extend-compaction-function.patch
* z3fold-use-per-page-spinlock.patch
* z3fold-discourage-use-of-pages-that-werent-compacted.patch
* z3fold-fix-header-size-related-issues.patch
* z3fold-fix-locking-issues.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-support-panic_on_warn.patch
* kasan-eliminate-long-stalls-during-quarantine-reduction.patch
* mm-percpuc-fix-panic-triggered-by-bug_on-falsely.patch
* proc-report-no_new_privs-state.patch
* proc-make-struct-pid_entry-len-unsigned.patch
* proc-make-struct-struct-map_files_info-len-unsigned-int.patch
* proc-just-list_del-struct-pde_opener.patch
* proc-fix-type-of-struct-pde_opener-closing-field.patch
* proc-kmalloc-struct-pde_opener.patch
* proc-tweak-comments-about-2-stage-open-and-everything.patch
* fs-proc-arrayc-slightly-improve-render_sigset_t.patch
* proc-save-decrement-during-lookup-readdir-in-proc-pid.patch
* proc-calculate-proc-and-proc-task-nlink-at-init-time.patch
* hung_task-decrement-sysctl_hung_task_warnings-only-if-it-is-positive.patch
* compiler-gcch-use-proved-instead-of-proofed.patch
* printk-nmi-handle-continuous-lines-and-missing-newline.patch
* printk-kdb-handle-more-message-headers.patch
* printk-btrfs-handle-more-message-headers.patch
* printk-btrfs-handle-more-message-headers-fix.patch
* printk-sound-handle-more-message-headers.patch
* printk-sound-handle-more-message-headers-fix.patch
* printk-add-kconfig-option-to-set-default-console-loglevel.patch
* get_maintainer-look-for-arbitrary-letter-prefixes-in-sections.patch
* maintainers-add-b-for-uri-where-to-file-bugs.patch
* maintainers-add-drm-and-drm-i915-bug-filing-info.patch
* maintainers-add-c-for-uri-for-chat-where-developers-hang-out.patch
* maintainers-add-drm-and-drm-i915-irc-channels.patch
* maintainers-clarify-that-b-is-the-uri-where-to-file-bugs.patch
* let-config_strict_devmem-depends-on-config_devmem.patch
* lib-rbtreec-fix-typo-in-comment-of-____rb_erase_color.patch
* lib-ida-document-locking-requirements-a-bit-better-v2.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-dont-try-to-get-maintained-status-when-no-tree-is-given.patch
* scripts-checkpatchpl-fix-spelling.patch
* checkpatch-dont-check-pl-files-improve-absolute-path-commit-log-test.patch
* checkpatch-avoid-multiple-line-dereferences.patch
* checkpatch-dont-check-c99-types-like-uint8_t-under-tools.patch
* checkpatch-dont-emit-unified-diff-error-for-rename-only-patches.patch
* binfmt_elf-use-vmalloc-for-allocation-of-vma_filesz.patch
* signals-avoid-unnecessary-taking-of-sighand-siglock.patch
* coredump-clarify-unsafe-core_pattern-warning.patch
* revert-kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* kexec-change-to-export-the-value-of-phys_base-instead-of-symbol-address.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* sysctl-add-kern_cont-to-deprecated_sysctl_warning.patch
* arch-arc-add-option-to-skip-sync-on-dma-mapping.patch
* arch-arm-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-avr32-add-option-to-skip-sync-on-dma-map.patch
* arch-blackfin-add-option-to-skip-sync-on-dma-map.patch
* arch-c6x-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-frv-add-option-to-skip-sync-on-dma-map.patch
* arch-hexagon-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-m68k-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-metag-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-microblaze-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-mips-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-nios2-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-openrisc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-parisc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-powerpc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sh-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sparc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-tile-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-xtensa-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* dma-add-calls-for-dma_map_page_attrs-and-dma_unmap_page_attrs.patch
* mm-add-support-for-releasing-multiple-instances-of-a-page.patch
* igb-update-driver-to-make-use-of-dma_attr_skip_cpu_sync.patch
* igb-update-code-to-better-handle-incrementing-page-count.patch
* relay-check-array-offset-before-using-it.patch
* kconfig-lib-kconfigdebug-fix-references-to-documenation.patch
* kconfig-lib-kconfigubsan-fix-reference-to-ubsan-documentation.patch
* debug-more-properly-delay-for-secondary-cpus.patch
* debug-more-properly-delay-for-secondary-cpus-fix.patch
* kdb-remove-unused-kdb_event-handling.patch
* kdb-properly-synchronize-vkdb_printf-calls-with-other-cpus.patch
* kdb-call-vkdb_printf-from-vprintk_default-only-when-wanted.patch
* initramfs-select-builtin-initram-compression-algorithm-on-kconfig-instead-of-makefile.patch
* initramfs-allow-again-choice-of-the-embedded-initram-compression-algorithm.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
* ipc-msg-make-msgrcv-work-with-long_min.patch
* ipc-fixed-warnings.patch
linux-next.patch
linux-next-rejects.patch
* posix-timers-give-lazy-compilers-some-help-optimizing-code-away.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* drivers-clk-uniphier-clk-uniphierh-fix-build-with-old-gcc.patch
* drivers-clk-uniphier-clk-uniphier-mioc-fix-build-for-older-gcc.patch
* ktestpl-fix-english.patch
* watchdog-move-shared-definitions-to-nmih.patch
* watchdog-move-hardlockup-detector-to-separate-file.patch
* sparc-implement-watchdog_nmi_enable-and-watchdog_nmi_disable.patch
* ipc-sem-do-not-call-wake_sem_queue_do-prematurely.patch
* ipc-sem-rework-task-wakeups.patch
* ipc-sem-rework-task-wakeups-fix.patch
* ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
* ipc-sem-optimize-perform_atomic_semop.patch
* ipc-sem-optimize-perform_atomic_semop-fix.patch
* ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
* ipc-sem-explicitly-inline-check_restart.patch
* ipc-sem-use-proper-list-api-for-pending_list-wakeups.patch
* ipc-sem-simplify-wait-wake-loop.patch
* ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
* ipc-sem-avoid-idr-tree-lookup-for-interrupted-semop.patch
* mm-add-locked-parameter-to-get_user_pages_remote.patch
* mm-add-locked-parameter-to-get_user_pages_remote-fix.patch
* mm-unexport-__get_user_pages_unlocked.patch
* mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
* mm-join-struct-fault_env-and-vm_fault.patch
* mm-use-vmf-address-instead-of-of-vmf-virtual_address.patch
* mm-use-pgoff-in-struct-vm_fault-instead-of-passing-it-separately.patch
* mm-use-passed-vm_fault-structure-in-__do_fault.patch
* mm-trim-__do_fault-arguments.patch
* mm-use-passed-vm_fault-structure-for-in-wp_pfn_shared.patch
* mm-add-orig_pte-field-into-vm_fault.patch
* mm-allow-full-handling-of-cow-faults-in-fault-handlers.patch
* mm-factor-out-functionality-to-finish-page-faults.patch
* mm-move-handling-of-cow-faults-into-dax-code.patch
* mm-factor-out-common-parts-of-write-fault-handling.patch
* mm-pass-vm_fault-structure-into-do_page_mkwrite.patch
* mm-use-vmf-page-during-wp-faults.patch
* mm-move-part-of-wp_page_reuse-into-the-single-call-site.patch
* mm-provide-helper-for-finishing-mkwrite-faults.patch
* mm-change-return-values-of-finish_mkwrite_fault.patch
* mm-export-follow_pte.patch
* dax-make-cache-flushing-protected-by-entry-lock.patch
* dax-protect-pte-modification-on-wp-fault-by-radix-tree-entry-lock.patch
* dax-clear-dirty-entry-tags-on-cache-flush.patch
* powerpc-ima-get-the-kexec-buffer-passed-by-the-previous-kernel.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* powerpc-ima-send-the-kexec-buffer-to-the-next-kernel.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* vfs-change-d_manage-to-take-a-struct-path.patch
* vfs-add-path_is_mountpoint-helper.patch
* vfs-add-path_is_mountpoint-helper-fix.patch
* vfs-add-path_has_submounts.patch
* autofs-change-autofs4_expire_wait-to-take-struct-path.patch
* autofs-change-autofs4_wait-to-take-struct-path.patch
* autofs-use-path_is_mountpoint-to-fix-unreliable-d_mountpoint-checks.patch
* autofs-use-path_has_submounts-to-fix-unreliable-have_submount-checks.patch
* vfs-remove-unused-have_submounts-function.patch
* vfs-merge-path_is_mountpoint-and-path_is_mountpoint_rcu.patch
* autofs-make-struct-path-const-in-autofs4_dir_open.patch
* autofs-change-struct-path-to-const-in-autofs4_expire_wait-and-autofs4_wait.patch
* vfs-change-struct-path-to-const-in-d_manage.patch
* vfs-constify-path-parameter-of-path_has_submounts.patch
* autofs-dont-hold-spin-lock-over-direct-mount-expire.patch
* vfs-make-may_umount_tree-mount-propogation-aware.patch
* vfs-make-may_umount_tree-mount-propogation-aware-checkpatch-fixes.patch
* tools-add-warn_on_once.patch
* radix-tree-test-suite-allow-gfp_atomic-allocations-to-fail.patch
* radix-tree-test-suite-track-preempt_count.patch
* radix-tree-test-suite-free-preallocated-nodes.patch
* radix-tree-test-suite-make-runs-more-reproducible.patch
* radix-tree-test-suite-iteration-test-misuses-rcu.patch
* radix-tree-test-suite-benchmark-for-iterator.patch
* radix-tree-test-suite-use-rcu_barrier.patch
* radix-tree-test-suite-handle-exceptional-entries.patch
* radix-tree-test-suite-record-order-in-each-item.patch
* tools-add-more-bitmap-functions.patch
* radix-tree-test-suite-use-common-find-bit-code.patch
* radix-tree-fix-typo.patch
* radix-tree-move-rcu_head-into-a-union-with-private_list.patch
* radix-tree-create-node_tag_set.patch
* radix-tree-make-radix_tree_find_next_bit-more-useful.patch
* radix-tree-improve-dump-output.patch
* btrfs-fix-race-in-btrfs_free_dummy_fs_info.patch
* radix-tree-improve-multiorder-iterators.patch
* radix-tree-delete-radix_tree_locate_item.patch
* radix-tree-delete-radix_tree_range_tag_if_tagged.patch
* radix-tree-add-radix_tree_join.patch
* radix-tree-add-radix_tree_split.patch
* radix-tree-add-radix_tree_split_preload.patch
* radix-tree-fix-replacement-for-multiorder-entries.patch
* radix-tree-test-suite-check-multiorder-iteration.patch
* idr-add-ida_is_empty.patch
* tpm-use-idr_find-not-idr_find_slowpath.patch
* rxrpc-abstract-away-knowledge-of-idr-internals.patch
* idr-reduce-the-number-of-bits-per-level-from-8-to-6.patch
* radix-tree-test-suite-add-some-more-functionality.patch
* reimplement-idr-and-ida-using-the-radix-tree.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Peter Rosin @ 2016-12-06 23:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-kernel@vger.kernel.org, Linus Walleij, Andrew Lunn,
linux-next
In-Reply-To: <20161207094405.05e4e5c2@canb.auug.org.au>
On 2016-12-06 23:46, Stephen Rothwell wrote:
> Hi Peter,
>
> On Tue, 6 Dec 2016 23:27:48 +0100 Peter Rosin <peda@axentia.se> wrote:
>>
>> The bug you are referring to is in the gpio tree, not pinctrl.
>> That had me confused for a while, and is the reason I'm writing
>> this. Maybe the next person need not be confused...
>
> Part of the gpio tree has been merged into the pinctrl tree (see commit
> 70afa835d2d7 ("Merge branch 'thread-irq-simpler' of /home/linus/linux-gpio
> into devel")), but when I merge the gpio tree later in my process, I do
> not get this error.
Right. *blush*
The reason appears that the gpio tree has updates to the pl061 driver
that is not present in pinctrl, specifically
009df9a02000 ("gpio: pl061: use local state for parent IRQ storage")
I guess you could merge gpio first, but you'd still hit the silly bug
in pinctrl that Andrew fixed so maybe that's not worth it...
>> But when I'm writing on this topic anyway, I'll add some more
>> info, in case anyone cares.
>>
>> I think fix for this bug is to use gc->irq_chained_parent instead
>> of gc->irq_parent, at least that changed as part of the indicated
>> commit. Completely untested...
>>
>> The fix for the bug in the pinctrl tree is to add a missing >
>> as posted by Andrew Lunn in [1] (with a slightly broken commit
>> message; two counts of s/chip-/client-/, an extra line after
>> the sob and I guess the subject is no longer true).
>>
>> Cheers,
>> Peter
>>
>> [1] http://marc.info/?l=linux-gpio&m=148088890030876&w=2
>
> Thanks for the info ... this still needs fixing in the pinctrl tree.
>
> P.S. Peter, your email had a bad header line:
>
> Reply-To: 20161207083102.093fdf96@canb.auug.org.au
>
> that should probably have been In-Reply-To ...
Right. *blush*
Off to bed I guess. After all, it's a new day tomorrow and I don't seem
very effective at the moment...
Cheers,
Peter
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Stephen Rothwell @ 2016-12-06 22:46 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel@vger.kernel.org, Linus Walleij, Andrew Lunn,
linux-next
In-Reply-To: <c7690265-1f26-ed63-48bf-0e4968e7c63c@axentia.se>
Hi Peter,
On Tue, 6 Dec 2016 23:27:48 +0100 Peter Rosin <peda@axentia.se> wrote:
>
> The bug you are referring to is in the gpio tree, not pinctrl.
> That had me confused for a while, and is the reason I'm writing
> this. Maybe the next person need not be confused...
Part of the gpio tree has been merged into the pinctrl tree (see commit
70afa835d2d7 ("Merge branch 'thread-irq-simpler' of /home/linus/linux-gpio
into devel")), but when I merge the gpio tree later in my process, I do
not get this error.
> But when I'm writing on this topic anyway, I'll add some more
> info, in case anyone cares.
>
> I think fix for this bug is to use gc->irq_chained_parent instead
> of gc->irq_parent, at least that changed as part of the indicated
> commit. Completely untested...
>
> The fix for the bug in the pinctrl tree is to add a missing >
> as posted by Andrew Lunn in [1] (with a slightly broken commit
> message; two counts of s/chip-/client-/, an extra line after
> the sob and I guess the subject is no longer true).
>
> Cheers,
> Peter
>
> [1] http://marc.info/?l=linux-gpio&m=148088890030876&w=2
Thanks for the info ... this still needs fixing in the pinctrl tree.
P.S. Peter, your email had a bad header line:
Reply-To: 20161207083102.093fdf96@canb.auug.org.au
that should probably have been In-Reply-To ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20161206 WARN@ mm/hugetlb.c:2918 during boot
From: Dave Hansen @ 2016-12-06 22:40 UTC (permalink / raw)
To: Balbir Singh, Stephen Rothwell
Cc: Sachin Sant, linux-next, ppc-dev, Anton Blanchard,
Aneesh Kumar KV, Michael Ellerman
In-Reply-To: <CAKTCnzmxjf+v3t-o7GwZkWp1Wrff+o0B6CAt0Ehp8gv3pdQTOA@mail.gmail.com>
On 12/06/2016 02:37 PM, Balbir Singh wrote:
> I think Michael found this as well, its related to adding our gigantic
> page to the hugetlb list
> and the WARN_ON that Dave Hansen added (commit
> a3a18061c987aa9da4f5d3cbb31a9e71e9d7191d)
>
> I've not looked at this issue yet, Aneesh is aware of the issue as well
It's harmless, and I believe Andrew pulled it out of -mm. So, just
ignore it for now.
Thanks for the report, though.
^ permalink raw reply
* Re: linux-next: build warning after merge of the btrfs-kdave tree
From: Stephen Rothwell @ 2016-12-06 22:38 UTC (permalink / raw)
To: David Sterba; +Cc: linux-next, linux-kernel, Wang Xiaoguang
In-Reply-To: <20161128110230.2e2bda87@canb.auug.org.au>
Hi David,
On Mon, 28 Nov 2016 11:02:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the btrfs-kdave tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> fs/btrfs/inode.c: In function 'run_delalloc_range':
> fs/btrfs/inode.c:1219:9: warning: 'cur_end' may be used uninitialized in this function [-Wmaybe-uninitialized]
> start = cur_end + 1;
> ^
> fs/btrfs/inode.c:1172:6: note: 'cur_end' was declared here
> u64 cur_end;
> ^
>
> Introduced by commit
>
> cow_file_range_async ("btrfs: Introduce COMPRESS reserve type to fix false enospc for compression")
>
> Presumably a false positive because ASSERT(0) panics?
Actually it does not if CONFIG_BTRFS_ASSERT is not set (which it isn't
for the above build), so this is not a false positive. I am still
seeing this.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20161206 WARN@ mm/hugetlb.c:2918 during boot
From: Balbir Singh @ 2016-12-06 22:37 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sachin Sant, linux-next, ppc-dev, Anton Blanchard, Dave Hansen,
Aneesh Kumar KV, Michael Ellerman
In-Reply-To: <20161207092721.270fbc43@canb.auug.org.au>
On Wed, Dec 7, 2016 at 9:27 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Sachin,
>
> [Just cc'ing a few more people]
>
> On Tue, 6 Dec 2016 21:11:46 +0530 Sachin Sant <sachinp@linux.vnet.ibm.com> wrote:
>>
>> Following warning is displayed during todays next boot
>> on a Power8 LPAR. Kernel was built with pseries_le_defconfig.
>>
>> [ 0.016702] ------------[ cut here ]------------
>> [ 0.016708] WARNING: CPU: 1 PID: 1 at mm/hugetlb.c:2918 hugetlb_add_hstate+0x1e8/0x210
>> [ 0.016709] Modules linked in:
>> [ 0.016712] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.9.0-rc8-next-20161206 #2
>> [ 0.016715] task: c0000003bacc0000 task.stack: c0000003bad00000
>> [ 0.016717] NIP: c000000000cd30a0 LR: c000000000cd303c CTR: c00000000057d910
>> [ 0.016719] REGS: c0000003bad03870 TRAP: 0700 Not tainted (4.9.0-rc8-next-20161206)
>> [ 0.016721] MSR: 8000000002029033 <SF,VEC,EE,ME,IR,DR,RI,LE>
>> [ 0.016728] CR: 88004022 XER: 2000000e
>> [ 0.016730] CFAR: c00000000057db9c SOFTE: 1
>> GPR00: c000000000cd303c c0000003bad03af0 c000000000e84000 0000000000000014
>> GPR04: c000000000bb7927 0000000000000002 fffffffffffffff4 c000000000db4000
>> GPR08: c000000000d14000 0000000000000001 0000000000000000 0000000000000006
>> GPR12: 0000000088004028 c00000000ea70400 c00000000000ddd8 0000000000000000
>> GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
>> GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
>> GPR24: 0000000000000000 c000000000ca3614 0000000000000020 c000000000ec1228
>> GPR28: 0000000000001c78 c000000000faa9f0 0000000400000000 c000000000fac668
>> [ 0.016767] NIP [c000000000cd30a0] hugetlb_add_hstate+0x1e8/0x210
>> [ 0.016770] LR [c000000000cd303c] hugetlb_add_hstate+0x184/0x210
>> [ 0.016771] Call Trace:
>> [ 0.016773] [c0000003bad03af0] [c000000000cd303c] hugetlb_add_hstate+0x184/0x210 (unreliable)
>> [ 0.016778] [c0000003bad03b80] [c000000000cb26ec] add_huge_page_size+0xa8/0xc8
>> [ 0.016782] [c0000003bad03bb0] [c000000000cb27d8] hugetlbpage_init+0x60/0x1cc
>> [ 0.016785] [c0000003bad03c40] [c00000000000d4e0] do_one_initcall+0x60/0x1c0
>> [ 0.016788] [c0000003bad03d00] [c000000000ca4254] kernel_init_freeable+0x284/0x364
>> [ 0.016791] [c0000003bad03dc0] [c00000000000ddf4] kernel_init+0x24/0x150
>> [ 0.016795] [c0000003bad03e30] [c00000000000bae0] ret_from_kernel_thread+0x5c/0x7c
>> [ 0.016797] Instruction dump:
>> [ 0.016799] 7d0807b4 394a0010 7d0a5036 3d02ffe9 7fbe5040 fbe83d80 41fc001c 3ce2fff3
>> [ 0.016805] 89471fa4 2f8a0000 40fe000c 99271fa4 <0fe00000> 38210090 e8010010 eb61ffd8
>> [ 0.016811] ---[ end trace 42481f903da18455 ]---
>> [ 0.016882] pstore: using zlib compression
>>
I think Michael found this as well, its related to adding our gigantic
page to the hugetlb list
and the WARN_ON that Dave Hansen added (commit
a3a18061c987aa9da4f5d3cbb31a9e71e9d7191d)
I've not looked at this issue yet, Aneesh is aware of the issue as well
Balbir Singh.
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Peter Rosin @ 2016-12-06 22:27 UTC (permalink / raw)
To: linux-kernel@vger.kernel.org, Linus Walleij, Stephen Rothwell,
Andrew Lunn, linux-next
> Hi Linus,
>
> On Mon, 5 Dec 2016 10:00:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the pinctrl tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> drivers/gpio/gpio-pl061.c: In function 'pl061_irq_set_wake':
>> drivers/gpio/gpio-pl061.c:280:28: error: 'struct gpio_chip' has no member named 'irq_parent'
>> return irq_set_irq_wake(gc->irq_parent, state);
>> ^
>> drivers/gpio/gpio-pl061.c:281:1: warning: control reaches end of non-void function [-Wreturn-type]
>> }
>> ^
>>
>> Caused by commit
>>
>> d245b3f9bd36 ("gpio: simplify adding threaded interrupts")
>>
>> I have used the pinctrl tree from next-20161202 for today.
>
> I am still getting this.
The bug you are referring to is in the gpio tree, not pinctrl.
That had me confused for a while, and is the reason I'm writing
this. Maybe the next person need not be confused...
But when I'm writing on this topic anyway, I'll add some more
info, in case anyone cares.
I think fix for this bug is to use gc->irq_chained_parent instead
of gc->irq_parent, at least that changed as part of the indicated
commit. Completely untested...
The fix for the bug in the pinctrl tree is to add a missing >
as posted by Andrew Lunn in [1] (with a slightly broken commit
message; two counts of s/chip-/client-/, an extra line after
the sob and I guess the subject is no longer true).
Cheers,
Peter
[1] http://marc.info/?l=linux-gpio&m=148088890030876&w=2
^ permalink raw reply
* Re: next-20161206 WARN@ mm/hugetlb.c:2918 during boot
From: Stephen Rothwell @ 2016-12-06 22:27 UTC (permalink / raw)
To: Sachin Sant; +Cc: linux-next, ppc-dev, Anton Blanchard, Michael Ellerman
In-Reply-To: <70A62042-92E6-414D-8FBD-BA0F5308944B@linux.vnet.ibm.com>
Hi Sachin,
[Just cc'ing a few more people]
On Tue, 6 Dec 2016 21:11:46 +0530 Sachin Sant <sachinp@linux.vnet.ibm.com> wrote:
>
> Following warning is displayed during todays next boot
> on a Power8 LPAR. Kernel was built with pseries_le_defconfig.
>
> [ 0.016702] ------------[ cut here ]------------
> [ 0.016708] WARNING: CPU: 1 PID: 1 at mm/hugetlb.c:2918 hugetlb_add_hstate+0x1e8/0x210
> [ 0.016709] Modules linked in:
> [ 0.016712] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.9.0-rc8-next-20161206 #2
> [ 0.016715] task: c0000003bacc0000 task.stack: c0000003bad00000
> [ 0.016717] NIP: c000000000cd30a0 LR: c000000000cd303c CTR: c00000000057d910
> [ 0.016719] REGS: c0000003bad03870 TRAP: 0700 Not tainted (4.9.0-rc8-next-20161206)
> [ 0.016721] MSR: 8000000002029033 <SF,VEC,EE,ME,IR,DR,RI,LE>
> [ 0.016728] CR: 88004022 XER: 2000000e
> [ 0.016730] CFAR: c00000000057db9c SOFTE: 1
> GPR00: c000000000cd303c c0000003bad03af0 c000000000e84000 0000000000000014
> GPR04: c000000000bb7927 0000000000000002 fffffffffffffff4 c000000000db4000
> GPR08: c000000000d14000 0000000000000001 0000000000000000 0000000000000006
> GPR12: 0000000088004028 c00000000ea70400 c00000000000ddd8 0000000000000000
> GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
> GPR24: 0000000000000000 c000000000ca3614 0000000000000020 c000000000ec1228
> GPR28: 0000000000001c78 c000000000faa9f0 0000000400000000 c000000000fac668
> [ 0.016767] NIP [c000000000cd30a0] hugetlb_add_hstate+0x1e8/0x210
> [ 0.016770] LR [c000000000cd303c] hugetlb_add_hstate+0x184/0x210
> [ 0.016771] Call Trace:
> [ 0.016773] [c0000003bad03af0] [c000000000cd303c] hugetlb_add_hstate+0x184/0x210 (unreliable)
> [ 0.016778] [c0000003bad03b80] [c000000000cb26ec] add_huge_page_size+0xa8/0xc8
> [ 0.016782] [c0000003bad03bb0] [c000000000cb27d8] hugetlbpage_init+0x60/0x1cc
> [ 0.016785] [c0000003bad03c40] [c00000000000d4e0] do_one_initcall+0x60/0x1c0
> [ 0.016788] [c0000003bad03d00] [c000000000ca4254] kernel_init_freeable+0x284/0x364
> [ 0.016791] [c0000003bad03dc0] [c00000000000ddf4] kernel_init+0x24/0x150
> [ 0.016795] [c0000003bad03e30] [c00000000000bae0] ret_from_kernel_thread+0x5c/0x7c
> [ 0.016797] Instruction dump:
> [ 0.016799] 7d0807b4 394a0010 7d0a5036 3d02ffe9 7fbe5040 fbe83d80 41fc001c 3ce2fff3
> [ 0.016805] 89471fa4 2f8a0000 40fe000c 99271fa4 <0fe00000> 38210090 e8010010 eb61ffd8
> [ 0.016811] ---[ end trace 42481f903da18455 ]---
> [ 0.016882] pstore: using zlib compression
>
> Complete dmesg log is attached.
>
> Thanks
> -Sachin
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the pinctrl tree
From: Stephen Rothwell @ 2016-12-06 21:31 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel
In-Reply-To: <20161205100038.30581ee1@canb.auug.org.au>
Hi Linus,
On Mon, 5 Dec 2016 10:00:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pinctrl tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/gpio/gpio-pl061.c: In function 'pl061_irq_set_wake':
> drivers/gpio/gpio-pl061.c:280:28: error: 'struct gpio_chip' has no member named 'irq_parent'
> return irq_set_irq_wake(gc->irq_parent, state);
> ^
> drivers/gpio/gpio-pl061.c:281:1: warning: control reaches end of non-void function [-Wreturn-type]
> }
> ^
>
> Caused by commit
>
> d245b3f9bd36 ("gpio: simplify adding threaded interrupts")
>
> I have used the pinctrl tree from next-20161202 for today.
I am still getting this.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20161205 build: 3 failures 4 warnings (next-20161205)
From: Marc Zyngier @ 2016-12-06 18:24 UTC (permalink / raw)
To: Bjorn Andersson
Cc: linaro-kernel, kernel-build-reports, Catalin Marinas, Will Deacon,
Mark Brown, linux-next, linux-arm-kernel
In-Reply-To: <20161206181050.GF30492@tuxbot>
On 06/12/16 18:10, Bjorn Andersson wrote:
> On Mon 05 Dec 07:44 PST 2016, Marc Zyngier wrote:
>
>> On 05/12/16 11:20, Mark Brown wrote:
>>> On Mon, Dec 05, 2016 at 07:56:06AM +0000, Build bot for Mark Brown wrote:
>>>
>>> Today's -next fails to build an arm64 allnodconfig and allmodconfig
>>> with:
>>>
>>>> arm64-allnoconfig
>>>> ../arch/arm64/lib/clear_user.S:33: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/clear_user.S:53: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/clear_user.S:33: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/clear_user.S:53: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_from_user.S:67: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_from_user.S:70: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_from_user.S:67: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_from_user.S:70: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_in_user.S:68: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_in_user.S:71: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_in_user.S:68: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_in_user.S:71: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_to_user.S:66: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_to_user.S:69: Error: bad or irreducible absolute expression
>>>> ../arch/arm64/lib/copy_to_user.S:66: Error: attempt to move .org backwards
>>>> ../arch/arm64/lib/copy_to_user.S:69: Error: attempt to move .org backwards
>>>
>>> This was triggered somehow by bca8f17f57bd7 (arm64: Get rid of
>>> asm/opcodes.h) though I didn't figure out how.
>>
>> Old and broken gas. I have a workaround stashed there:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/maz/arm-platforms.git/commit/?h=arm64/standalone.h&id=559f97365362ed9e96f594200020379df46630d8
>>
>> At least binutils 2.24 and 2.25 are affected, while 2.27 is not.
>>
>
> Made me realize that the Ubuntu 15.10 release I'm on is deprecated.
>
> If I read the release notes for Ubuntu correctly the 14.04 LTS release
> is supported until April 2019, with binutils 2.24. So I would be
> surprised if this won't bite quite a bunch of people down the road.
Catalin has taken a slightly different set of fixes which do address
this problem:
https://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/commit/?h=for-next/core&id=bbb56c27228d4ad64aca858c5af49d0f2f11c645
https://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/commit/?h=for-next/core&id=cd9e1927a525f6ce7c0d99c6e038f0a0b9e85176
The build system will warn you that your binutils are broken, and enable
the workaround (which will only result in slightly painful disassembly
for some instructions).
Some of the most visible distros have also other "features", such as
compilers that do not implement basic capabilities on which the kernel
relies for performance (jump labels, for example)...
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply
* Re: next-20161205 build: 3 failures 4 warnings (next-20161205)
From: Bjorn Andersson @ 2016-12-06 18:10 UTC (permalink / raw)
To: Marc Zyngier
Cc: Mark Brown, Catalin Marinas, Will Deacon, kernel-build-reports,
linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <7b3daf13-dbab-5acf-cd5f-2414141500b3@arm.com>
On Mon 05 Dec 07:44 PST 2016, Marc Zyngier wrote:
> On 05/12/16 11:20, Mark Brown wrote:
> > On Mon, Dec 05, 2016 at 07:56:06AM +0000, Build bot for Mark Brown wrote:
> >
> > Today's -next fails to build an arm64 allnodconfig and allmodconfig
> > with:
> >
> >> arm64-allnoconfig
> >> ../arch/arm64/lib/clear_user.S:33: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/clear_user.S:53: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/clear_user.S:33: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/clear_user.S:53: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_from_user.S:67: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_from_user.S:70: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_from_user.S:67: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_from_user.S:70: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_in_user.S:68: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_in_user.S:71: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_in_user.S:68: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_in_user.S:71: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_to_user.S:66: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_to_user.S:69: Error: bad or irreducible absolute expression
> >> ../arch/arm64/lib/copy_to_user.S:66: Error: attempt to move .org backwards
> >> ../arch/arm64/lib/copy_to_user.S:69: Error: attempt to move .org backwards
> >
> > This was triggered somehow by bca8f17f57bd7 (arm64: Get rid of
> > asm/opcodes.h) though I didn't figure out how.
>
> Old and broken gas. I have a workaround stashed there:
>
> http://git.kernel.org/cgit/linux/kernel/git/maz/arm-platforms.git/commit/?h=arm64/standalone.h&id=559f97365362ed9e96f594200020379df46630d8
>
> At least binutils 2.24 and 2.25 are affected, while 2.27 is not.
>
Made me realize that the Ubuntu 15.10 release I'm on is deprecated.
If I read the release notes for Ubuntu correctly the 14.04 LTS release
is supported until April 2019, with binutils 2.24. So I would be
surprised if this won't bite quite a bunch of people down the road.
Regards,
Bjorn
^ permalink raw reply
* next-20161206 WARN@ mm/hugetlb.c:2918 during boot
From: Sachin Sant @ 2016-12-06 15:41 UTC (permalink / raw)
To: linux-next; +Cc: sfr
[-- Attachment #1: Type: text/plain, Size: 2535 bytes --]
Following warning is displayed during todays next boot
on a Power8 LPAR. Kernel was built with pseries_le_defconfig.
[ 0.016702] ------------[ cut here ]------------
[ 0.016708] WARNING: CPU: 1 PID: 1 at mm/hugetlb.c:2918 hugetlb_add_hstate+0x1e8/0x210
[ 0.016709] Modules linked in:
[ 0.016712] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.9.0-rc8-next-20161206 #2
[ 0.016715] task: c0000003bacc0000 task.stack: c0000003bad00000
[ 0.016717] NIP: c000000000cd30a0 LR: c000000000cd303c CTR: c00000000057d910
[ 0.016719] REGS: c0000003bad03870 TRAP: 0700 Not tainted (4.9.0-rc8-next-20161206)
[ 0.016721] MSR: 8000000002029033 <SF,VEC,EE,ME,IR,DR,RI,LE>
[ 0.016728] CR: 88004022 XER: 2000000e
[ 0.016730] CFAR: c00000000057db9c SOFTE: 1
GPR00: c000000000cd303c c0000003bad03af0 c000000000e84000 0000000000000014
GPR04: c000000000bb7927 0000000000000002 fffffffffffffff4 c000000000db4000
GPR08: c000000000d14000 0000000000000001 0000000000000000 0000000000000006
GPR12: 0000000088004028 c00000000ea70400 c00000000000ddd8 0000000000000000
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR24: 0000000000000000 c000000000ca3614 0000000000000020 c000000000ec1228
GPR28: 0000000000001c78 c000000000faa9f0 0000000400000000 c000000000fac668
[ 0.016767] NIP [c000000000cd30a0] hugetlb_add_hstate+0x1e8/0x210
[ 0.016770] LR [c000000000cd303c] hugetlb_add_hstate+0x184/0x210
[ 0.016771] Call Trace:
[ 0.016773] [c0000003bad03af0] [c000000000cd303c] hugetlb_add_hstate+0x184/0x210 (unreliable)
[ 0.016778] [c0000003bad03b80] [c000000000cb26ec] add_huge_page_size+0xa8/0xc8
[ 0.016782] [c0000003bad03bb0] [c000000000cb27d8] hugetlbpage_init+0x60/0x1cc
[ 0.016785] [c0000003bad03c40] [c00000000000d4e0] do_one_initcall+0x60/0x1c0
[ 0.016788] [c0000003bad03d00] [c000000000ca4254] kernel_init_freeable+0x284/0x364
[ 0.016791] [c0000003bad03dc0] [c00000000000ddf4] kernel_init+0x24/0x150
[ 0.016795] [c0000003bad03e30] [c00000000000bae0] ret_from_kernel_thread+0x5c/0x7c
[ 0.016797] Instruction dump:
[ 0.016799] 7d0807b4 394a0010 7d0a5036 3d02ffe9 7fbe5040 fbe83d80 41fc001c 3ce2fff3
[ 0.016805] 89471fa4 2f8a0000 40fe000c 99271fa4 <0fe00000> 38210090 e8010010 eb61ffd8
[ 0.016811] ---[ end trace 42481f903da18455 ]---
[ 0.016882] pstore: using zlib compression
Complete dmesg log is attached.
Thanks
-Sachin
[-- Attachment #2: dmesg.log --]
[-- Type: application/octet-stream, Size: 24401 bytes --]
[ 0.000000] kexec_core: crashkernel: memory value expected
[ 0.000000] Allocated 2097152 bytes for 2048 pacas at c00000000ea70000
[ 0.000000] Page sizes from device-tree:
[ 0.000000] base_shift=12: shift=12, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=0
[ 0.000000] base_shift=12: shift=16, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=7
[ 0.000000] base_shift=12: shift=24, sllp=0x0000, avpnm=0x00000000, tlbiel=1, penc=56
[ 0.000000] base_shift=16: shift=16, sllp=0x0110, avpnm=0x00000000, tlbiel=1, penc=1
[ 0.000000] base_shift=16: shift=24, sllp=0x0110, avpnm=0x00000000, tlbiel=1, penc=8
[ 0.000000] base_shift=24: shift=24, sllp=0x0100, avpnm=0x00000001, tlbiel=0, penc=0
[ 0.000000] base_shift=34: shift=34, sllp=0x0120, avpnm=0x000007ff, tlbiel=0, penc=3
[ 0.000000] Page orders: linear mapping = 24, virtual = 16, io = 16, vmemmap = 24
[ 0.000000] Using 1TB segments
[ 0.000000] Initializing hash mmu with SLB
[ 0.000000] Linux version 4.9.0-rc8-next-20161206 (root@alp12.pok.stglabs.ibm.com) (gcc version 4.8.5 20150623 (Red Hat 4.8.5-11) (GCC) ) #2 SMP Tue Dec 6 07:27:13 PST 2016
[ 0.000000] Found initrd at 0xc000000009800000:0xc00000000ab19ce6
[ 0.000000] Using pSeries machine description
[ 0.000000] bootconsole [udbg0] enabled
[ 0.000000] Partition configured for 16 cpus.
[ 0.000000] CPU maps initialized for 8 threads per core
[ 0.000000] (thread shift is 3)
[ 0.000000] Freed 2031616 bytes for unused pacas
[ 0.000000] -----------------------------------------------------
[ 0.000000] ppc64_pft_size = 0x1d
[ 0.000000] phys_mem_size = 0x3c0000000
[ 0.000000] dcache_bsize = 0x80
[ 0.000000] icache_bsize = 0x80
[ 0.000000] cpu_features = 0x27fc7aec18500249
[ 0.000000] possible = 0x7fffffff18500649
[ 0.000000] always = 0x0000000018100040
[ 0.000000] cpu_user_features = 0xdc0065c2 0xef000000
[ 0.000000] mmu_features = 0x7c004001
[ 0.000000] firmware_features = 0x00000001c45ffc5f
[ 0.000000] htab_hash_mask = 0x3fffff
[ 0.000000] -----------------------------------------------------
[ 0.000000] numa: Initmem setup node 0
[ 0.000000] numa: NODE_DATA [mem 0x3bff62300-0x3bff6bfff]
[ 0.000000] numa: NODE_DATA(0) on node 5
[ 0.000000] numa: Initmem setup node 5 [mem 0x00000000-0x3bfffffff]
[ 0.000000] numa: NODE_DATA [mem 0x3bff58600-0x3bff622ff]
[ 0.000000] Section 957 and 959 (node 5) have a circular dependency on usemap and pgdat allocations
[ 0.000000] PPC64 nvram contains 15360 bytes
[ 0.000000] Top of RAM: 0x3c0000000, Total RAM: 0x3c0000000
[ 0.000000] Memory hole size: 0MB
[ 0.000000] Zone ranges:
[ 0.000000] DMA [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] DMA32 empty
[ 0.000000] Normal empty
[ 0.000000] Movable zone start for each node
[ 0.000000] Early memory node ranges
[ 0.000000] node 5: [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] Could not find start_pfn for node 0
[ 0.000000] Initmem setup node 0 [mem 0x0000000000000000-0x0000000000000000]
[ 0.000000] On node 0 totalpages: 0
[ 0.000000] Initmem setup node 5 [mem 0x0000000000000000-0x00000003bfffffff]
[ 0.000000] On node 5 totalpages: 245760
[ 0.000000] DMA zone: 240 pages used for memmap
[ 0.000000] DMA zone: 0 pages reserved
[ 0.000000] DMA zone: 245760 pages, LIFO batch:1
[ 0.000000] percpu: Embedded 3 pages/cpu @c0000003bfb00000 s146072 r0 d50536 u262144
[ 0.000000] pcpu-alloc: s146072 r0 d50536 u262144 alloc=1*1048576
[ 0.000000] pcpu-alloc: [0] 00 01 02 03 [0] 04 05 06 07
[ 0.000000] pcpu-alloc: [0] 08 09 10 11 [0] 12 13 14 15
[ 0.000000] Built 2 zonelists in Node order, mobility grouping on. Total pages: 245520
[ 0.000000] Policy zone: DMA
[ 0.000000] Kernel command line: BOOT_IMAGE=/vmlinuz-4.9.0-rc8-next-20161206 root=/dev/mapper/rhel_alp12-root ro crashkernel=auto rd.lvm.lv=rhel_alp12/root rd.lvm.lv=rhel_alp12/swap biosdevname=0 LANG=en_US.UTF-8
[ 0.000000] PID hash table entries: 4096 (order: -1, 32768 bytes)
[ 0.000000] Memory: 15650816K/15728640K available (10048K kernel code, 1408K rwdata, 2804K rodata, 832K init, 1349K bss, 77824K reserved, 0K cma-reserved)
[ 0.000000] SLUB: HWalign=128, Order=0-3, MinObjects=0, CPUs=16, Nodes=6
[ 0.000000] Hierarchical RCU implementation.
[ 0.000000] Build-time adjustment of leaf fanout to 64.
[ 0.000000] RCU restricting CPUs from NR_CPUS=2048 to nr_cpu_ids=16.
[ 0.000000] RCU: Adjusting geometry for rcu_fanout_leaf=64, nr_cpu_ids=16
[ 0.000000] NR_IRQS:512 nr_irqs:512 16
[ 0.000000] pic: no ISA interrupt controller
[ 0.000000] time_init: decrementer frequency = 512.000000 MHz
[ 0.000000] time_init: processor frequency = 3724.000000 MHz
[ 0.000001] clocksource: timebase: mask: 0xffffffffffffffff max_cycles: 0x761537d007, max_idle_ns: 440795202126 ns
[ 0.000025] clocksource: timebase mult[1f40000] shift[24] registered
[ 0.000038] clockevent: decrementer mult[83126e98] shift[32] cpu[0]
[ 0.000087] Console: colour dummy device 80x25
[ 0.000097] console [hvc0] enabled
[ 0.000104] bootconsole [udbg0] disabled
[ 0.000125] mempolicy: Enabling automatic NUMA balancing. Configure with numa_balancing= or the kernel.numa_balancing sysctl
[ 0.000129] pid_max: default: 32768 minimum: 301
[ 0.000237] Dentry cache hash table entries: 2097152 (order: 8, 16777216 bytes)
[ 0.003084] Inode-cache hash table entries: 1048576 (order: 7, 8388608 bytes)
[ 0.004497] Mount-cache hash table entries: 32768 (order: 2, 262144 bytes)
[ 0.004504] Mountpoint-cache hash table entries: 32768 (order: 2, 262144 bytes)
[ 0.004900] EEH: pSeries platform initialized
[ 0.004903] POWER8 performance monitor hardware support registered
[ 0.005157] smp: Bringing up secondary CPUs ...
[ 0.006602] smp: Brought up 2 nodes, 8 CPUs
[ 0.006608] numa: Node 0 CPUs:
[ 0.006610] numa: Node 5 CPUs: 0-7
[ 0.006959] devtmpfs: initialized
[ 0.015989] clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
[ 0.016019] kworker/u33:0 (59) used greatest stack depth: 12416 bytes left
[ 0.016129] NET: Registered protocol family 16
[ 0.016162] EEH: No capable adapters found
[ 0.016639] cpuidle: using governor menu
[ 0.016692] RTAS daemon started
[ 0.016702] ------------[ cut here ]------------
[ 0.016708] WARNING: CPU: 1 PID: 1 at mm/hugetlb.c:2918 hugetlb_add_hstate+0x1e8/0x210
[ 0.016709] Modules linked in:
[ 0.016712] CPU: 1 PID: 1 Comm: swapper/0 Not tainted 4.9.0-rc8-next-20161206 #2
[ 0.016715] task: c0000003bacc0000 task.stack: c0000003bad00000
[ 0.016717] NIP: c000000000cd30a0 LR: c000000000cd303c CTR: c00000000057d910
[ 0.016719] REGS: c0000003bad03870 TRAP: 0700 Not tainted (4.9.0-rc8-next-20161206)
[ 0.016721] MSR: 8000000002029033 <SF,VEC,EE,ME,IR,DR,RI,LE>
[ 0.016728] CR: 88004022 XER: 2000000e
[ 0.016730] CFAR: c00000000057db9c SOFTE: 1
GPR00: c000000000cd303c c0000003bad03af0 c000000000e84000 0000000000000014
GPR04: c000000000bb7927 0000000000000002 fffffffffffffff4 c000000000db4000
GPR08: c000000000d14000 0000000000000001 0000000000000000 0000000000000006
GPR12: 0000000088004028 c00000000ea70400 c00000000000ddd8 0000000000000000
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR24: 0000000000000000 c000000000ca3614 0000000000000020 c000000000ec1228
GPR28: 0000000000001c78 c000000000faa9f0 0000000400000000 c000000000fac668
[ 0.016767] NIP [c000000000cd30a0] hugetlb_add_hstate+0x1e8/0x210
[ 0.016770] LR [c000000000cd303c] hugetlb_add_hstate+0x184/0x210
[ 0.016771] Call Trace:
[ 0.016773] [c0000003bad03af0] [c000000000cd303c] hugetlb_add_hstate+0x184/0x210 (unreliable)
[ 0.016778] [c0000003bad03b80] [c000000000cb26ec] add_huge_page_size+0xa8/0xc8
[ 0.016782] [c0000003bad03bb0] [c000000000cb27d8] hugetlbpage_init+0x60/0x1cc
[ 0.016785] [c0000003bad03c40] [c00000000000d4e0] do_one_initcall+0x60/0x1c0
[ 0.016788] [c0000003bad03d00] [c000000000ca4254] kernel_init_freeable+0x284/0x364
[ 0.016791] [c0000003bad03dc0] [c00000000000ddf4] kernel_init+0x24/0x150
[ 0.016795] [c0000003bad03e30] [c00000000000bae0] ret_from_kernel_thread+0x5c/0x7c
[ 0.016797] Instruction dump:
[ 0.016799] 7d0807b4 394a0010 7d0a5036 3d02ffe9 7fbe5040 fbe83d80 41fc001c 3ce2fff3
[ 0.016805] 89471fa4 2f8a0000 40fe000c 99271fa4 <0fe00000> 38210090 e8010010 eb61ffd8
[ 0.016811] ---[ end trace 42481f903da18455 ]---
[ 0.016882] pstore: using zlib compression
[ 0.016886] pstore: Registered nvram as persistent store backend
[ 0.018812] PCI: Probing PCI hardware
[ 0.018815] PCI: Probing PCI hardware done
[ 0.018908] pseries-rng: Registering arch random hook.
[ 0.022449] HugeTLB registered 16 MB page size, pre-allocated 0 pages
[ 0.022456] HugeTLB registered 16 GB page size, pre-allocated 0 pages
[ 0.023036] vgaarb: loaded
[ 0.023124] SCSI subsystem initialized
[ 0.023186] libata version 3.00 loaded.
[ 0.023306] usbcore: registered new interface driver usbfs
[ 0.023323] usbcore: registered new interface driver hub
[ 0.023366] usbcore: registered new device driver usb
[ 0.023413] pps_core: LinuxPPS API ver. 1 registered
[ 0.023419] pps_core: Software ver. 5.3.6 - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>
[ 0.023435] PTP clock support registered
[ 0.023695] clocksource: Switched to clocksource timebase
[ 0.031568] NET: Registered protocol family 2
[ 0.031697] TCP established hash table entries: 131072 (order: 4, 1048576 bytes)
[ 0.031924] TCP bind hash table entries: 65536 (order: 4, 1048576 bytes)
[ 0.032033] TCP: Hash tables configured (established 131072 bind 65536)
[ 0.032052] UDP hash table entries: 8192 (order: 2, 262144 bytes)
[ 0.032081] UDP-Lite hash table entries: 8192 (order: 2, 262144 bytes)
[ 0.032141] NET: Registered protocol family 1
[ 0.032255] RPC: Registered named UNIX socket transport module.
[ 0.032257] RPC: Registered udp transport module.
[ 0.032258] RPC: Registered tcp transport module.
[ 0.032260] RPC: Registered tcp NFSv4.1 backchannel transport module.
[ 0.032263] PCI: CLS 0 bytes, default 128
[ 0.032291] Trying to unpack rootfs image as initramfs...
[ 0.277591] Freeing initrd memory: 19520K
[ 0.278436] IOMMU table initialized, virtual merging enabled
[ 0.288618] hv-24x7: read 1330 catalog entries, created 337 event attrs (0 failures), 169 descs
[ 0.289113] futex hash table entries: 4096 (order: 3, 524288 bytes)
[ 0.289179] audit: initializing netlink subsys (disabled)
[ 0.289225] audit: type=2000 audit(1481038219.280:1): initialized
[ 0.289876] workingset: timestamp_bits=38 max_order=18 bucket_order=0
[ 0.292964] NFS: Registering the id_resolver key type
[ 0.292973] Key type id_resolver registered
[ 0.292975] Key type id_legacy registered
[ 0.292984] SGI XFS with ACLs, security attributes, no debug enabled
[ 0.293736] Block layer SCSI generic (bsg) driver version 0.4 loaded (major 251)
[ 0.293743] io scheduler noop registered
[ 0.293746] io scheduler deadline registered
[ 0.293778] io scheduler cfq registered (default)
[ 0.293865] pci_hotplug: PCI Hot Plug PCI Core version: 0.5
[ 0.308924] Serial: 8250/16550 driver, 4 ports, IRQ sharing disabled
[ 0.311536] brd: module loaded
[ 0.312844] loop: module loaded
[ 0.312919] ipr: IBM Power RAID SCSI Device Driver version: 2.6.3 (October 17, 2015)
[ 0.313058] ibmvscsi 30000070: SRP_VERSION: 16.a
[ 0.313282] ibmvscsi 30000070: Maximum ID: 64 Maximum LUN: 32 Maximum Channel: 3
[ 0.313285] scsi host0: IBM POWER Virtual SCSI Adapter 1.5.9
[ 0.313457] ibmvscsi 30000070: partner initialization complete
[ 0.313496] ibmvscsi 30000070: host srp version: 16.a, host partition alp18-VIOS (100), OS 3, max io 1048576
[ 0.313556] ibmvscsi 30000070: Client reserve enabled
[ 0.313563] ibmvscsi 30000070: sent SRP login
[ 0.313593] ibmvscsi 30000070: SRP_LOGIN succeeded
[ 0.334017] scsi 0:0:1:0: Direct-Access AIX VDASD 0001 PQ: 0 ANSI: 3
[ 0.334313] scsi 0:0:2:0: CD-ROM AIX VOPTA PQ: 0 ANSI: 4
[ 0.360246] random: fast init done
[ 0.361518] sd 0:0:1:0: [sda] 62914560 512-byte logical blocks: (32.2 GB/30.0 GiB)
[ 0.361553] sr 0:0:2:0: [sr0] scsi-1 drive
[ 0.361554] sd 0:0:1:0: [sda] Write Protect is off
[ 0.361555] sd 0:0:1:0: [sda] Mode Sense: 17 00 00 08
[ 0.361558] cdrom: Uniform CD-ROM driver Revision: 3.20
[ 0.361600] sd 0:0:1:0: [sda] Cache data unavailable
[ 0.361603] sd 0:0:1:0: [sda] Assuming drive cache: write through
[ 0.361746] sr 0:0:2:0: Attached scsi CD-ROM sr0
[ 0.361855] sd 0:0:1:0: Attached scsi generic sg0 type 0
[ 0.361910] sr 0:0:2:0: Attached scsi generic sg1 type 5
[ 0.362095] libphy: Fixed MDIO Bus: probed
[ 0.362112] ibmveth: IBM Power Virtual Ethernet Driver 1.05
[ 0.362264] e100: Intel(R) PRO/100 Network Driver, 3.5.24-k2-NAPI
[ 0.362268] e100: Copyright(c) 1999-2006 Intel Corporation
[ 0.362287] e1000: Intel(R) PRO/1000 Network Driver - version 7.3.21-k8-NAPI
[ 0.362291] e1000: Copyright (c) 1999-2006 Intel Corporation.
[ 0.362307] e1000e: Intel(R) PRO/1000 Network Driver - 3.2.6-k
[ 0.362310] e1000e: Copyright(c) 1999 - 2015 Intel Corporation.
[ 0.362328] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 0.362332] ehci-pci: EHCI PCI platform driver
[ 0.362348] ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
[ 0.362355] ohci-pci: OHCI PCI platform driver
[ 0.362421] sda: sda1 sda2 sda3
[ 0.362432] mousedev: PS/2 mouse device common for all mice
[ 0.362609] rtc-generic rtc-generic: rtc core: registered rtc-generic as rtc0
[ 0.362764] device-mapper: uevent: version 1.0.3
[ 0.362886] device-mapper: ioctl: 4.35.0-ioctl (2016-06-23) initialised: dm-devel@redhat.com
[ 0.363009] sd 0:0:1:0: [sda] Attached SCSI disk
[ 0.363101] pseries_idle_driver registered
[ 0.363121] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sync_size new:4096 old:0
[ 0.363124] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sync_sg new:510 old:0
[ 0.363128] nx_compress_pseries ibm,compression-v1: nx842_OF_upd: max_sg_len new:4080 old:0
[ 0.363478] usbcore: registered new interface driver usbhid
[ 0.363482] usbhid: USB HID core driver
[ 0.363486] oprofile: using timer interrupt.
[ 0.363582] ipip: IPv4 and MPLS over IPv4 tunneling driver
[ 0.363780] NET: Registered protocol family 17
[ 0.363812] Key type dns_resolver registered
[ 0.363922] Running code patching self-tests ...
[ 0.364326] Running feature fixup self-tests ...
[ 0.364331] Running MSI bitmap self-tests ...
[ 0.364556] registered taskstats version 1
[ 0.364599] console [netcon0] enabled
[ 0.364602] netconsole: network logging started
[ 0.364653] rtc-generic rtc-generic: setting system clock to 2016-12-06 15:30:19 UTC (1481038219)
[ 0.365525] Freeing unused kernel memory: 832K
[ 0.365527] This architecture does not have kernel memory protection.
[ 0.367502] systemd[1]: Failed to insert module 'autofs4'
[ 0.372476] systemd[1]: systemd 219 running in system mode. (+PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ -LZ4 -SECCOMP +BLKID +ELFUTILS +KMOD +IDN)
[ 0.372565] systemd[1]: Detected architecture ppc64-le.
[ 0.372569] systemd[1]: Running in initial RAM disk.
[ 0.372814] systemd[1]: Set hostname to <localhost.localdomain>.
[ 0.374727] systemd-fstab-g (1562) used greatest stack depth: 11968 bytes left
[ 0.400011] systemd[1]: Reached target Local File Systems.
[ 0.400021] systemd[1]: Starting Local File Systems.
[ 0.400361] systemd[1]: Created slice Root Slice.
[ 0.400369] systemd[1]: Starting Root Slice.
[ 0.400614] systemd[1]: Created slice System Slice.
[ 0.400623] systemd[1]: Starting System Slice.
[ 0.576592] scsi_id (2498) used greatest stack depth: 11632 bytes left
[ 2.060511] XFS (dm-0): Mounting V5 Filesystem
[ 2.129119] XFS (dm-0): Ending clean mount
[ 2.129292] mount (2819) used greatest stack depth: 10896 bytes left
[ 2.475081] systemd-journald[1587]: Received SIGTERM from PID 1 (systemd).
[ 2.524971] systemd: 24 output lines suppressed due to ratelimiting
[ 2.839297] autofs4: disagrees about version of symbol memcpy
[ 2.839314] autofs4: Unknown symbol memcpy (err -22)
[ 2.839345] autofs4: disagrees about version of symbol memchr
[ 2.839346] autofs4: Unknown symbol memchr (err -22)
[ 2.839354] autofs4: disagrees about version of symbol strncpy
[ 2.839355] autofs4: Unknown symbol strncpy (err -22)
[ 2.839358] autofs4: disagrees about version of symbol memcmp
[ 2.839360] autofs4: Unknown symbol memcmp (err -22)
[ 2.839365] autofs4: disagrees about version of symbol memset
[ 2.839367] autofs4: Unknown symbol memset (err -22)
[ 2.874043] systemd[1]: Failed to insert module 'autofs4'
[ 2.887709] x_tables: disagrees about version of symbol memcpy
[ 2.887716] x_tables: Unknown symbol memcpy (err -22)
[ 2.887730] x_tables: disagrees about version of symbol strncpy
[ 2.887732] x_tables: Unknown symbol strncpy (err -22)
[ 2.887737] x_tables: disagrees about version of symbol __arch_hweight32
[ 2.887739] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 2.887744] x_tables: disagrees about version of symbol memset
[ 2.887746] x_tables: Unknown symbol memset (err -22)
[ 3.145112] systemd-efi-boo (2887) used greatest stack depth: 10704 bytes left
[ 3.272883] systemd-sysv-generator[2893]: stat() failed on /etc/rc.d/init.d/autotest: No such file or directory
[ 3.436932] kdump-dep-gener (2895) used greatest stack depth: 10544 bytes left
[ 3.891530] systemd-readahead[2902]: Failed to create fanotify object: Function not implemented
[ 4.295886] systemd-journald[2906]: Received request to flush runtime journal from PID 1
[ 4.684406] rng_core: disagrees about version of symbol memset
[ 4.684445] rng_core: Unknown symbol memset (err -22)
[ 4.743953] vmx_crypto: disagrees about version of symbol memcpy
[ 4.743995] vmx_crypto: Unknown symbol memcpy (err -22)
[ 4.823860] vmx_crypto: disagrees about version of symbol memcpy
[ 4.823902] vmx_crypto: Unknown symbol memcpy (err -22)
[ 4.884378] vmx_crypto: disagrees about version of symbol memcpy
[ 4.884420] vmx_crypto: Unknown symbol memcpy (err -22)
[ 4.963811] vmx_crypto: disagrees about version of symbol memcpy
[ 4.963841] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.063783] vmx_crypto: disagrees about version of symbol memcpy
[ 5.063815] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.063973] ibmveth 30000002 net0: renamed from eth0
[ 5.123762] vmx_crypto: disagrees about version of symbol memcpy
[ 5.123795] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.193760] vmx_crypto: disagrees about version of symbol memcpy
[ 5.193790] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.203641] gzip (4732) used greatest stack depth: 10512 bytes left
[ 5.222769] Adding 3145664k swap on /dev/mapper/rhel_alp12-swap. Priority:-1 extents:1 across:3145664k
[ 5.233741] vmx_crypto: disagrees about version of symbol memcpy
[ 5.233758] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.303740] vmx_crypto: disagrees about version of symbol memcpy
[ 5.303748] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.373723] vmx_crypto: disagrees about version of symbol memcpy
[ 5.373739] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.483722] vmx_crypto: disagrees about version of symbol memcpy
[ 5.483742] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.553728] vmx_crypto: disagrees about version of symbol memcpy
[ 5.553751] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.603734] vmx_crypto: disagrees about version of symbol memcpy
[ 5.603754] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.643727] vmx_crypto: disagrees about version of symbol memcpy
[ 5.643747] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.713729] vmx_crypto: disagrees about version of symbol memcpy
[ 5.713749] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.813714] vmx_crypto: disagrees about version of symbol memcpy
[ 5.813732] vmx_crypto: Unknown symbol memcpy (err -22)
[ 5.848383] XFS (sda2): Mounting V5 Filesystem
[ 6.426162] XFS (sda2): Ending clean mount
[ 8.619478] x_tables: disagrees about version of symbol memcpy
[ 8.619497] x_tables: Unknown symbol memcpy (err -22)
[ 8.619516] x_tables: disagrees about version of symbol strncpy
[ 8.619518] x_tables: Unknown symbol strncpy (err -22)
[ 8.619524] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.619526] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.619531] x_tables: disagrees about version of symbol memset
[ 8.619533] x_tables: Unknown symbol memset (err -22)
[ 8.672677] x_tables: disagrees about version of symbol memcpy
[ 8.672698] x_tables: Unknown symbol memcpy (err -22)
[ 8.672718] x_tables: disagrees about version of symbol strncpy
[ 8.672720] x_tables: Unknown symbol strncpy (err -22)
[ 8.672726] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.672728] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.672733] x_tables: disagrees about version of symbol memset
[ 8.672735] x_tables: Unknown symbol memset (err -22)
[ 8.724525] random: crng init done
[ 8.737767] x_tables: disagrees about version of symbol memcpy
[ 8.737796] x_tables: Unknown symbol memcpy (err -22)
[ 8.737818] x_tables: disagrees about version of symbol strncpy
[ 8.737820] x_tables: Unknown symbol strncpy (err -22)
[ 8.737827] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.737829] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.737836] x_tables: disagrees about version of symbol memset
[ 8.737838] x_tables: Unknown symbol memset (err -22)
[ 8.799164] x_tables: disagrees about version of symbol memcpy
[ 8.799193] x_tables: Unknown symbol memcpy (err -22)
[ 8.799223] x_tables: disagrees about version of symbol strncpy
[ 8.799228] x_tables: Unknown symbol strncpy (err -22)
[ 8.799237] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.799241] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.799252] x_tables: disagrees about version of symbol memset
[ 8.799256] x_tables: Unknown symbol memset (err -22)
[ 8.877316] x_tables: disagrees about version of symbol memcpy
[ 8.877338] x_tables: Unknown symbol memcpy (err -22)
[ 8.877357] x_tables: disagrees about version of symbol strncpy
[ 8.877359] x_tables: Unknown symbol strncpy (err -22)
[ 8.877365] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.877367] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.877373] x_tables: disagrees about version of symbol memset
[ 8.877375] x_tables: Unknown symbol memset (err -22)
[ 8.938160] x_tables: disagrees about version of symbol memcpy
[ 8.938188] x_tables: Unknown symbol memcpy (err -22)
[ 8.938213] x_tables: disagrees about version of symbol strncpy
[ 8.938215] x_tables: Unknown symbol strncpy (err -22)
[ 8.938222] x_tables: disagrees about version of symbol __arch_hweight32
[ 8.938224] x_tables: Unknown symbol __arch_hweight32 (err -22)
[ 8.938232] x_tables: disagrees about version of symbol memset
[ 8.938234] x_tables: Unknown symbol memset (err -22)
[ 9.036735] Netfilter messages via NETLINK v0.30.
[ 15.044965] systemd-sysv-generator[5923]: stat() failed on /etc/rc.d/init.d/autotest: No such file or directory
[ 15.229469] systemd-sysv-generator[6160]: stat() failed on /etc/rc.d/init.d/autotest: No such file or directory
[ 17.806045] rpaphp: RPA HOT Plug PCI Controller Driver version: 0.1
[ 17.806465] rpadlpar_io: disagrees about version of symbol memcpy
[ 17.806470] rpadlpar_io: Unknown symbol memcpy (err -22)
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2016-12-06 13:22 UTC (permalink / raw)
To: Lee Jones
Cc: Kuninori Morimoto, Stephen Rothwell, Liam Girdwood, linux-next,
linux-kernel
In-Reply-To: <20161206125538.GF25385@dell.home>
[-- Attachment #1: Type: text/plain, Size: 657 bytes --]
On Tue, Dec 06, 2016 at 12:55:38PM +0000, Lee Jones wrote:
> On Tue, 06 Dec 2016, Mark Brown wrote:
> > On Tue, Dec 06, 2016 at 12:41:15AM +0000, Kuninori Morimoto wrote:
> > > 8ca9edc837932469b81b8b47ea43a074b6add970
> > > ("mfd: davinci_voicecodec: Tidyup header difinitions")
> > Reverted. Lee, there is actually a dependency here...
> No idea what you're talking about.
You were saying there were no dependencies for the ASoC bit of
Morimoto-san's cq9vc series.
> Are you going to allude to the patch you reverted?
The one Stephen identified.
> I assume you wish for me to pick it up?
Or if you could send me a pull request for the MFD bits.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Lee Jones @ 2016-12-06 12:55 UTC (permalink / raw)
To: Mark Brown
Cc: Kuninori Morimoto, Stephen Rothwell, Liam Girdwood, linux-next,
linux-kernel
In-Reply-To: <20161206093745.gerksfd5gygxk6ym@sirena.org.uk>
On Tue, 06 Dec 2016, Mark Brown wrote:
> On Tue, Dec 06, 2016 at 12:41:15AM +0000, Kuninori Morimoto wrote:
> > > In file included from sound/soc/codecs/cq93vc.c:32:0:
> > > include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory
> > >
>
> > As I indicated on cover letter, this patch is based on
>
> > git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git :: for-mfd-next
>
> > Especially this commit
>
> > 8ca9edc837932469b81b8b47ea43a074b6add970
> > ("mfd: davinci_voicecodec: Tidyup header difinitions")
>
> Reverted. Lee, there is actually a dependency here...
No idea what you're talking about.
Are you going to allude to the patch you reverted?
I assume you wish for me to pick it up?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2016-12-06 9:37 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
lee.jones
In-Reply-To: <87inqxc2lr.wl%kuninori.morimoto.gx@renesas.com>
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
On Tue, Dec 06, 2016 at 12:41:15AM +0000, Kuninori Morimoto wrote:
> > In file included from sound/soc/codecs/cq93vc.c:32:0:
> > include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory
> >
> As I indicated on cover letter, this patch is based on
> git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git :: for-mfd-next
> Especially this commit
> 8ca9edc837932469b81b8b47ea43a074b6add970
> ("mfd: davinci_voicecodec: Tidyup header difinitions")
Reverted. Lee, there is actually a dependency here...
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* next-20161206 build: 0 failures 3 warnings (next-20161206)
From: Build bot for Mark Brown @ 2016-12-06 7:38 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161206
Git describe: next-20161206
Commit: efe90db21f Add linux-next specific files for 20161206
Build Time: 98 min 51 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 3
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 3
2 ../net/netfilter/nft_payload.c:261:15: warning: 'tsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../include/net/checksum.h:71:9: warning: 'fsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/net/ethernet/apm/xgene/xgene_enet_cle.c:836:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../net/netfilter/nft_payload.c:261:15: warning: 'tsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/net/checksum.h:71:9: warning: 'fsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../net/netfilter/nft_payload.c:261:15: warning: 'tsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/net/checksum.h:71:9: warning: 'fsum' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/net/ethernet/apm/xgene/xgene_enet_cle.c:836:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* linux-next: Tree for Dec 6
From: Stephen Rothwell @ 2016-12-06 4:21 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20161205:
Removed tree: kvm-ppc (maintainer transition)
Renamed tree: kvm-ppc-paulus to kvm-ppc
The powerpc allyesconfig build fails for this release.
The pinctrl tree still had its build failure so I used the version from
next-20161202.
The sound-asoc tree gained a build failure so I used the version from
next-20161205.
Non-merge commits (relative to Linus' tree): 9654
9111 files changed, 570025 insertions(+), 208213 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 245 trees (counting Linus' and 35 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (d9d04527c79f Merge tag 'powerpc-4.9-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs)
Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU)
Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions")
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (dadc4a1bb9f0 powerpc/64: Fix placement of .text to be immediately following .head.text)
Merging sparc/master (88abd8249ee8 Merge branch 'for-4.9-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging net/master (c823abac1792 net: ep93xx_eth: Do not crash unloading module)
Merging ipsec/master (a55e23864d38 esp6: Fix integrity verification when ESN are used)
Merging netfilter/master (7bbf91ce27dd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec)
Merging ipvs/master (9b6c14d51bd2 net: tcp response should set oif only if it is L3 master)
Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs)
Merging mac80211/master (9590112241ba tipc: fix link statistics counter errors)
Merging sound-current/for-linus (16200948d835 ALSA: usb-audio: Fix race at stopping the stream)
Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX))
Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (e5517c2a5a49 Linux 4.9-rc7)
Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match())
Merging usb-serial-fixes/usb-linus (7c5b89020900 USB: serial: option: add support for Telit LE922A PIDs 0x1040, 0x1041)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5)
Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5)
Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277)
Merging crypto-current/master (57891633eeef crypto: rsa - Add Makefile dependencies to fix parallel builds)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (3e5de27e940d Linux 4.9-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (e94bd1736f1f drm: Don't call drm_for_each_crtc with a non-KMS driver)
Merging kbuild/for-next (8549430410ed Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (b4871f457978 Merge branch 'syscalls' into for-next)
Merging arm-perf/for-next/perf (f43365ee17f8 selftests: arm64: add test for unaligned/inexact watchpoint handling)
Merging pinctrl/for-next (3a037cf0767f pinctrl: sx150x: handle missing 'advanced' reg in sx1504 and sx1505)
$ git reset --hard HEAD^
Merging next-20161202 version of pinctrl
Merging arm-soc/for-next (bc82521fd067 arm-soc: document merges)
Merging amlogic/for-next (0ef8bcc8c1b3 Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (242a001e48b7 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (5cfcfe81e33b Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (4aecea63ed81 Merge branch 'omap-for-v4.10/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (bbf9c90768f9 Merge tag 'qcom-dts-for-4.10-2' into all-for-4.10-part2)
Merging renesas/next (ba049962976b Merge branch 'soc-match-for-v4.10' into next)
Merging rockchip/for-next (7e02e53c6ecf Merge branch 'v4.10-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (2d2a2b87438b Merge branch 'next/soc' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (49f5522e495a arm64: Remove reference to asm/opcodes.h)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
Applying: arm64: merge fix for code movement to cpucaps.h
Merging clk/clk-next (6bbabe5fc53f Merge tag 'v4.10-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next)
CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7796.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7795.dtsi
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-rcar-gen2.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7794.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7793.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7792.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7791.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7779.dtsi
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (c78874f116be tty: serial: make crisv10 explicitly non-modular)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (73367dc57468 m68k/defconfig: Update defconfigs for v4.9-rc1)
Merging m68knommu/for-next (07c65a665b8d m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (ecf41b56e967 Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
Merging openrisc/for-next (56cb5749b239 openrisc: prevent VGA console, fix builds)
Merging parisc-hd/for-next (033b41e56bf2 parisc: Try to fix TLB problems)
Merging powerpc/next (ff45000fcb56 powerpc/boot: Request no dynamic linker for boot wrapper)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging fsl/next (902a64f6113f powerpc: get hugetlbpage handling more generic)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (db7ad63624b3 s390/setup: fix memblock usage)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (986ee488b9fd Merge branch 'for-next-next-4.9-20161125' into for-next-20161125)
Merging ceph/master (264048afab27 libceph: initialize last_linger_id with a large integer)
Merging cifs/for-next (8b217fe7fcad SMB3: parsing for new snapshot timestamp mount parm)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (c3b004460d77 quota: Remove dqonoff_mutex)
Merging ext4/dev (b72b1f3b125e ext4: Add select for CONFIG_FS_IOMAP)
Merging f2fs/dev (0002b61bdaac f2fs: return AOP_WRITEPAGE_ACTIVATE for writepage)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (59c3b76cc61d fuse: fix fuse_write_end() if zero bytes were copied)
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (1cd9cb05f96e NFS: Only look at the change attribute cache state in nfs_check_verifier)
Merging nfsd/nfsd-next (fafedf81700d svcrdma: Further clean-up of svc_rdma_get_inv_rkey())
Merging orangefs/for-next (19ff7fcc76e6 orangefs: add .owner to debugfs file_operations)
Merging overlayfs/overlayfs-next (230366f3cf58 ovl: create directories inside merged parent opaque)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir())
Merging xfs/for-next (5f1c6d28cfcd Merge branch 'iomap-4.10-directio' into for-next)
CONFLICT (content): Merge conflict in include/linux/iomap.h
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
Merging pci/next (1a452ec24b3f Merge branch 'pci/host-vmd' into next)
Merging pstore/for-next/pstore (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe)
Merging hid/for-next (9700925ff92d Merge branch 'for-4.10/intel-ish' into for-next)
Merging i2c/i2c/for-next (7448c4ee18e5 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (c8d2bc9bc39e Linux 4.8)
Merging hwmon-staging/hwmon-next (2383a744c11c devicetree: hwmon: Add documentation for TMP108 driver.)
Merging jc_docs/docs-next (2ba90ccca775 core-api: remove an unexpected unident)
Merging v4l-dvb/master (bf0396ea4727 Merge branch 'patchwork' into to_next)
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg left in tree.
$ git rm -f Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
Merging pm/linux-next (092ef66d2886 Merge branch 'device-properties' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (9245ac20d829 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next)
Merging thermal-soc/next (6ee459f5f967 devfreq_cooling: pass a pointer to devfreq in the power model callbacks)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (d29fa0cb7602 swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support)
Merging net-next/master (b0da4f743db5 net: calxeda: xgmac: use new api ethtool_{get|set}_link_ksettings)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
Merging netfilter-next/master (7464293d4266 netfilter: xt_multiport: Fix wrong unmatch result with multiple ports)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (d15697de60db adm80211: add checks for dma mapping errors)
Merging bluetooth/master (6bf0d84d13e9 docs: ieee802154: update main documentation file)
Merging mac80211-next/master (b1363291202c mac80211: Suppress NEW_PEER_CANDIDATE event if no room)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (b66df7cc9ee7 Merge branch 'topic/shared-for-4.10' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (445caaa20c4d mtd: Allocate bdi objects dynamically)
Merging nand/nand/next (8fcfba072420 mtd: nand: tango: Use nand_to_mtd() instead of directly accessing chip->mtd)
Merging crypto/master (5937d81a9613 crypto: algif_aead - fix AIO handling of zero buffer)
Merging drm/drm-next (f03ee46be940 Backmerge tag 'v4.9-rc8' into drm-next)
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (7a9e10253e9e drm/i915: Move priority bumping for flips earlier)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (16571a8a435a drm/qxl: fix use of uninitialized variable)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (63e8e44adfdc Merge branch 'sunxi/dt-late-for-4.10' into sunxi/for-next)
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (5c55e10a1934 Merge remote-tracking branch 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (4763601a56f1 ALSA: usb-audio: Fix bogus error return in snd_usb_create_stream())
Merging sound-asoc/for-next (85b8e39231bc Merge remote-tracking branches 'asoc/topic/wm9705', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
$ git reset --hard HEAD^
Merging next-20161205 version of sound-asoc
Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo)
Merging input/next (accbcea3465b Input: imx6ul_tsc - convert int to u32)
Merging block/for-next (8eb2947a4e7a Merge branch 'for-4.10/block' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
Applying: iomap: fix up for blk_poll and WRITE_ODIRECT change
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
Merging device-mapper/for-next (ec07c7101928 dm crypt: reject key strings containing whitespace chars)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (6b11e70bb72c mmc: sdhci: Tidy tuning loop)
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (e8d7c33232e5 md/raid5: limit request size according to implementation limits)
CONFLICT (content): Merge conflict in drivers/md/raid5-cache.c
CONFLICT (content): Merge conflict in drivers/md/md.c
Merging mfd/for-mfd-next (93559191e71b mfd: tps65217: Support an interrupt pin as the system wakeup)
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (6480af4915d6 power_supply: wm97xx_battery: use power_supply_get_drvdata)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (99b9bc312cb5 Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next)
Merging security/next (50523a29d900 Yama: allow access for the current ptrace parent)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9287aed2ad1f selinux: Convert isec->lock into a spinlock)
Merging tpmdd/next (9430066a15d6 tpm: adjust return value of tpm_read_log)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (a2c3bc6d10e2 Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (3cedd7d75f9a vfio iommu type1: WARN_ON if notifier block is not unregistered)
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
Merging audit/next (5b52b1d37a6f netns: avoid disabling irq for netns id)
CONFLICT (content): Merge conflict in net/core/net_namespace.c
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (3c263bc7b727 add bindings document for altera freeze bridge)
Merging mailbox/mailbox-for-next (16ae16c6e561 Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc)
Merging spi/for-next (b4c2d5a2a28d Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (3c7044c6310f Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/Kconfig
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
Applying: net: busy-poll: fix up for cpu_relax_lowlatency() removal
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (a2e4c787f75b EDAC: Document HW_EVENT_ERR_DEFERRED type)
Merging edac-amd/for-next (0de2788447b6 EDAC, amd64: Fix improper return value)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (38e11df13429 ring-buffer: Force rb_end_commit() and rb_set_commit_to_write() inline)
Merging rcu/rcu/next (ebbaa23b2c0e rcu: Adjust FQS offline checks for exact online-CPU detection)
Merging kvm/linux-next (ffcb09f27f46 Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc)
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging kvm-arm/next (fd5ebf99f814 arm/arm64: KVM: Clean up useless code in kvm_timer_enable)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging kvms390/next (e1788bb995be KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load)
Merging xen-tip/linux-next (b36585a0a3c1 xen/events: use xen_vcpu_id mapping for EVTCHNOP_status)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (401df5ace9d6 intel_pmc_core: Add KBL CPUID support)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (44b3e31d540e leds: pca955x: Add ACPI support)
Merging ipmi/for-next (f0cee6244aa1 ipmi_ssif: create hardware-independent softdep for ipmi_devintf)
Merging driver-core/driver-core-next (64df1148876e driver core: Silence device links sphinx warning)
Merging tty/tty-next (a9b01b5823f7 serial: 8250_mid fix calltrace when hotplug 8250 serial controller)
CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree.
$ git rm -f Documentation/VGA-softcursor.txt
Merging usb/usb-next (b9c2a2a39898 usb: hcd.h: construct hub class request constants from simpler constants)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (3c3dd1e058cb USB: serial: kl5kusb105: abort on open exception path)
Merging usb-chipidea-next/ci-for-usb-next (3be3251db088 usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
Merging phy-next/next (5e253dfbdbea phy: rockchip-inno-usb2: select USB_COMMON)
Merging staging/staging-next (af8bc2fb99d4 staging: unisys: visorbus: Remove two passthrough postcode macros)
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/unisys/include/iochannel.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merging char-misc/char-misc-next (e073462966b2 Merge tag 'fpga-for-greg-20161129' of git://git.kernel.org/pub/scm/linux/kernel/git/atull/linux-fpga into char-misc-next)
CONFLICT (content): Merge conflict in drivers/lightnvm/core.c
Merging extcon/extcon-next (5bb65b24bfcd extcon: return error code on failure)
Merging slave-dma/next (a9439a5b774f Merge branch 'for-linus' into next)
Merging cgroup/for-next (7c0dce2f2c43 cpuset: Remove unused 'struct cpuset*' variable)
Merging scsi/for-next (ee8a864ceaf4 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (e3cb0e47b923 scsi: isci: switch to pci_alloc_irq_vectors)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (1e71615731f8 Merge branch 'for-4.10' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging rpmsg/for-next (442d24006d9e Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e470295a5e5a gpio: merrifield: Implement gpio_get_direction callback)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (fdd3ff4db177 Merge branch 'for-4.10/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (19339c251607 Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC")
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (499a1d11f265 selftest: sync: stress test for merges)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (e615a9a8e481 coresight: perf: Add a missing call to etm_free_aux)
Merging rtc/rtc-next (1c02cbfec5c7 rtc: twl: make driver DT only)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (4cb19355ea19 device-dax: fail all private mapping attempts)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (61ba078c334d ipc/shm.c: coding style fixes)
CONFLICT (content): Merge conflict in mm/workingset.c
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in fs/dax.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: posix-timers: give lazy compilers some help optimizing code away
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Applying: ipc/sem: do not call wake_sem_queue_do() prematurely
Applying: ipc/sem: rework task wakeups
Applying: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Applying: ipc-sem-rework-task-wakeups-checkpatch-fixes
Applying: ipc/sem: optimize perform_atomic_semop()
Applying: ipc/sem: ensure we left shift a ULL rather than a 32 bit integer
Applying: ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes
Applying: ipc/sem: explicitly inline check_restart
Applying: ipc/sem: use proper list api for pending_list wakeups
Applying: ipc/sem: simplify wait-wake loop
Applying: ipc-sem-simplify-wait-wake-loop-checkpatch-fixes
Applying: ipc/sem: avoid idr tree lookup for interrupted semop
Applying: mm: add locked parameter to get_user_pages_remote()
Applying: vfio iommu type1: merge fix for get_user_pages_remote API change
Applying: mm: unexport __get_user_pages_unlocked()
Applying: mm-unexport-__get_user_pages_unlocked-checkpatch-fixes
Applying: mm: join struct fault_env and vm_fault
Applying: mm: use vmf->address instead of of vmf->virtual_address
Applying: mm: use pgoff in struct vm_fault instead of passing it separately
Applying: mm: use passed vm_fault structure in __do_fault()
Applying: mm: trim __do_fault() arguments
Applying: mm: use passed vm_fault structure for in wp_pfn_shared()
Applying: mm: add orig_pte field into vm_fault
Applying: mm: allow full handling of COW faults in ->fault handlers
Applying: mm: factor out functionality to finish page faults
Applying: mm: move handling of COW faults into DAX code
Applying: mm: factor out common parts of write fault handling
Applying: mm: pass vm_fault structure into do_page_mkwrite()
Applying: mm: use vmf->page during WP faults
Applying: mm: move part of wp_page_reuse() into the single call site
Applying: mm: provide helper for finishing mkwrite faults
Applying: mm: change return values of finish_mkwrite_fault()
Applying: mm: export follow_pte()
Applying: dax: make cache flushing protected by entry lock
Applying: dax: protect PTE modification on WP fault by radix tree entry lock
Applying: dax: clear dirty entry tags on cache flush
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Merging akpm/master (9b7e7ede0cab ima: platform-independent hash value)
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Kuninori Morimoto @ 2016-12-06 0:41 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel
In-Reply-To: <20161206111459.77b05dc4@canb.auug.org.au>
Hi Stephen, Mark
> In file included from sound/soc/codecs/cq93vc.c:32:0:
> include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory
>
> Probably caused by commit
>
> 4de429888c5b ("ASoC: cq93vc: remove MFD_DAVINCI_VOICECODEC dependency for CQ0093VC")
>
> I have used the sound-asoc tree from next-20161205 for today.
As I indicated on cover letter, this patch is based on
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git :: for-mfd-next
Especially this commit
8ca9edc837932469b81b8b47ea43a074b6add970
("mfd: davinci_voicecodec: Tidyup header difinitions")
^ permalink raw reply
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2016-12-06 0:14 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Kuninori Morimoto
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from sound/soc/codecs/cq93vc.c:32:0:
include/linux/mfd/davinci_voicecodec.h:31:27: fatal error: mach/hardware.h: No such file or directory
Probably caused by commit
4de429888c5b ("ASoC: cq93vc: remove MFD_DAVINCI_VOICECODEC dependency for CQ0093VC")
I have used the sound-asoc tree from next-20161205 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the sound-asoc tree
From: Stephen Rothwell @ 2016-12-06 0:11 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Mengdong Lin
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) produced this warning:
sound/soc/soc-topology.c: In function 'soc_tplg_dapm_widget_create':
sound/soc/soc-topology.c:1566:36: warning: 'kcontrol_type' may be used uninitialized in this function [-Wmaybe-uninitialized]
widget->dobj.widget.kcontrol_type = kcontrol_type;
^
Introduced by commit
eea3dd4f1247 ("ASoC: topology: Only free TLV for volume mixers of a widget")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: possible removal of the kvm-ppc tree
From: Stephen Rothwell @ 2016-12-05 23:00 UTC (permalink / raw)
To: Alexander Graf; +Cc: linux-next, linux-kernel, Paul Mackerras
In-Reply-To: <4DD53EA4-2C6D-4FBD-8787-F50223E61BCC@suse.de>
Hi Alex,
On Mon, 5 Dec 2016 07:52:00 +0200 Alexander Graf <agraf@suse.de> wrote:
>
> > Am 05.12.2016 um 01:39 schrieb Stephen Rothwell <sfr@canb.auug.org.au>:
> >
> > I noticed that the kvm-ppc tree
> > (git://github.com/agraf/linux-2.6.git#kvm-ppc-next) has not been
> > updated for over a year. I was wondering if I should remove it from
> > linux-next?
> >
> > If so, I will rename the kvm-ppc-paulus tree to be the kvm-ppc tree.
>
> Yes, please go ahead.
Thanks, done.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20161205 build: 3 failures 4 warnings (next-20161205)
From: Mark Brown @ 2016-12-05 17:20 UTC (permalink / raw)
To: Marc Zyngier
Cc: Catalin Marinas, Will Deacon, kernel-build-reports, linaro-kernel,
linux-next, linux-arm-kernel
In-Reply-To: <7b3daf13-dbab-5acf-cd5f-2414141500b3@arm.com>
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
On Mon, Dec 05, 2016 at 03:44:30PM +0000, Marc Zyngier wrote:
> Old and broken gas. I have a workaround stashed there:
> http://git.kernel.org/cgit/linux/kernel/git/maz/arm-platforms.git/commit/?h=arm64/standalone.h&id=559f97365362ed9e96f594200020379df46630d8
> At least binutils 2.24 and 2.25 are affected, while 2.27 is not.
Not that old - this is the Linaro 2015.10 toolchain which wasn't super
new but not exactly from the mists of time either. Anyway, I updated to
2016.11 (GCC 6.2.1, GAS 2.27)... let's see what the fallout is like.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox