* Re: linux-next: build failure after merge of the net-next tree
From: Jeff Kirsher @ 2016-04-22 23:20 UTC (permalink / raw)
To: Mark Brown, David Miller
Cc: sfr, netdev, linux-next, linux-kernel, mark.d.rustad,
andrewx.bowers, kernel-build-reports, linaro-kernel
In-Reply-To: <20160422092017.GY3217@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
On Fri, 2016-04-22 at 10:20 +0100, Mark Brown wrote:
> On Wed, Apr 13, 2016 at 11:15:13AM -0400, David Miller wrote:
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
>
> > > After merging the net-next tree, today's linux-next build (arm
> > > allmodconfig) failed like thisi (this has actually been failing
> for a
> > > few days, now):
>
> > > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko]
> undefined!
>
> > > Caused by commit
>
> > > 49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
>
> > > arm only allows udelay()s up to 2 milliseconds. This commit
> > > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
>
> > Jeff, please have your folks look into this. Probably just a
> simple
> > conversion to mdelay().
>
> This is still present, it's been breaking ARM allmodconfig builds for
> about two weeks now.
Interesting that no one spoke up until just a week ago. I have a fix
and I ready to push it to David Miller.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 22 (adjust_autoksyms.sh)
From: Randy Dunlap @ 2016-04-22 22:55 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-kbuild,
Michal Marek
In-Reply-To: <alpine.LFD.2.20.1604221542270.27452@knanqh.ubzr>
On 04/22/16 12:44, Nicolas Pitre wrote:
> On Fri, 22 Apr 2016, Nicolas Pitre wrote:
>
>> On Fri, 22 Apr 2016, Randy Dunlap wrote:
>>
>>> Yes, this patch helps, but I think there is still a problem.
>>> I think that trim needs to be done after CONFIG_BUILD_DOCSRC and possibly
>>> after CONFIG_SAMPLES are built.
>>
>> The later is already taken care of with commit dd92478a15.
>>
>>> At least CONFIG_BUILD_DOCSRC seems to
>>> cause this error:
>>>
>>> Setup is 16508 bytes (padded to 16896 bytes).
>>> System is 6125 kB
>>> CRC 8aa70f94
>>> Kernel: arch/x86/boot/bzImage is ready (#9)
>>> ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
>>> ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
>>> ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
>>> ../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
>>> make[2]: *** [__modpost] Error 1
>>
>> This one is indeed a problem.
>
> Please try the following:
Yes, this works. Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
> ----- >8
> Subject: [PATCH] kbuild: better abstract vmlinux sequential prerequisites
>
> When CONFIG_TRIM_UNUSED_KSYMS=y and CONFIG_BUILD_DOCSRC=y it is possible
> to get the following error:
>
> ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
> ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
> ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
> ../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
>
> It is not sufficient to do "vmlinux-dirs += Documentation" as this also
> depends on the headers_check target, and all of this needs to be done
> before adjust_autoksyms.sh is executed.
>
> Let's sort this out by gathering those sequential prerequisites in a make
> target of their own, separate from the vmlinux target. And by doing so,
> the special autoksyms_recursive target is no longer needed.
>
> Signed-off-by: Nicolas Pitre <nico@linaro.org>
>
> diff --git a/Makefile b/Makefile
> index e9ad498238..3f1eb6a1bf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -926,17 +926,11 @@ export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Doc
>
> vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
>
> -# Final link of vmlinux
> - cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
> -quiet_cmd_link-vmlinux = LINK $@
> -
> -# Include targets which we want to
> -# execute if the rest of the kernel build went well.
> -vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
> -ifdef CONFIG_TRIM_UNUSED_KSYMS
> - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
> - "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
> -endif
> +# Include targets which we want to execute sequentially if the rest of the
> +# kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be
> +# evaluated more than once.
> +PHONY += vmlinux_prereq
> +vmlinux_prereq: $(vmlinux-deps) FORCE
> ifdef CONFIG_HEADERS_CHECK
> $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
> endif
> @@ -946,17 +940,22 @@ endif
> ifdef CONFIG_GDB_SCRIPTS
> $(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
> endif
> - +$(call if_changed,link-vmlinux)
> -
> -autoksyms_recursive: $(vmlinux-deps)
> +ifdef CONFIG_TRIM_UNUSED_KSYMS
> $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
> - "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
> -PHONY += autoksyms_recursive
> + "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"
> +endif
>
> # standalone target for easier testing
> include/generated/autoksyms.h: FORCE
> $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh true
>
> +# Final link of vmlinux
> + cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
> +quiet_cmd_link-vmlinux = LINK $@
> +
> +vmlinux: scripts/link-vmlinux.sh vmlinux_prereq FORCE
> + +$(call if_changed,link-vmlinux)
> +
> # Build samples along the rest of the kernel
> ifdef CONFIG_SAMPLES
> vmlinux-dirs += samples
> --
--
~Randy
^ permalink raw reply
* mmotm 2016-04-22-15-49 uploaded
From: akpm @ 2016-04-22 22:49 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-04-22-15-49 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.6-rc4:
(patches marked "*" will be included in linux-next)
origin.patch
* ksm-introduce-ksm_max_page_sharing-per-page-deduplication-limit.patch
i-need-old-gcc.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
* kexec-update-vmcoreinfo-for-compound_order-dtor.patch
* kexec-export-offsetpagecompound_head-to-find-out-compound-tail-page.patch
* mm-exclude-hugetlb-pages-from-thp-page_mapped-logic.patch
* thp-keep-huge-zero-page-pinned-until-tlb-flush.patch
* mailmap-fix-krzysztof-kozlowskis-misspelled-name.patch
* mm-huge_memory-replace-vm_no_thp-vm_bug_on-with-actual-vma-check.patch
* numa-fix-proc-pid-numa_maps-for-thp.patch
* mm-vmscan-reclaim-highmem-zone-if-buffer_heads-is-over-limit.patch
* mm-call-swap_slot_free_notify-with-holding-page-lock.patch
* mm-hwpoison-fix-wrong-num_poisoned_pages-account.patch
* mailmap-add-frank-rowand.patch
* mm-wake-kcompactd-before-kswapds-short-sleep.patch
* kcov-dont-trace-the-code-coverage-code.patch
* kcov-dont-profile-branches-in-kcov.patch
* update-email-address.patch
* ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.patch
* mm-memory-failure-fix-race-with-compound-page-split-merge.patch
* rapidio-fix-potential-null-pointer-dereference.patch
* lib-stackdepotc-allow-the-stack-trace-hash-to-be-zero.patch
* kprobes-add-the-tls-argument-for-j_do_fork.patch
* mm-fix-incorrect-pfn-passed-to-untrack_pfn-in-remap_pfn_range.patch
* mm-thp-correct-split_huge_pages-file-permission.patch
* mm-memcontrol-let-v2-cgroups-follow-changes-in-system-swappiness.patch
* rapidio-mport_cdev-fix-uapi-type-definitions.patch
* huge-pagecache-mmap_sem-is-unlocked-when-truncation-splits-pmd.patch
* mm-update-min_free_kbytes-from-khugepaged-after-core-initialization.patch
* dax-add-dax_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-blk-call-dax_get_unmapped_area-for-dax-pmd-mappings.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* debugobjects-make-fixup-functions-return-bool-instead-of-int.patch
* debugobjects-correct-the-usage-of-fixup-call-results.patch
* workqueue-update-debugobjects-fixup-callbacks-return-type.patch
* timer-update-debugobjects-fixup-callbacks-return-type.patch
* rcu-update-debugobjects-fixup-callbacks-return-type.patch
* percpu_counter-update-debugobjects-fixup-callbacks-return-type.patch
* documentation-update-debugobjects-doc.patch
* fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch
* ocfs2-error-code-comments-and-amendments-the-comment-of-ocfs2_extended_slot-should-be-0x08.patch
* ocfs2-clean-up-an-unused-variable-wants_rotate-in-ocfs2_truncate_rec.patch
* ocfs2-clean-up-unused-parameter-count-in-o2hb_read_block_input.patch
* ocfs2-o2hb-add-negotiate-timer.patch
* ocfs2-o2hb-add-negotiate-timer-v2.patch
* ocfs2-o2hb-add-nego_timeout-message.patch
* ocfs2-o2hb-add-nego_timeout-message-v2.patch
* ocfs2-o2hb-add-negotiate_approve-message.patch
* ocfs2-o2hb-add-negotiate_approve-message-v2.patch
* ocfs2-o2hb-add-some-user-debug-log.patch
* ocfs2-o2hb-add-some-user-debug-log-v2.patch
* ocfs2-o2hb-dont-negotiate-if-last-hb-fail.patch
* ocfs2-o2hb-fix-hb-hung-time.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* padata-removed-unused-code.patch
* kernel-padata-hide-unused-functions.patch
* kernel-padata-hide-unused-functions-checkpatch-fixes.patch
mm.patch
* mm-slab-fix-the-theoretical-race-by-holding-proper-lock.patch
* mm-slab-remove-bad_alien_magic-again.patch
* mm-slab-drain-the-free-slab-as-much-as-possible.patch
* mm-slab-factor-out-kmem_cache_node-initialization-code.patch
* mm-slab-clean-up-kmem_cache_node-setup.patch
* mm-slab-dont-keep-free-slabs-if-free_objects-exceeds-free_limit.patch
* mm-slab-racy-access-modify-the-slab-color.patch
* mm-slab-make-cache_grow-handle-the-page-allocated-on-arbitrary-node.patch
* mm-slab-separate-cache_grow-to-two-parts.patch
* mm-slab-refill-cpu-cache-through-a-new-slab-without-holding-a-node-lock.patch
* mm-slab-lockless-decision-to-grow-cache.patch
* mm-slub-replace-kick_all_cpus_sync-with-synchronize_sched-in-kmem_cache_shrink.patch
* mm-page_ref-use-page_ref-helper-instead-of-direct-modification-of-_count.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix-fix-fix.patch
* compilerh-add-support-for-malloc-attribute.patch
* include-linux-apply-__malloc-attribute.patch
* include-linux-apply-__malloc-attribute-checkpatch-fixes.patch
* include-linux-nodemaskh-create-next_node_in-helper.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix.patch
* include-linux-nodemaskh-create-next_node_in-helper-fix-fix.patch
* mm-hugetlb-optimize-minimum-size-min_size-accounting.patch
* mm-hugetlb-introduce-hugetlb_bad_size.patch
* arm64-mm-use-hugetlb_bad_size.patch
* metag-mm-use-hugetlb_bad_size.patch
* powerpc-mm-use-hugetlb_bad_size.patch
* tile-mm-use-hugetlb_bad_size.patch
* x86-mm-use-hugetlb_bad_size.patch
* mm-hugetlb-is_vm_hugetlb_page-can-be-boolean.patch
* mm-memory_hotplug-is_mem_section_removable-can-be-boolean.patch
* mm-vmalloc-is_vmalloc_addr-can-be-boolean.patch
* mm-mempolicy-vma_migratable-can-be-boolean.patch
* mm-memcontrolc-mem_cgroup_select_victim_node-clarify-comment.patch
* mm-page_alloc-remove-useless-parameter-of-__free_pages_boot_core.patch
* zsmalloc-use-first_page-rather-than-page.patch
* zsmalloc-clean-up-many-bug_on.patch
* zsmalloc-reordering-function-parameter.patch
* zsmalloc-remove-unused-pool-param-in-obj_free.patch
* mm-hugetlbc-use-first_memory_node.patch
* mm-mempolicyc-offset_il_node-document-and-clarify.patch
* mm-rmap-replace-bug_onanon_vma-degree-with-vm_warn_on.patch
* mm-compaction-wrap-calculating-first-and-last-pfn-of-pageblock.patch
* mm-compaction-reduce-spurious-pcplist-drains.patch
* mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction.patch
* mm-compaction-direct-freepage-allocation-for-async-direct-compaction.patch
* mm-compaction-direct-freepage-allocation-for-async-direct-compaction-checkpatch-fixes.patch
* mm-highmem-simplify-is_highmem.patch
* mm-uninline-page_mapped.patch
* mm-uninline-page_mapped-checkpatch-fixes.patch
* mm-hugetlb-add-same-zone-check-in-pfn_range_valid_gigantic.patch
* mm-memory_hotplug-add-comment-to-some-functions-related-to-memory-hotplug.patch
* mm-vmstat-add-zone-range-overlapping-check.patch
* mm-page_owner-add-zone-range-overlapping-check.patch
* power-add-zone-range-overlapping-check.patch
* mm-workingset-only-do-workingset-activations-on-reads.patch
* mm-filemap-only-do-access-activations-on-reads.patch
* mm-vmscan-reduce-size-of-inactive-file-list.patch
* mm-writeback-correct-dirty-page-calculation-for-highmem.patch
* mm-page_alloc-correct-highmem-memory-statistics.patch
* mm-highmem-make-nr_free_highpages-handles-all-highmem-zones-by-itself.patch
* mm-vmstat-make-node_page_state-handles-all-zones-by-itself.patch
* mm-mmap-kill-hook-arch_rebalance_pgtables.patch
* mm-update_lru_size-warn-and-reset-bad-lru_size.patch
* mm-update_lru_size-do-the-__mod_zone_page_state.patch
* mm-use-__setpageswapbacked-and-dont-clearpageswapbacked.patch
* tmpfs-preliminary-minor-tidyups.patch
* tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
* mm-proc-sys-vm-stat_refresh-to-force-vmstat-update.patch
* huge-mm-move_huge_pmd-does-not-need-new_vma.patch
* huge-pagecache-extend-mremap-pmd-rmap-lockout-to-files.patch
* arch-fix-has_transparent_hugepage.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online.patch
* memory_hotplug-introduce-config_memory_hotplug_default_online-fix.patch
* memory_hotplug-introduce-memhp_default_state=-command-line-parameter.patch
* mm-oom-move-gfp_nofs-check-to-out_of_memory.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path.patch
* oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path-try-to-reap-tasks-which-skip-regular-memcg-oom-killer-path-fix.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper.patch
* mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper-clear-oom_reaper_list-before-clearing-tif_memdie.patch
* mm-page_alloc-only-check-pagecompound-for-high-order-pages.patch
* mm-page_alloc-use-new-pageanonhead-helper-in-the-free-page-fast-path.patch
* mm-page_alloc-reduce-branches-in-zone_statistics.patch
* mm-page_alloc-inline-zone_statistics.patch
* mm-page_alloc-inline-the-fast-path-of-the-zonelist-iterator.patch
* mm-page_alloc-use-__dec_zone_state-for-order-0-page-allocation.patch
* mm-page_alloc-avoid-unnecessary-zone-lookups-during-pageblock-operations.patch
* mm-page_alloc-convert-alloc_flags-to-unsigned.patch
* mm-page_alloc-convert-nr_fair_skipped-to-bool.patch
* mm-page_alloc-remove-unnecessary-local-variable-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-in-get_page_from_freelist.patch
* mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask.patch
* mm-page_alloc-remove-redundant-check-for-empty-zonelist.patch
* mm-page_alloc-simplify-last-cpupid-reset.patch
* mm-page_alloc-move-might_sleep_if-check-to-the-allocator-slowpath.patch
* mm-page_alloc-move-__gfp_hardwall-modifications-out-of-the-fastpath.patch
* mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks.patch
* mm-page_alloc-shorten-the-page-allocator-fast-path.patch
* mm-page_alloc-reduce-cost-of-fair-zone-allocation-policy-retry.patch
* mm-page_alloc-shortcut-watermark-checks-for-order-0-pages.patch
* mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice.patch
* mm-page_alloc-remove-field-from-alloc_context.patch
* mm-page_alloc-check-multiple-page-fields-with-a-single-branch.patch
* mm-page_alloc-remove-unnecessary-variable-from-free_pcppages_bulk.patch
* mm-page_alloc-inline-pageblock-lookup-in-page-free-fast-paths.patch
* cpuset-use-static-key-better-and-convert-to-new-api.patch
* mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
* mm-page_alloc-defer-debugging-checks-of-pages-allocated-from-the-pcp.patch
* vmscan-consider-classzone_idx-in-compaction_ready.patch
* mm-compaction-change-compact_-constants-into-enum.patch
* mm-compaction-cover-all-compaction-mode-in-compact_zone.patch
* mm-compaction-distinguish-compact_deferred-from-compact_skipped.patch
* mm-compaction-distinguish-between-full-and-partial-compact_complete.patch
* mm-compaction-update-compaction_result-ordering.patch
* mm-compaction-simplify-__alloc_pages_direct_compact-feedback-interface.patch
* mm-compaction-abstract-compaction-feedback-to-helpers.patch
* mm-compaction-abstract-compaction-feedback-to-helpers-fix.patch
* mm-use-compaction-feedback-for-thp-backoff-conditions.patch
* mm-oom-rework-oom-detection.patch
* mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
* mm-oom-protect-costly-allocations-some-more.patch
* mm-consider-compaction-feedback-also-for-costly-allocation.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders.patch
* mm-oom-compaction-prevent-from-should_compact_retry-looping-for-ever-for-costly-orders-fix.patch
* z3fold-the-3-fold-allocator-for-compressed-pages.patch
* mm-thp-simplify-the-implementation-of-mk_huge_pmd.patch
* memory-failure-replace-mce-with-memory-failure.patch
* mm-memblock-move-memblock_addreserve_region-into-memblock_addreserve.patch
* mm-vmalloc-keep-a-separate-lazy-free-list.patch
* mm-make-optimistic-check-for-swapin-readahead.patch
* mm-make-optimistic-check-for-swapin-readahead-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-2.patch
* mm-make-swapin-readahead-to-improve-thp-collapse-rate-fix-3.patch
* mm-kasan-initial-memory-quarantine-implementation.patch
* mm-kasan-initial-memory-quarantine-implementation-v8.patch
* mm-kasan-initial-memory-quarantine-implementation-v8-fix.patch
* mm-kasan-dont-call-kasan_krealloc-from-ksize.patch
* mm-kasan-add-a-ksize-test.patch
* mm-memblock-if-nr_new-is-0-just-return.patch
* procfs-expose-umask-in-proc-pid-status.patch
* mn10300-let-exit_fpu-accept-a-task.patch
* exit_thread-remove-empty-bodies.patch
* exit_thread-remove-empty-bodies-fix.patch
* exit_thread-accept-a-task-parameter-to-be-exited.patch
* exit_thread-accept-a-task-parameter-to-be-exited-checkpatch-fixes.patch
* fork-free-thread-in-copy_process-on-failure.patch
* printk-nmi-generic-solution-for-safe-printk-in-nmi.patch
* printk-nmi-warn-when-some-message-has-been-lost-in-nmi-context.patch
* printk-nmi-increase-the-size-of-nmi-buffer-and-make-it-configurable.patch
* printk-nmi-flush-nmi-messages-on-the-system-panic.patch
* lib-switch-config_printk_time-to-int.patch
* printk-allow-different-timestamps-for-printktime.patch
* maintainers-remove-linux-listsopenriscnet.patch
* lib-vsprintf-simplify-uuid-printing.patch
* ima-use-%pu-to-output-uuid-in-printable-format.patch
* lib-uuid-move-generate_random_uuid-to-uuidc.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid.patch
* lib-uuid-introduce-few-more-generic-helpers-for-uuid-fix.patch
* lib-uuid-remove-fsf-address.patch
* sysctl-use-generic-uuid-library.patch
* efi-redefine-type-constant-macro-from-generic-code.patch
* efivars-use-generic-uuid-library.patch
* genhd-move-to-use-generic-uuid-library.patch
* radix-tree-introduce-radix_tree_empty.patch
* radix-tree-test-suite-fix-build.patch
* radix-tree-test-suite-add-tests-for-radix_tree_locate_item.patch
* radix-tree-test-suite-allow-testing-other-fan-out-values.patch
* radix-tree-test-suite-keep-regression-test-runs-short.patch
* radix-tree-test-suite-rebuild-when-headers-change.patch
* radix-tree-remove-unused-looping-macros.patch
* introduce-config_radix_tree_multiorder.patch
* radix-tree-add-missing-sibling-entry-functionality.patch
* radix-tree-fix-sibling-entry-insertion.patch
* radix-tree-fix-deleting-a-multi-order-entry-through-an-alias.patch
* radix-tree-remove-restriction-on-multi-order-entries.patch
* radix-tree-introduce-radix_tree_load_root.patch
* radix-tree-fix-extending-the-tree-for-multi-order-entries-at-offset-0.patch
* radix-tree-test-suite-start-adding-multiorder-tests.patch
* radix-tree-fix-several-shrinking-bugs-with-multiorder-entries.patch
* radix-tree-rewrite-__radix_tree_lookup.patch
* radix-tree-fix-multiorder-bug_on-in-radix_tree_insert.patch
* radix-tree-add-support-for-multi-order-iterating.patch
* radix-tree-test-suite-multi-order-iteration-test.patch
* radix-tree-rewrite-radix_tree_tag_set.patch
* radix-tree-rewrite-radix_tree_tag_clear.patch
* radix-tree-rewrite-radix_tree_tag_get.patch
* radix-tree-test-suite-add-multi-order-tag-test.patch
* radix-tree-fix-radix_tree_create-for-sibling-entries.patch
* radix-tree-rewrite-radix_tree_locate_item.patch
* radix-tree-fix-radix_tree_range_tag_if_tagged-for-multiorder-entries.patch
* radix-tree-fix-radix_tree_dump-for-multi-order-entries.patch
* radix-tree-add-copyright-statements.patch
* drivers-hwspinlock-use-correct-radix-tree-api.patch
* radix-tree-miscellaneous-fixes.patch
* radix-tree-split-node-path-into-offset-and-height.patch
* radix-tree-replace-node-height-with-node-shift.patch
* radix-tree-remove-a-use-of-root-height-from-delete_node.patch
* radix-tree-test-suite-remove-dependencies-on-height.patch
* radix-tree-remove-root-height.patch
* radix-tree-rename-indirect_ptr-to-internal_node.patch
* radix-tree-rename-ptr_to_indirect-to-node_to_entry.patch
* radix-tree-rename-indirect_to_ptr-to-entry_to_node.patch
* radix-tree-rename-radix_tree_is_indirect_ptr.patch
* radix-tree-change-naming-conventions-in-radix_tree_shrink.patch
* radix-tree-tidy-up-next_chunk.patch
* radix-tree-tidy-up-range_tag_if_tagged.patch
* radix-tree-tidy-up-__radix_tree_create.patch
* radix-tree-introduce-radix_tree_replace_clear_tags.patch
* radix-tree-make-radix_tree_descend-more-useful.patch
* dax-move-radix_dax_-definitions-to-daxc.patch
* radix-tree-free-up-the-bottom-bit-of-exceptional-entries-for-reuse.patch
* lib-add-crc64-ecma-module.patch
* checkpatch-add-prefer_is_enabled-test.patch
* checkpatch-improve-constant_comparison-test-for-structure-members.patch
* checkpatch-add-test-for-keywords-not-starting-on-tabstops.patch
* checkpatch-whine-about-access_once.patch
* checkpatch-advertise-the-fix-and-fix-inplace-options-more.patch
* checkpatch-add-list-types-to-show-message-types-to-show-or-ignore.patch
* init-mainc-simplify-initcall_blacklisted.patch
* nilfs2-constify-nilfs_sc_operations-structures.patch
* wait-ptrace-assume-__wall-if-the-child-is-traced.patch
* wait-allow-sys_waitid-to-accept-__wnothread-__wclone-__wall.patch
* signal-make-oom_flags-a-bool.patch
* kernel-signalc-convert-printkkern_level-to-pr_level.patch
* fs-execc-fix-minor-memory-leak.patch
* kexec-introduce-a-protection-mechanism-for-the-crashkernel-reserved-memory.patch
* kexec-provide-arch_kexec_protectunprotect_crashkres.patch
* kexec-make-a-pair-of-map-unmap-reserved-pages-in-error-path.patch
* kexec-do-a-cleanup-for-function-kexec_load.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* arch-defconfig-remove-config_resource_counters.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msgc-msgsnd-use-freezable-blocking-call.patch
* msgrcv-use-freezable-blocking-call.patch
linux-next.patch
linux-next-rejects.patch
* mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.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: Tree for Apr 22 (adjust_autoksyms.sh)
From: Nicolas Pitre @ 2016-04-22 19:44 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-kbuild,
Michal Marek
In-Reply-To: <alpine.LFD.2.20.1604221423300.27452@knanqh.ubzr>
On Fri, 22 Apr 2016, Nicolas Pitre wrote:
> On Fri, 22 Apr 2016, Randy Dunlap wrote:
>
> > Yes, this patch helps, but I think there is still a problem.
> > I think that trim needs to be done after CONFIG_BUILD_DOCSRC and possibly
> > after CONFIG_SAMPLES are built.
>
> The later is already taken care of with commit dd92478a15.
>
> > At least CONFIG_BUILD_DOCSRC seems to
> > cause this error:
> >
> > Setup is 16508 bytes (padded to 16896 bytes).
> > System is 6125 kB
> > CRC 8aa70f94
> > Kernel: arch/x86/boot/bzImage is ready (#9)
> > ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
> > ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
> > ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
> > ../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
> > make[2]: *** [__modpost] Error 1
>
> This one is indeed a problem.
Please try the following:
----- >8
Subject: [PATCH] kbuild: better abstract vmlinux sequential prerequisites
When CONFIG_TRIM_UNUSED_KSYMS=y and CONFIG_BUILD_DOCSRC=y it is possible
to get the following error:
ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
It is not sufficient to do "vmlinux-dirs += Documentation" as this also
depends on the headers_check target, and all of this needs to be done
before adjust_autoksyms.sh is executed.
Let's sort this out by gathering those sequential prerequisites in a make
target of their own, separate from the vmlinux target. And by doing so,
the special autoksyms_recursive target is no longer needed.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
diff --git a/Makefile b/Makefile
index e9ad498238..3f1eb6a1bf 100644
--- a/Makefile
+++ b/Makefile
@@ -926,17 +926,11 @@ export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Doc
vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
-# Final link of vmlinux
- cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
-quiet_cmd_link-vmlinux = LINK $@
-
-# Include targets which we want to
-# execute if the rest of the kernel build went well.
-vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
-ifdef CONFIG_TRIM_UNUSED_KSYMS
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
- "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
-endif
+# Include targets which we want to execute sequentially if the rest of the
+# kernel build went well. If CONFIG_TRIM_UNUSED_KSYMS is set, this might be
+# evaluated more than once.
+PHONY += vmlinux_prereq
+vmlinux_prereq: $(vmlinux-deps) FORCE
ifdef CONFIG_HEADERS_CHECK
$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
@@ -946,17 +940,22 @@ endif
ifdef CONFIG_GDB_SCRIPTS
$(Q)ln -fsn `cd $(srctree) && /bin/pwd`/scripts/gdb/vmlinux-gdb.py
endif
- +$(call if_changed,link-vmlinux)
-
-autoksyms_recursive: $(vmlinux-deps)
+ifdef CONFIG_TRIM_UNUSED_KSYMS
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
- "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
-PHONY += autoksyms_recursive
+ "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"
+endif
# standalone target for easier testing
include/generated/autoksyms.h: FORCE
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh true
+# Final link of vmlinux
+ cmd_link-vmlinux = $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux)
+quiet_cmd_link-vmlinux = LINK $@
+
+vmlinux: scripts/link-vmlinux.sh vmlinux_prereq FORCE
+ +$(call if_changed,link-vmlinux)
+
# Build samples along the rest of the kernel
ifdef CONFIG_SAMPLES
vmlinux-dirs += samples
^ permalink raw reply related
* Re: linux-next: Tree for Apr 22 (adjust_autoksyms.sh)
From: Nicolas Pitre @ 2016-04-22 18:43 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-kbuild,
Michal Marek
In-Reply-To: <571A6BCE.9040904@infradead.org>
On Fri, 22 Apr 2016, Randy Dunlap wrote:
> On 04/22/16 10:48, Nicolas Pitre wrote:
> > On Fri, 22 Apr 2016, Randy Dunlap wrote:
> >
> >> on x86_64:
> >>
> >> I'm seeing:
> >>
> >> /bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
> >> /local/lnx/next/linux-next-20160422/Makefile:937: recipe for target 'vmlinux' failed
> >>
> >> when using O=subdir for the build output directory.
> >>
> >>
> >> Is there a missing $(objtree) somewhere?
> >
> > Rather a $(srctree). Please try the patch below.
>
> Hi,
>
> Yes, this patch helps, but I think there is still a problem.
> I think that trim needs to be done after CONFIG_BUILD_DOCSRC and possibly
> after CONFIG_SAMPLES are built.
The later is already taken care of with commit dd92478a15.
> At least CONFIG_BUILD_DOCSRC seems to
> cause this error:
>
> Setup is 16508 bytes (padded to 16896 bytes).
> System is 6125 kB
> CRC 8aa70f94
> Kernel: arch/x86/boot/bzImage is ready (#9)
> ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
> ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
> ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
> ../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
> make[2]: *** [__modpost] Error 1
This one is indeed a problem.
Nicolas
^ permalink raw reply
* Re: linux-next: Tree for Apr 22 (adjust_autoksyms.sh)
From: Randy Dunlap @ 2016-04-22 18:22 UTC (permalink / raw)
To: Nicolas Pitre
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-kbuild,
Michal Marek
In-Reply-To: <alpine.LFD.2.20.1604221345340.27452@knanqh.ubzr>
On 04/22/16 10:48, Nicolas Pitre wrote:
> On Fri, 22 Apr 2016, Randy Dunlap wrote:
>
>> on x86_64:
>>
>> I'm seeing:
>>
>> /bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
>> /local/lnx/next/linux-next-20160422/Makefile:937: recipe for target 'vmlinux' failed
>>
>> when using O=subdir for the build output directory.
>>
>>
>> Is there a missing $(objtree) somewhere?
>
> Rather a $(srctree). Please try the patch below.
Hi,
Yes, this patch helps, but I think there is still a problem.
I think that trim needs to be done after CONFIG_BUILD_DOCSRC and possibly
after CONFIG_SAMPLES are built. At least CONFIG_BUILD_DOCSRC seems to
cause this error:
Setup is 16508 bytes (padded to 16896 bytes).
System is 6125 kB
CRC 8aa70f94
Kernel: arch/x86/boot/bzImage is ready (#9)
ERROR: "cn_del_callback" [Documentation/connector/cn_test.ko] undefined!
ERROR: "cn_add_callback" [Documentation/connector/cn_test.ko] undefined!
ERROR: "cn_netlink_send" [Documentation/connector/cn_test.ko] undefined!
../scripts/Makefile.modpost:91: recipe for target '__modpost' failed
make[2]: *** [__modpost] Error 1
If I'm reading it incorrectly, just yell at me. :)
> ----- >8
>
> Subject: [PATCH] kbuild: fix CONFIG_TRIM_UNUSED_KSYMS=y with a separate output directory
>
> This fixes the following:
>
> /bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
>
> Signed-off-by: Nicolas Pitre <nico@linaro.org>
>
> diff --git a/Makefile b/Makefile
> index e3af48068c..e9ad498238 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -934,7 +934,7 @@ quiet_cmd_link-vmlinux = LINK $@
> # execute if the rest of the kernel build went well.
> vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
> ifdef CONFIG_TRIM_UNUSED_KSYMS
> - $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
> + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
> "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
> endif
> ifdef CONFIG_HEADERS_CHECK
> @@ -949,13 +949,13 @@ endif
> +$(call if_changed,link-vmlinux)
>
> autoksyms_recursive: $(vmlinux-deps)
> - $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
> + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
> "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
> PHONY += autoksyms_recursive
>
> # standalone target for easier testing
> include/generated/autoksyms.h: FORCE
> - $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
> + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh true
>
> # Build samples along the rest of the kernel
> ifdef CONFIG_SAMPLES
> --
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for Apr 22 (adjust_autoksyms.sh)
From: Nicolas Pitre @ 2016-04-22 17:48 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, linux-kbuild,
Michal Marek
In-Reply-To: <571A56C4.7030907@infradead.org>
On Fri, 22 Apr 2016, Randy Dunlap wrote:
> on x86_64:
>
> I'm seeing:
>
> /bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
> /local/lnx/next/linux-next-20160422/Makefile:937: recipe for target 'vmlinux' failed
>
> when using O=subdir for the build output directory.
>
>
> Is there a missing $(objtree) somewhere?
Rather a $(srctree). Please try the patch below.
----- >8
Subject: [PATCH] kbuild: fix CONFIG_TRIM_UNUSED_KSYMS=y with a separate output directory
This fixes the following:
/bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
Signed-off-by: Nicolas Pitre <nico@linaro.org>
diff --git a/Makefile b/Makefile
index e3af48068c..e9ad498238 100644
--- a/Makefile
+++ b/Makefile
@@ -934,7 +934,7 @@ quiet_cmd_link-vmlinux = LINK $@
# execute if the rest of the kernel build went well.
vmlinux: scripts/link-vmlinux.sh $(vmlinux-deps) FORCE
ifdef CONFIG_TRIM_UNUSED_KSYMS
- $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
"$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
endif
ifdef CONFIG_HEADERS_CHECK
@@ -949,13 +949,13 @@ endif
+$(call if_changed,link-vmlinux)
autoksyms_recursive: $(vmlinux-deps)
- $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh \
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
"$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile autoksyms_recursive"
PHONY += autoksyms_recursive
# standalone target for easier testing
include/generated/autoksyms.h: FORCE
- $(Q)$(CONFIG_SHELL) scripts/adjust_autoksyms.sh true
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh true
# Build samples along the rest of the kernel
ifdef CONFIG_SAMPLES
^ permalink raw reply related
* Re: linux-next: Tree for Apr 22 (adjust_autoksyms.sh)
From: Randy Dunlap @ 2016-04-22 16:52 UTC (permalink / raw)
To: Stephen Rothwell, linux-next
Cc: linux-kernel, nicolas.pitre, linux-kbuild, Michal Marek
In-Reply-To: <20160422153503.24aa389e@canb.auug.org.au>
On 04/21/16 22:35, Stephen Rothwell wrote:
> Hi all,
>
> There will be no linux-next release on Monday (ANZAC Day).
>
> Changes since 20160421:
>
on x86_64:
I'm seeing:
/bin/sh: scripts/adjust_autoksyms.sh: No such file or directory
/local/lnx/next/linux-next-20160422/Makefile:937: recipe for target 'vmlinux' failed
when using O=subdir for the build output directory.
Is there a missing $(objtree) somewhere?
thanks,
--
~Randy
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2016-04-22 9:21 UTC (permalink / raw)
To: Philipp Zabel
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
Jyri Sarha
In-Reply-To: <1461314411.4047.16.camel@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
On Fri, Apr 22, 2016 at 10:40:11AM +0200, Philipp Zabel wrote:
> --------8<--------
> From: Philipp Zabel <p.zabel@pengutronix.de>
> Subject: [PATCH] fixup! ASoC: hdmi-codec: Add ELD control
Please also use subject lines that match the style for the subsystem.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the net-next tree
From: Mark Brown @ 2016-04-22 9:20 UTC (permalink / raw)
To: David Miller
Cc: sfr, netdev, linux-next, linux-kernel, mark.d.rustad,
jeffrey.t.kirsher, andrewx.bowers, kernel-build-reports,
linaro-kernel
In-Reply-To: <20160413.111513.295841881765244758.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 816 bytes --]
On Wed, Apr 13, 2016 at 11:15:13AM -0400, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> > After merging the net-next tree, today's linux-next build (arm
> > allmodconfig) failed like thisi (this has actually been failing for a
> > few days, now):
> > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
> > Caused by commit
> > 49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
> > arm only allows udelay()s up to 2 milliseconds. This commit
> > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
> Jeff, please have your folks look into this. Probably just a simple
> conversion to mdelay().
This is still present, it's been breaking ARM allmodconfig builds for
about two weeks now.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2016-04-22 8:58 UTC (permalink / raw)
To: Philipp Zabel
Cc: Stephen Rothwell, Liam Girdwood, linux-next, linux-kernel,
Jyri Sarha
In-Reply-To: <1461314411.4047.16.camel@pengutronix.de>
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
On Fri, Apr 22, 2016 at 10:40:11AM +0200, Philipp Zabel wrote:
> --------8<--------
> From: Philipp Zabel <p.zabel@pengutronix.de>
> Subject: [PATCH] fixup! ASoC: hdmi-codec: Add ELD control
Please don't bury patches in the middle of e-mails.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the sound-asoc tree
From: Philipp Zabel @ 2016-04-22 8:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, Liam Girdwood, linux-next, linux-kernel, Jyri Sarha
In-Reply-To: <20160422120323.24689708@canb.auug.org.au>
Am Freitag, den 22.04.2016, 12:03 +1000 schrieb Stephen Rothwell:
> Hi all,
>
> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from include/linux/notifier.h:13:0,
> from include/linux/memory_hotplug.h:6,
> from include/linux/mmzone.h:744,
> from include/linux/gfp.h:5,
> from include/linux/kmod.h:22,
> from include/linux/module.h:13,
> from sound/soc/codecs/hdmi-codec.c:15:
> sound/soc/codecs/hdmi-codec.c: In function 'hdmi_eld_ctl_get':
> sound/soc/codecs/hdmi-codec.c:68:17: error: 'struct hdmi_codec_priv' has no member named 'eld_lock'
> mutex_lock(&hcp->eld_lock);
> ^
> include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock'
> #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> ^
> sound/soc/codecs/hdmi-codec.c:70:19: error: 'struct hdmi_codec_priv' has no member named 'eld_lock'
> mutex_unlock(&hcp->eld_lock);
> ^
>
> Caused by commit
>
> 81151cfb6bfe ("ASoC: hdmi-codec: Add ELD control")
>
> I have used the sound-asoc tree from next-20160421 for today.
Sorry, the mutex_lock slipped through when reordering the patches.
That should be part of the "Use HDMI notifications to add jack support"
patch instead.
regards
Philipp
--------8<--------
From: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCH] fixup! ASoC: hdmi-codec: Add ELD control
---
sound/soc/codecs/hdmi-codec.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index c78333b..8e36e88 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -65,9 +65,7 @@ static int hdmi_eld_ctl_get(struct snd_kcontrol *kcontrol,
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component);
- mutex_lock(&hcp->eld_lock);
memcpy(ucontrol->value.bytes.data, hcp->eld, sizeof(hcp->eld));
- mutex_unlock(&hcp->eld_lock);
return 0;
}
--
2.8.0.rc3
^ permalink raw reply related
* next-20160422 build: 1 failures 14 warnings (next-20160422)
From: Build bot for Mark Brown @ 2016-04-22 8:37 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160422
Git describe: next-20160422
Commit: 73442f7bec Add linux-next specific files for 20160422
Build Time: 87 min 22 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 14
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
10 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
6 warnings 0 mismatches : arm-multi_v7_defconfig
12 warnings 0 mismatches : arm-allmodconfig
6 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 14
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1325:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 10 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 12 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/net/ethernet/mellanox/mlx5/core/en_main.c:1325:1: warning: the frame size of 1056 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 22
From: Stephen Rothwell @ 2016-04-22 5:35 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
There will be no linux-next release on Monday (ANZAC Day).
Changes since 20160421:
New trees: rdma-leon, rdma-leon-test
The pci tree gained a build failure so I used the version from
next-20160421.
The sound-asoc tree gained a build failure so I used the version from
next-20160421.
The akpm-current tree still had its build failure and gained another
(due to interactions with other trees) for which I applied a patch.
Non-merge commits (relative to Linus' tree): 4966
4535 files changed, 196470 insertions(+), 99293 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 234 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
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 (5f44abd041c5 Merge tag 'rtc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (421e31e58c2a ARCv2: Enable LOCKDEP)
Merging arm-current/fixes (ac36a881b72a ARM: 8564/1: fix cpu feature extracting helper)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (4705e02498d6 powerpc: Update TM user feature bits in scan_features())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (b4f70527f052 openvswitch: use flow protocol when recalculating ipv6 checksums)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name)
Merging wireless-drivers/master (e2841ea91611 Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (8f815cdde3e5 nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (3194ed497939 ALSA: hda - Fix possible race on regmap bypass flip)
Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (f077b7368291 Revert "serial: 8250: Add hardware dependency to RT288X option")
Merging usb.current/usb-linus (c3b46c73264b Linux 4.6-rc4)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (bf1620068911 Linux 4.6-rc3)
Merging char-misc.current/char-misc-linus (c3b46c73264b Linux 4.6-rc4)
Merging input-current/for-linus (dcc7597116c6 Input: twl4030-vibra - do not reparent to grandparent)
Merging crypto-current/master (340ff60ae93a crypto: talitos - fix AEAD tcrypt tests)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (31318a922395 drm/i915: Use fw_domains_put_with_fifo() on HSW)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (e4863ecc1b9d ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (c6433ebdc184 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (7dde46570e4b ARM: SoC: Document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (6ffbe53bca8f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging omap/for-next (8dd34710d963 Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (32620eb0c66d Merge branches 'heads/arm64-dt-for-v4.7', 'heads/dt-for-v4.7', 'heads/soc-for-v4.7' and 'heads/rcar-sysc-for-v4.7' into next)
Merging rockchip/for-next (67624847297a Merge branch 'v4.7-armsoc/drivers' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (5f3438df4df3 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (f1e9b6675c26 Merge branches 'sunxi/clocks-for-4.7', 'sunxi/dt-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (0e74e8192640 Merge branch for-4.7/genpd into for-next)
Merging arm64/for-next/core (643d703d2d2d arm64: compat: Check for AArch32 state)
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 (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (c3b46c73264b Linux 4.6-rc4)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (3f315fa1f5d6 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (bb62bad623de tool/perf: Add sample_reg_mask to include all perf_regs)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (7072276e6c0e s390/Kconfig: make z196 the default processor type)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (90de6800c240 Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (86cf0011caf3 ext4: allow readdir()'s of large empty directories to be interrupted)
Merging f2fs/dev (4da7bf5a4345 f2fs: remove redundant condition check)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (9c7fe83530a3 GFS2: Add calls to gfs2_holder_uninit in two error handlers)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (c3b46c73264b Linux 4.6-rc4)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (3661eae73ee1 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-mvebu' and 'pci/host-vmd' into next)
$ git reset --hard HEAD^
Merging next-20160421 version of pci
Merging hid/for-next (1cdd4e9759b4 Merge branch 'for-4.7/thingm' into for-next)
Merging i2c/i2c/for-next (cd5d37e83267 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next)
Merging pm/linux-next (f10503242155 Merge branch 'acpi-tables' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (9fe6d7e1417e Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (1338727bc468 Merge branch 'topic/bcm' into next)
Merging net-next/master (22d37b6b0058 Merge branch 'geneve-vxlan-deps')
CONFLICT (content): Merge conflict in net/ipv4/udp.c
CONFLICT (content): Merge conflict in drivers/net/dsa/mv88e6xxx.c
Applying: Revert "soreuseport: fix ordering for mixed v4/v6 sockets"
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (8fb04d9fc70a ipvs: don't alter conntrack in OPS mode)
Merging wireless-drivers-next/master (06d05463ee33 rtl8xxxu: hide unused tables)
Merging bluetooth/master (151c37bc29bc ieee802154: atusb: update my copyright years for this driver)
Merging mac80211-next/master (81948527fce5 cfg80211: Add option to report the bss entry in connect result)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging rdma-leon/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging rdma-leon-test/testing/rdma-next (c3b46c73264b Linux 4.6-rc4)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (36cb22c3aa3f mtd: nand: omap2: fix compare_const_fl.cocci warnings)
Merging crypto/master (21ec757d2dd8 crypto: marvell/cesa - Improving code readability)
Merging drm/drm-next (027b3f8ba927 drm/modes: stop handling framebuffer special)
Merging drm-panel/drm/panel/for-next (1ac3bac7c733 drm/panel: simple: Add support for Innolux AT070TN92)
Merging drm-intel/for-linux-next (80dbe9973afc drm/i915/kbl: Don't WARN for expected secondary MISC IO power well request)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (6dc3e22ee197 drm: Make drm.debug parameter description more helpful)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path)
Merging kbuild/for-next (4bf284b27780 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (0c7dcdad0c4e ALSA: hrtimer: Use manual start/stop in callback)
Merging sound-asoc/for-next (d48ffff54e3d Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
$ git reset --hard HEAD^
Merging next-20160421 version of sound-asoc
Merging modules/modules-next (13771c666003 module: Issue warnings when tainting kernel)
Merging input/next (2d077d9f4e98 Input: bcm_iproc_tsc - DT spelling s/clock-name/clock-names/)
Merging block/for-next (06fde609f0bd Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (3ff6a535b994 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (7af73d0b0f28 Merge branch 'fixes' into next)
Merging md/for-next (7dedd15dd252 md/raid0: fix uninitialized variable bug)
Merging mfd/for-mfd-next (ba5776ab6f09 mfd: cros_ec: Allow building for ARM64)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (50307e11665b Merge remote-tracking branch 'regulator/topic/twl' into regulator-next)
Merging security/next (9b091556a073 LSM: LoadPin for kernel file loading restrictions)
Merging integrity/next (f5f8f020b2da ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (1ac42476263e selinux: check ss_initialized before revalidating an inode label)
Merging tpmdd/next (0c61500a7f09 tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (1229bc9a9973 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (78f3873decad Documentation: HOWTO: update git home URL in translations)
Merging trivial/for-next (dc5a533f9130 serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (ea9b269fa561 devicetree: bindings: designware-pcie: Fix unit address)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (73218bcf0beb Merge remote-tracking branch 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (f135996c423a Merge branch 'locking/urgent')
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (d50c744ecde7 tracing: Fix unsigned comparison to zero in hist trigger code)
Merging rcu/rcu/next (3052fd5d2b38 torture: Add starvation events to error summary)
Merging kvm/linux-next (05b1159e641f Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next)
Merging kvm-arm/next (02e0b7600f83 arm64: kvm: Add support for 16K pages)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (4f62568c1fcf fujitsu-laptop: Support radio LED)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (f15c65afddbe leds: ss4200: add DMI data for FSC SCALEO Home Server)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (5614e7725856 Merge 4.6-rc4 into driver-core-next)
Merging tty/tty-next (c3b46c73264b Linux 4.6-rc4)
Merging usb/usb-next (7ce04cff59d5 usb: wusbcore: remove unreachable code)
Merging usb-gadget/next (a2eb431fbd5c usb: dwc3: ep0: sanity check test mode selector)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/debugfs.c
Merging usb-serial/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances)
Merging staging/staging-next (4145ba76b1f7 staging: unisys: visornic: prevent double-unlock of priv_lock)
Merging char-misc/char-misc-next (7553c7e68fd1 Merge 4.6-rc4 into char-misc-next)
Merging extcon/extcon-next (b5dbb9f57842 extcon: usb-gpio: Don't miss event during suspend/resume)
Merging cgroup/for-next (1a5fa50bb048 Merge branch 'for-4.6-ns' into for-next)
Merging scsi/for-next (0237d1ea51f0 pm80xx: Remove bogus address masking in pm8001_ioremap())
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (9c088f21bb5d Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (58657d189a2f Merge branch 'clk-hw-register' (early part) into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (4fe83e63352a Merge branch 'for-4.7/livepatching-ppc64' into for-next)
Merging coresight/next (acb722ae5bf5 coresight: etb10: fixing the right amount of words to read)
Merging rtc/rtc-next (820c5327d631 rtc: ds3232: fix call trace when rtc->ops_lock is used as NULL)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (747220c26dd0 huge tmpfs: add shmem_pmd_fault())
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Applying: Revert "huge tmpfs: add shmem_pmd_fault()"
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (c0a111551051 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-04-22 5:18 UTC (permalink / raw)
To: Andrew Morton, David S. Miller
Cc: linux-next, linux-kernel, Manish Chopra, Yuval Mintz,
Tariq Toukan, Saeed Mahameed, Joonsoo Kim
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/net/ethernet/qlogic/qede/qede_main.c: In function 'qede_fill_frag_skb':
drivers/net/ethernet/qlogic/qede/qede_main.c:961:31: error: 'struct page' has no member named '_count'
atomic_inc(¤t_bd->data->_count);
^
drivers/net/ethernet/qlogic/qede/qede_main.c: In function 'qede_rx_int':
drivers/net/ethernet/qlogic/qede/qede_main.c:1412:33: error: 'struct page' has no member named '_count'
atomic_inc(&sw_rx_data->data->_count);
^
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c: In function 'mlx5e_alloc_rx_fragmented_mpwqe':
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:297:32: error: 'struct page' has no member named '_count'
&wi->umr.dma_info[i].page->_count);
^
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:316:32: error: 'struct page' has no member named '_count'
&wi->umr.dma_info[i].page->_count);
^
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c: In function 'mlx5e_free_rx_fragmented_mpwqe':
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:341:32: error: 'struct page' has no member named '_count'
&wi->umr.dma_info[i].page->_count);
^
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c: In function 'mlx5e_alloc_rx_linear_mpwqe':
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:391:28: error: 'struct page' has no member named '_count'
&wi->dma_info.page[i]._count);
^
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c: In function 'mlx5e_free_rx_linear_mpwqe':
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c:415:28: error: 'struct page' has no member named '_count'
&wi->dma_info.page[i]._count);
^
Caused by commit
2dde4bc2820e ("mm: rename _count, field of the struct page, to _refcount")
interacting with commits
f86af2dfded6 ("qede: Fix various memory allocation error flows for fastpath")
from Linus' tree and
bc77b240b3c5 ("net/mlx5e: Add fragmented memory support for RX multi packet WQE")
from the net-next tree.
I applied the following patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Apr 2016 15:13:21 +1000
Subject: [PATCH] mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 20 ++++++++++----------
drivers/net/ethernet/qlogic/qede/qede_main.c | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 918b7c7fd74f..0543fbc130b6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -293,8 +293,8 @@ static int mlx5e_alloc_rx_fragmented_mpwqe(struct mlx5e_rq *rq,
for (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {
if (unlikely(mlx5e_alloc_and_map_page(rq, wi, i)))
goto err_unmap;
- atomic_add(MLX5_MPWRQ_STRIDES_PER_PAGE,
- &wi->umr.dma_info[i].page->_count);
+ page_ref_add(wi->umr.dma_info[i].page,
+ MLX5_MPWRQ_STRIDES_PER_PAGE);
wi->skbs_frags[i] = 0;
}
@@ -312,8 +312,8 @@ err_unmap:
while (--i >= 0) {
dma_unmap_page(rq->pdev, wi->umr.dma_info[i].addr, PAGE_SIZE,
PCI_DMA_FROMDEVICE);
- atomic_sub(MLX5_MPWRQ_STRIDES_PER_PAGE,
- &wi->umr.dma_info[i].page->_count);
+ page_ref_sub(wi->umr.dma_info[i].page,
+ MLX5_MPWRQ_STRIDES_PER_PAGE);
put_page(wi->umr.dma_info[i].page);
}
dma_unmap_single(rq->pdev, wi->umr.mtt_addr, mtt_sz, PCI_DMA_TODEVICE);
@@ -337,8 +337,8 @@ void mlx5e_free_rx_fragmented_mpwqe(struct mlx5e_rq *rq,
for (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {
dma_unmap_page(rq->pdev, wi->umr.dma_info[i].addr, PAGE_SIZE,
PCI_DMA_FROMDEVICE);
- atomic_sub(MLX5_MPWRQ_STRIDES_PER_PAGE - wi->skbs_frags[i],
- &wi->umr.dma_info[i].page->_count);
+ page_ref_sub(wi->umr.dma_info[i].page,
+ MLX5_MPWRQ_STRIDES_PER_PAGE - wi->skbs_frags[i]);
put_page(wi->umr.dma_info[i].page);
}
dma_unmap_single(rq->pdev, wi->umr.mtt_addr, mtt_sz, PCI_DMA_TODEVICE);
@@ -387,8 +387,8 @@ static int mlx5e_alloc_rx_linear_mpwqe(struct mlx5e_rq *rq,
*/
split_page(wi->dma_info.page, MLX5_MPWRQ_WQE_PAGE_ORDER);
for (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {
- atomic_add(MLX5_MPWRQ_STRIDES_PER_PAGE,
- &wi->dma_info.page[i]._count);
+ page_ref_add(&wi->dma_info.page[i],
+ MLX5_MPWRQ_STRIDES_PER_PAGE);
wi->skbs_frags[i] = 0;
}
@@ -411,8 +411,8 @@ void mlx5e_free_rx_linear_mpwqe(struct mlx5e_rq *rq,
dma_unmap_page(rq->pdev, wi->dma_info.addr, rq->wqe_sz,
PCI_DMA_FROMDEVICE);
for (i = 0; i < MLX5_MPWRQ_PAGES_PER_WQE; i++) {
- atomic_sub(MLX5_MPWRQ_STRIDES_PER_PAGE - wi->skbs_frags[i],
- &wi->dma_info.page[i]._count);
+ page_ref_sub(&wi->dma_info.page[i],
+ MLX5_MPWRQ_STRIDES_PER_PAGE - wi->skbs_frags[i]);
put_page(&wi->dma_info.page[i]);
}
}
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 66cd9f9bd57b..4eaa74f68883 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -958,7 +958,7 @@ static int qede_fill_frag_skb(struct qede_dev *edev,
/* Incr page ref count to reuse on allocation failure
* so that it doesn't get freed while freeing SKB.
*/
- atomic_inc(¤t_bd->data->_count);
+ page_ref_inc(current_bd->data);
goto out;
}
@@ -1409,7 +1409,7 @@ static int qede_rx_int(struct qede_fastpath *fp, int budget)
* freeing SKB.
*/
- atomic_inc(&sw_rx_data->data->_count);
+ page_ref_inc(sw_rx_data->data);
rxq->rx_alloc_errors++;
qede_recycle_rx_bd_ring(rxq, edev,
fp_cqe->bd_num);
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the sound-asoc tree
From: Stephen Rothwell @ 2016-04-22 2:03 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Philipp Zabel, Jyri Sarha
Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/notifier.h:13:0,
from include/linux/memory_hotplug.h:6,
from include/linux/mmzone.h:744,
from include/linux/gfp.h:5,
from include/linux/kmod.h:22,
from include/linux/module.h:13,
from sound/soc/codecs/hdmi-codec.c:15:
sound/soc/codecs/hdmi-codec.c: In function 'hdmi_eld_ctl_get':
sound/soc/codecs/hdmi-codec.c:68:17: error: 'struct hdmi_codec_priv' has no member named 'eld_lock'
mutex_lock(&hcp->eld_lock);
^
include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock'
#define mutex_lock(lock) mutex_lock_nested(lock, 0)
^
sound/soc/codecs/hdmi-codec.c:70:19: error: 'struct hdmi_codec_priv' has no member named 'eld_lock'
mutex_unlock(&hcp->eld_lock);
^
Caused by commit
81151cfb6bfe ("ASoC: hdmi-codec: Add ELD control")
I have used the sound-asoc tree from next-20160421 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the pci tree
From: Stephen Rothwell @ 2016-04-22 0:48 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Murali Karicheri, Rob Herring
Hi Bjorn,
After merging the pci tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/pci/host/pci-keystone.c: In function 'ks_pcie_probe':
drivers/pci/host/pci-keystone.c:412:16: error: 'node' undeclared (first use in this function)
ks_pcie->np = node;
^
Caused by commit
7be92716c1aa ("PCI: keystone: Add error IRQ handler")
I have used the pci tree from next-20160421 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Vivien Didelot @ 2016-04-21 23:54 UTC (permalink / raw)
To: David Miller; +Cc: Stephen Rothwell, netdev, linux-next, linux-kernel
In-Reply-To: <20160418113038.00d78799@canb.auug.org.au>
Hi David,
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/dsa/mv88e6xxx.c
>
> between commit:
>
> 207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")
>
> from the net tree and commit:
>
> 009a2b9843bf ("net: dsa: mv88e6xxx: add number of ports to info")
>
> from the net-next tree.
>
> I fixed it up (the former removed some of the code updated by the latter)
> 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.
I have another series to send to net-next which will also conflict with this
fix from net. As it is also required in net-next, can the fix be merged
in net-next as well?
This fix is the 3 commits:
65fa40276ac1 ("net: dsa: mv88e6xxx: unlock DSA and CPU ports")
996ecb824667 ("net: dsa: mv88e6xxx: enable SA learning on DSA ports")
207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")
For the merge commit:
cf6b5fb2514d ("Merge branch 'dsa-mv88e6xxx-fix-cross-chip-bridging'")
Regards,
Vivien
^ permalink raw reply
* Re: Inclusion in linux-next
From: Stephen Rothwell @ 2016-04-21 22:03 UTC (permalink / raw)
To: Leon Romanovsky, linux-next; +Cc: Doug Ledford
In-Reply-To: <20160420093251.GX6349@leon.nu>
Hi Leon,
On Wed, 20 Apr 2016 12:32:51 +0300 Leon Romanovsky <leon@kernel.org> wrote:
>
> I would like to add my tree [1] in linux-next automatic tree merge.
> What do I need to do for it? Do I need to prepare/send anything?
>
> I thought about two branches for inclusion, but would be glad to hear
> your opinion if it is right thing to do and maybe I need only one.
>
> My goal is to create clean tree from different topic branches.
>
> Branches:
> * rdma-next - this branch will serve as a main for next (not RCs fixes) pull requests. No rebase.
> * testing/rdma-next - this branch will serve as a testing branch for topic
> merges and different companies quals. Rebased.
>
> [1] git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git
Included from today. I have called them rdma-leon and rdma-leon-test.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Hugh Dickins @ 2016-04-21 9:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Hugh Dickins
In-Reply-To: <20160421160016.3221533d@canb.auug.org.au>
On Thu, 21 Apr 2016, Stephen Rothwell wrote:
> Hi Andrew,
>
> After merging the akpm-current tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> mm/built-in.o: In function `handle_mm_fault':
> frame_vector.c:(.text+0x29628): undefined reference to `do_huge_pmd_anonymous_page'
>
> (Ignore the "frame_vector.c" above it is obviously incorrect.)
>
> Probably caused by commit
>
> 747220c26dd0 ("huge tmpfs: add shmem_pmd_fault()")
>
> [Andrew: I added this patch from Hugh today ... see other emails]
Many thanks for trying to include those...
>
> The condition protecting the call to do_huge_pmd_anonymous_page()
> in __handle_mm_fault() has becom more complicated and so the call
> has presumably no longer been removed by the compiler for the
> !CONFIG_TRANSPARENT_HUGEPAGE case.
>
> I have reverted that commit for today.
... and sorry for wasting your time again, with unfamiliar optimizer
failures. Best ignore patches from me, until I've got into cross-
compiling with your environment. Not this week.
Reverting just that shmem_pmd_fault() commit does leave linux-next
with lots of huge tmpfs patches in, but unable to do huge mappings
of tmpfs (but the DAX COW support that I'd broken restored).
Not worth rushing you another build fix to enable it: Andrew will be
reverting the whole series from his tree in the coming days, to make
way for some zone/node changes from Mel which it was obstructing.
Hugh
^ permalink raw reply
* next-20160421 build: 1 failures 13 warnings (next-20160421)
From: Build bot for Mark Brown @ 2016-04-21 9:21 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160421
Git describe: next-20160421
Commit: bde6ae871b Add linux-next specific files for 20160421
Build Time: 87 min 8 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 13
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
10 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
6 warnings 0 mismatches : arm-multi_v7_defconfig
11 warnings 0 mismatches : arm-allmodconfig
6 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 13
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 10 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 11 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/rcar-du/rcar_du_drv.c:300:24: warning: unused variable 'connector' [-Wunused-variable]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/regulator/core.c:2512:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 21
From: Stephen Rothwell @ 2016-04-21 6:20 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160420:
The tip tree lost its build failures.
The akpm-current tree lost its build failure but gained another for
which I reverted a commit.
Non-merge commits (relative to Linus' tree): 4838
4450 files changed, 182629 insertions(+), 97309 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
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
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 (55f058e7574c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (421e31e58c2a ARCv2: Enable LOCKDEP)
Merging arm-current/fixes (ac36a881b72a ARM: 8564/1: fix cpu feature extracting helper)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (4705e02498d6 powerpc: Update TM user feature bits in scan_features())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (df637193906a Revert "Prevent NUll pointer dereference with two PHYs on cpsw")
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name)
Merging wireless-drivers/master (de478a61389c ath9k: ar5008_hw_cmn_spur_mitigate: add missing mask_m & mask_p initialisation)
Merging mac80211/master (8f815cdde3e5 nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (9859a971ca22 ALSA: hda - add PCI ID for Intel Broxton-T)
Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (f077b7368291 Revert "serial: 8250: Add hardware dependency to RT288X option")
Merging usb.current/usb-linus (c3b46c73264b Linux 4.6-rc4)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (bf1620068911 Linux 4.6-rc3)
Merging char-misc.current/char-misc-linus (c3b46c73264b Linux 4.6-rc4)
Merging input-current/for-linus (dcc7597116c6 Input: twl4030-vibra - do not reparent to grandparent)
Merging crypto-current/master (340ff60ae93a crypto: talitos - fix AEAD tcrypt tests)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
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 (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (31318a922395 drm/i915: Use fw_domains_put_with_fifo() on HSW)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (e4863ecc1b9d ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (c6433ebdc184 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (7dde46570e4b ARM: SoC: Document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (6ffbe53bca8f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging omap/for-next (8dd34710d963 Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (bdc8fcfae81b ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (584a420d4f46 Merge branches 'heads/arm64-dt-for-v4.7', 'heads/dt-for-v4.7', 'heads/soc-for-v4.7' and 'heads/rcar-sysc-for-v4.7' into next)
Merging rockchip/for-next (670939f6a0eb Merge branch 'v4.7-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (f1171050e94b Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (bee573cd1dec Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (643d703d2d2d arm64: compat: Check for AArch32 state)
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 (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (c3b46c73264b Linux 4.6-rc4)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (3f315fa1f5d6 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (8404410b2960 Merge branch 'topic/livepatch' into next)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c7d4d259b747 s390/crypto: cleanup and move the header with the cpacf definitions)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (90de6800c240 Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (86cf0011caf3 ext4: allow readdir()'s of large empty directories to be interrupted)
Merging f2fs/dev (4da7bf5a4345 f2fs: remove redundant condition check)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (9c7fe83530a3 GFS2: Add calls to gfs2_holder_uninit in two error handlers)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (c3b46c73264b Linux 4.6-rc4)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (1cdd4e9759b4 Merge branch 'for-4.7/thingm' into for-next)
Merging i2c/i2c/for-next (cd5d37e83267 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (71a9c23246fe hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next)
Merging pm/linux-next (f10503242155 Merge branch 'acpi-tables' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (4f8a3b208740 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (1338727bc468 Merge branch 'topic/bcm' into next)
Merging net-next/master (10c9ead9f3c6 rtnetlink: add new RTM_GETSTATS message to dump link stats)
CONFLICT (content): Merge conflict in net/ipv4/udp.c
CONFLICT (content): Merge conflict in drivers/net/dsa/mv88e6xxx.c
Applying: Revert "soreuseport: fix ordering for mixed v4/v6 sockets"
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (8fb04d9fc70a ipvs: don't alter conntrack in OPS mode)
Merging wireless-drivers-next/master (171a900c4eb7 rtl8xxxu: MAINTAINERS: Update to point to the active devel branch)
Merging bluetooth/master (151c37bc29bc ieee802154: atusb: update my copyright years for this driver)
Merging mac80211-next/master (81948527fce5 cfg80211: Add option to report the bss entry in connect result)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (36cb22c3aa3f mtd: nand: omap2: fix compare_const_fl.cocci warnings)
Merging crypto/master (21ec757d2dd8 crypto: marvell/cesa - Improving code readability)
Merging drm/drm-next (f9fd2adaacd8 Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next)
Merging drm-panel/drm/panel/for-next (1ac3bac7c733 drm/panel: simple: Add support for Innolux AT070TN92)
Merging drm-intel/for-linux-next (00983519214b drm/i915: Fix eDP low vswing for Broadwell)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (ba34d58c5e86 drm: probe_helper: Hide ugly ifdef)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path)
Merging kbuild/for-next (4bf284b27780 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (8eabbbb9c0c9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (d23f0517357e ALSA: ens1371: Fix "Line In->Rear Out Switch" control)
Merging sound-asoc/for-next (1ad306724e0e Merge remote-tracking branches 'asoc/topic/tlv320aic32x4', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (13771c666003 module: Issue warnings when tainting kernel)
Merging input/next (2d077d9f4e98 Input: bcm_iproc_tsc - DT spelling s/clock-name/clock-names/)
Merging block/for-next (06fde609f0bd Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (3ff6a535b994 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (7af73d0b0f28 Merge branch 'fixes' into next)
Merging md/for-next (7dedd15dd252 md/raid0: fix uninitialized variable bug)
Merging mfd/for-mfd-next (ba5776ab6f09 mfd: cros_ec: Allow building for ARM64)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (adb29b8a5539 Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-spmi', 'regulator/topic/s2mps11', 'regulator/topic/sysfs-init' and 'regulator/topic/twl' into regulator-next)
Merging security/next (9b091556a073 LSM: LoadPin for kernel file loading restrictions)
Merging integrity/next (f5f8f020b2da ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (1ac42476263e selinux: check ss_initialized before revalidating an inode label)
Merging tpmdd/next (0c61500a7f09 tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (78f3873decad Documentation: HOWTO: update git home URL in translations)
Merging trivial/for-next (dc5a533f9130 serial: mctrl_gpio: Grammar s/lines GPIOs/line GPIOs/, /sets/set/)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (ea9b269fa561 devicetree: bindings: designware-pcie: Fix unit address)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (73218bcf0beb Merge remote-tracking branch 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (f135996c423a Merge branch 'locking/urgent')
CONFLICT (content): Merge conflict in drivers/cpufreq/longhaul.c
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (d50c744ecde7 tracing: Fix unsigned comparison to zero in hist trigger code)
Merging rcu/rcu/next (dbfdcc6735f9 torture: Break online and offline functions out of torture_onoff())
Merging kvm/linux-next (05b1159e641f Merge tag 'kvms390-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next)
Merging kvm-arm/next (06a71a24bae5 arm64: KVM: unregister notifiers in hyp mode teardown path)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (4f62568c1fcf fujitsu-laptop: Support radio LED)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (f15c65afddbe leds: ss4200: add DMI data for FSC SCALEO Home Server)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (5614e7725856 Merge 4.6-rc4 into driver-core-next)
Merging tty/tty-next (c3b46c73264b Linux 4.6-rc4)
Merging usb/usb-next (7ce04cff59d5 usb: wusbcore: remove unreachable code)
Merging usb-gadget/next (818ec3aba883 usb: dwc3: debugfs: dump out endpoint details)
CONFLICT (content): Merge conflict in drivers/usb/dwc3/debugfs.c
Merging usb-serial/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances)
Merging staging/staging-next (4145ba76b1f7 staging: unisys: visornic: prevent double-unlock of priv_lock)
Merging char-misc/char-misc-next (7553c7e68fd1 Merge 4.6-rc4 into char-misc-next)
Merging extcon/extcon-next (b5dbb9f57842 extcon: usb-gpio: Don't miss event during suspend/resume)
Merging cgroup/for-next (1a5fa50bb048 Merge branch 'for-4.6-ns' into for-next)
Merging scsi/for-next (0237d1ea51f0 pm80xx: Remove bogus address masking in pm8001_ioremap())
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (9c088f21bb5d Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (bb4399b8a5d7 Merge tag 'clk-renesas-for-v4.7-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (4fe83e63352a Merge branch 'for-4.7/livepatching-ppc64' into for-next)
Merging coresight/next (acb722ae5bf5 coresight: etb10: fixing the right amount of words to read)
Merging rtc/rtc-next (b93d68f0ebd5 rtc: sa1100: DT spelling s/interrupt-name/interrupt-names/)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (747220c26dd0 huge tmpfs: add shmem_pmd_fault())
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Applying: Revert "huge tmpfs: add shmem_pmd_fault()"
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (761ff9422d77 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-04-21 6:00 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Hugh Dickins
Hi Andrew,
After merging the akpm-current tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
mm/built-in.o: In function `handle_mm_fault':
frame_vector.c:(.text+0x29628): undefined reference to `do_huge_pmd_anonymous_page'
(Ignore the "frame_vector.c" above it is obviously incorrect.)
Probably caused by commit
747220c26dd0 ("huge tmpfs: add shmem_pmd_fault()")
[Andrew: I added this patch from Hugh today ... see other emails]
The condition protecting the call to do_huge_pmd_anonymous_page()
in __handle_mm_fault() has becom more complicated and so the call
has presumably no longer been removed by the compiler for the
!CONFIG_TRANSPARENT_HUGEPAGE case.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: error when fetching the c6x tree
From: Stephen Rothwell @ 2016-04-21 0:01 UTC (permalink / raw)
To: Mark Salter; +Cc: linux-next, linux-kernel
In-Reply-To: <1461162837.3897.4.camel@redhat.com>
Hi Mark,
On Wed, 20 Apr 2016 10:33:57 -0400 Mark Salter <msalter@redhat.com> wrote:
>
> On Wed, 2016-04-20 at 07:36 +1000, Stephen Rothwell wrote:
> >
> > Attempting to fetch the c6x tree
> > (git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next)
> > produced this error:
> >
> > fatal: Could not read from remote repository.
> >
> > Please make sure you have the correct access rights
> > and the repository exists.
> >
>
> Thanks Stephen. It looks like there was some transient network issue
> on the server end. It seems to be working now.
I got the error again this morning.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20160401+: ARM: DRA7: linux-next regression: mm/slab: clean-up kmem_cache_node setup
From: Stephen Rothwell @ 2016-04-20 23:31 UTC (permalink / raw)
To: Joonsoo Kim
Cc: Jon Hunter, Nishanth Menon, Russell King, Tony Lindgren, lkml,
linux-next, Andrew Morton, linux-omap,
linux-arm-kernel@lists.infradead.org
In-Reply-To: <20160420074900.GA7071@js1304-P5Q-DELUXE>
Hi Joonsoo,
On Wed, 20 Apr 2016 16:49:00 +0900 Joonsoo Kim <iamjoonsoo.kim@lge.com> wrote:
>
> Ccing Stephen.
>
> On Wed, Apr 20, 2016 at 08:11:41AM +0100, Jon Hunter wrote:
> >
> > On 11/04/16 12:44, Jon Hunter wrote:
> > > On 11/04/16 03:02, Joonsoo Kim wrote:
> > >> On Fri, Apr 08, 2016 at 03:39:20PM -0500, Nishanth Menon wrote:
> > >>> Hi,
> > >>>
> > >>> http://marc.info/?l=linux-omap&m=146014314115625&w=2 series works with
> > >>> v4.6-rc2 kernel, however, it fails with linux-next for suspend-to-ram
> > >>> (mem) on BeagleBoard-X15
> > >>>
> > >>> next-20160327 - good
> > >>> next-20160329 - good
> > >>> next-20160330 - Fails to boot - I2C crashes
> > >>> next-20160331- Fails to boot - USB crashes
> > >>> next-20160401 -> bad
> > >>> next-20160408 -> bad
> > >>>
> > >>> Bisect log of next-20160408 vs v4.6-rc2 ->
> > >>> http://pastebin.ubuntu.com/15697856/
> > >>>
> > >>> # first bad commit: [2b629704a2b6a5b239f23750e5517a9d8c3a4e8c]
> > >>> mm/slab: clean-up kmem_cache_node setup
> > >>>
> > >> I made a mistake on that patch. Could you try to test below one on
> > >> top of it.
> > >>
> > >> --------->8----------------
> > >> From d3af3cc409527e9be6beb62ea395cde67f3c5029 Mon Sep 17 00:00:00 2001
> > >> From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> > >> Date: Mon, 11 Apr 2016 10:48:29 +0900
> > >> Subject: [PATCH] mm/slab: clean-up kmem_cache_node setup-fix
> > >>
> > >> After calling free_block(), we need to re-calculate array_cache's
> > >> avail counter. Fix it.
> > >>
> > >> And, it's better to free objects in shared array when it is
> > >> really necessary. Check it before calling free_block().
> > >>
> > >> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> > >> ---
> > >> mm/slab.c | 3 ++-
> > >> 1 file changed, 2 insertions(+), 1 deletion(-)
> > >>
> > >> diff --git a/mm/slab.c b/mm/slab.c
> > >> index fcd5fbb..27cb390 100644
> > >> --- a/mm/slab.c
> > >> +++ b/mm/slab.c
> > >> @@ -927,9 +927,10 @@ static int setup_kmem_cache_node(struct kmem_cache *cachep,
> > >>
> > >> n = get_node(cachep, node);
> > >> spin_lock_irq(&n->list_lock);
> > >> - if (n->shared) {
> > >> + if (n->shared && force_change) {
> > >> free_block(cachep, n->shared->entry,
> > >> n->shared->avail, node, &list);
> > >> + n->shared->avail = 0;
> > >> }
> > >>
> > >> if (!n->shared || force_change) {
> > >
> > > This also fixes a regression on -next for Tegra that was bisected down
> > > to the same culprit. So ...
> > >
> > > Tested-by: Jon Hunter <jonathanh@nvidia.com>
> >
> > This fix still doesn't appear to have made it into -next and this has
> > been broken now for nearly 3 weeks. Any chance we can get this into -next?
>
> Sorry about that.
>
> Hello, Stephen.
>
> It seems that Andrew is busy now. I guess he will be back soon but
> could you merge this fix to the next tree directly?
I have added that patch from today.
--
Cheers,
Stephen Rothwell
^ 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