* Re: linux-next: manual merge of the drm tree with Linus' tree
From: Philipp Zabel @ 2016-09-20 12:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next, linux-kernel, Lucas Stach, Liu Ying
In-Reply-To: <20160920124206.67755097@canb.auug.org.au>
Hi Stephen,
Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/imx/ipuv3-crtc.c
>
> between commit:
>
> a474478642d5 ("drm/imx: fix crtc vblank state regression")
>
> from Linus' tree and commit:
>
> 5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")
>
> from the drm tree.
>
> I fixed it up (I think - see below) 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.
Thank you for the fix. It shouldn't be critical, but I'd put the
drm_crtc_vblank_off last, for symmetry reasons.
regards
Philipp
^ permalink raw reply
* Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
From: Kevin Hilman @ 2016-09-20 21:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Carlo Caione, Olof Johansson, Arnd Bergmann, ARM, linux-next,
linux-kernel, Jerome Brunet
In-Reply-To: <20160920101938.5d46a0ab@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
> arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>
> between commit:
>
> 8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
> d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.
Cleaned up.
I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.
Kevin
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-20 23:16 UTC (permalink / raw)
To: Michael Ellerman
Cc: Andrew Morton, linux-next, linux-kernel,
bauerman@linux.vnet.ibm.com
In-Reply-To: <87mvj2srvj.fsf@concordia.ellerman.id.au>
Hi Michael,
On Tue, 20 Sep 2016 22:00:32 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Ah yep looks like that's the problem, patch below should fix it?
Yeah, I am just going to (logically) run "sed 's/CONFIG_WORD_SIZE/BITS/'"
over the tree during the merge of the apm-current tree today.
> I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
> from scratch, so I'll see if Thiago can do that and send a new version.
That could be better, but there are still some additions of
CONFIG_WORD_SIZE elsewhere :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm 2016-09-20-16-22 uploaded
From: akpm @ 2016-09-20 23:22 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-09-20-16-22 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.8-rc7:
(patches marked "*" will be included in linux-next)
origin.patch
arch-alpha-kernel-systblss-remove-debug-check.patch
i-need-old-gcc.patch
* mmksm-fix-endless-looping-in-allocating-memory-when-ksm-enable.patch
* dma-mappingh-preserve-unmap-info-for-config_dma_api_debug.patch
* mm-workingset-fix-crash-in-shadow-node-shrinker-caused-by-replace_page_cache_page.patch
* ocfs2-fix-deadlock-on-mmapped-page-in-ocfs2_write_begin_nolock.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* fsnotify-drop-notification_mutex-before-destroying-event.patch
* fsnotify-convert-notification_mutex-to-a-spinlock.patch
* fsnotify-convert-notification_mutex-to-a-spinlock-fix.patch
* fanotify-use-notification_lock-instead-of-access_lock.patch
* fanotify-fix-possible-false-warning-when-freeing-events.patch
* kbuild-simpler-generation-of-assembly-constants.patch
* fs-ocfs2-dlmfs-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-cluster-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-super-remove-deprecated-create_singlethread_workqueue.patch
* fs-ocfs2-dlm-remove-deprecated-create_singlethread_workqueue.patch
* ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-oom-deduplicate-victim-selection-code-for-memcg-and-global-oom.patch
* mm-zsmalloc-add-trace-events-for-zs_compact.patch
* mm-zsmalloc-add-per-class-compact-trace-event.patch
* mm-vmalloc-fix-align-value-calculation-error.patch
* mm-vmalloc-fix-align-value-calculation-error-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix.patch
* mm-vmalloc-fix-align-value-calculation-error-v2-fix-fix-fix.patch
* mm-memcontrol-add-sanity-checks-for-memcg-idref-on-get-put.patch
* mm-oom_killc-fix-task_will_free_mem-comment.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions.patch
* mm-compaction-make-whole_zone-flag-ignore-cached-scanner-positions-checkpatch-fixes.patch
* mm-compaction-cleanup-unused-functions.patch
* mm-compaction-rename-compact_partial-to-compact_success.patch
* mm-compaction-dont-recheck-watermarks-after-compact_success.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority.patch
* mm-compaction-add-the-ultimate-direct-compaction-priority-fix.patch
* mm-compaction-use-correct-watermark-when-checking-compaction-success.patch
* mm-compaction-create-compact_gap-wrapper.patch
* mm-compaction-create-compact_gap-wrapper-fix.patch
* mm-compaction-use-proper-alloc_flags-in-__compaction_suitable.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders.patch
* mm-compaction-require-only-min-watermarks-for-non-costly-orders-fix.patch
* mm-vmscan-make-compaction_ready-more-accurate-and-readable.patch
* mem-hotplug-fix-node-spanned-pages-when-we-have-a-movable-node.patch
* mm-fix-set-pageblock-migratetype-in-deferred-struct-page-init.patch
* mm-vmscan-get-rid-of-throttle_vm_writeout.patch
* mm-debug_pagealloc-clean-up-guard-page-handling-code.patch
* mm-debug_pagealloc-dont-allocate-page_ext-if-we-dont-use-guard-page.patch
* mm-page_owner-move-page_owner-specific-function-to-page_ownerc.patch
* mm-page_ext-rename-offset-to-index.patch
* mm-page_ext-support-extra-space-allocation-by-page_ext-user.patch
* mm-page_owner-dont-define-fields-on-struct-page_ext-by-hard-coding.patch
* do_generic_file_read-fail-immediately-if-killed.patch
* mm-pagewalk-fix-the-comment-for-test_walk.patch
* mm-unrig-vma-cache-hit-ratio.patch
* mm-swap-add-swap_cluster_list.patch
* mm-swap-add-swap_cluster_list-checkpatch-fixes.patch
* mmoom_reaper-reduce-find_lock_task_mm-usage.patch
* mmoom_reaper-do-not-attempt-to-reap-a-task-twice.patch
* oom-keep-mm-of-the-killed-task-available.patch
* kernel-oom-fix-potential-pgd_lock-deadlock-from-__mmdrop.patch
* mm-oom-get-rid-of-signal_struct-oom_victims.patch
* oom-suspend-fix-oom_killer_disable-vs-pm-suspend-properly.patch
* mm-oom-enforce-exit_oom_victim-on-current-task.patch
* mm-make-sure-that-kthreads-will-not-refault-oom-reaped-memory.patch
* oom-oom_reaper-allow-to-reap-mm-shared-by-the-kthreads.patch
* mm-use-zonelist-name-instead-of-using-hardcoded-index.patch
* mm-introduce-arch_reserved_kernel_pages.patch
* mm-memblock-expose-total-reserved-memory.patch
* powerpc-implement-arch_reserved_kernel_pages.patch
* mm-nobootmemc-remove-duplicate-macro-arch_low_address_limit-statements.patch
* mm-bootmemc-replace-kzalloc-by-kzalloc_node.patch
* mm-dont-use-radix-tree-writeback-tags-for-pages-in-swap-cache.patch
* oom-warn-if-we-go-oom-for-higher-order-and-compaction-is-disabled.patch
* mm-mlock-check-against-vma-for-actual-mlock-size.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix.patch
* mm-mlock-check-against-vma-for-actual-mlock-size-fix-2.patch
* mm-mlock-avoid-increase-mm-locked_vm-on-mlock-when-already-mlock2mlock_onfault.patch
* selftest-split-mlock2_-funcs-into-separate-mlock2h.patch
* selftests-vm-add-test-for-mlock-when-areas-are-intersected.patch
* selftest-move-seek_to_smaps_entry-out-of-mlock2-testsc.patch
* selftests-expanding-more-mlock-selftest.patch
* thp-dax-add-thp_get_unmapped_area-for-pmd-mappings.patch
* ext2-4-xfs-call-thp_get_unmapped_area-for-pmd-mappings.patch
* cpu-fix-node-state-for-whether-it-contains-cpu.patch
* mm-proc-make-the-task_mmu-walk_page_range-limit-in-clear_refs_write-obvious.patch
* thp-reduce-usage-of-huge-zero-pages-atomic-counter.patch
* mm-memcontrol-make-the-walk_page_range-limit-obvious.patch
* memory-hotplug-fix-store_mem_state-return-value.patch
* mm-fix-cache-mode-tracking-in-vm_insert_mixed.patch
* mm-swap-use-offset-of-swap-entry-as-key-of-swap-cache.patch
* mm-remove-page_file_index.patch
* revert-mm-oom-prevent-premature-oom-killer-invocation-for-high-order-request.patch
* mm-compaction-more-reliably-increase-direct-compaction-priority.patch
* mm-compaction-restrict-full-priority-to-non-costly-orders.patch
* mm-compaction-make-full-priority-ignore-pageblock-suitability.patch
* mm-dont-emit-warning-from-pagefault_out_of_memory.patch
* mm-page_ioc-replace-some-bug_ons-with-vm_bug_on_page.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit.patch
* fs-use-mapping_set_error-instead-of-opencoded-set_bit-fix.patch
* mm-split-gfp_mask-and-mapping-flags-into-separate-fields.patch
* mm-move-phys_mem_access_prot_allowed-declaration-to-pgtableh.patch
* fs-bufferc-make-__getblk_slow-static.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-fix-2.patch
* mm-memcontrol-consolidate-cgroup-socket-tracking-checkpatch-fixes.patch
* mm-shmemc-constify-anon_ops.patch
* mm-nobootmem-move-the-comment-of-free_all_bootmem.patch
* mm-page_alloc-warn-about-empty-nodemask.patch
* mmksm-add-__gfp_high-to-the-allocation-in-alloc_stable_node.patch
* mm-vma_merge-fix-vm_page_prot-smp-race-condition-against-rmap_walk.patch
* mm-vma_adjust-remove-superfluous-check-for-next-not-null.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* ia64-implement-atomic64_dec_if_positive.patch
* atomic64-no-need-for-config_arch_has_atomic64_dec_if_positive.patch
* proc-much-faster-proc-vmstat.patch
* proc-faster-proc-status.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char.patch
* seq-proc-modify-seq_put_decimal_ll-to-take-a-const-char-not-char-fix.patch
* meminfo-break-apart-a-very-long-seq_printf-with-ifdefs.patch
* proc-relax-proc-tid-timerslack_ns-capability-requirements.patch
* proc-add-lsm-hook-checks-to-proc-tid-timerslack_ns.patch
* proc-fix-timerslack_ns-cap_sys_nice-check-when-adjusting-self.patch
* proc-unsigned-file-descriptors.patch
* min-max-remove-sparse-warnings-when-theyre-nested.patch
* nmi_backtrace-add-more-trigger__cpu_backtrace-methods.patch
* nmi_backtrace-do-a-local-dump_stack-instead-of-a-self-nmi.patch
* arch-tile-adopt-the-new-nmi_backtrace-framework.patch
* nmi_backtrace-generate-one-line-reports-for-idle-cpus.patch
* spellingtxt-modeled-is-spelt-correctly.patch
* uprobes-remove-function-declarations-from-arch-mipss390.patch
* set-git-diff-driver-for-c-source-code-files.patch
* mailmap-add-johan-hovold.patch
* cred-simpler-1d-supplementary-groups.patch
* softirq-fix-tasklet_kill-and-its-users.patch
* console-dont-prefer-first-registered-if-dt-specifies-stdout-path.patch
* radix-tree-slot-can-be-null-in-radix_tree_next_slot.patch
* radix-tree-tests-add-iteration-test.patch
* radix-tree-tests-properly-initialize-mutex.patch
* lib-harden-strncpy_from_user.patch
* make-isdigit-table-lookupless.patch
* kstrtox-smaller-_parse_integer.patch
* lib-bitmapc-enhance-bitmap-syntax.patch
* lib-bitmapc-enhance-bitmap-syntax-fix.patch
* lib-add-crc64-ecma-module.patch
* compat-remove-compat_printk.patch
* checkpatch-see-if-modified-files-are-marked-obsolete-in-maintainers.patch
* checkpatch-look-for-symbolic-permissions-and-suggest-octal-instead.patch
* checkpatch-test-multiple-line-block-comment-alignment.patch
* checkpatch-dont-test-for-prefer-ether_addr_foo.patch
* checkpatch-externalize-the-structs-that-should-be-const.patch
* const_structscheckpatch-add-frequently-used-from-julia-lawalls-list.patch
* checkpatch-speed-up-checking-for-filenames-in-sections-marked-obsolete.patch
* checkpatch-improve-the-block-comment-alignment-test.patch
* checkpatch-add-strict-test-for-macro-argument-reuse.patch
* checkpatch-add-strict-test-for-precedence-challenged-macro-arguments.patch
* checkpatch-improve-macro_arg_precedence-test.patch
* kprobes-include-asm-sectionsh-instead-of-asm-generic-sectionsh.patch
* autofs-fix-typos-in-documentation-filesystems-autofs4txt.patch
* autofs-drop-unnecessary-extern-in-autofs_ih.patch
* autofs-test-autofs-versions-first-on-sb-initialization.patch
* autofs-fix-autofs4_fill_super-error-exit-handling.patch
* autofs-add-warn_on1-for-non-dir-link-inode-case.patch
* autofs-remove-ino-free-in-autofs4_dir_symlink.patch
* autofs-use-autofs4_free_ino-to-kfree-dentry-data.patch
* autofs-remove-obsolete-sb-fields.patch
* autofs-dont-fail-to-free_dev_ioctlparam.patch
* autofs-remove-autofs_devid_len.patch
* autofs-fix-documentation-regarding-devid-on-ioctl.patch
* autofs-update-struct-autofs_dev_ioctl-in-documentation.patch
* autofs-fix-pr_debug-message.patch
* autofs-fix-dev-ioctl-number-range-check.patch
* autofs-fix-dev-ioctl-number-range-check-fix.patch
* autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch
* autofs-fix-print-format-for-ioctl-warning-message.patch
* autofs-move-inclusion-of-linux-limitsh-to-uapi.patch
* autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch
* autofs-remove-possibly-misleading-define-debug.patch
* autofs-refactor-ioctl-fn-vector-in-iookup_dev_ioctl.patch
* fs-make-is_local_mountpoint-usable-by-others.patch
* fs-add-have_local_submounts.patch
* autofs-make-mountpoint-checks-namespace-aware.patch
* fs-remove-unused-have_submounts-function.patch
* pipe-relocate-round_pipe_size-above-pipe_set_size.patch
* pipe-move-limit-checking-logic-into-pipe_set_size.patch
* pipe-refactor-argument-for-account_pipe_buffers.patch
* pipe-fix-limit-checking-in-pipe_set_size.patch
* pipe-simplify-logic-in-alloc_pipe_info.patch
* pipe-fix-limit-checking-in-alloc_pipe_info.patch
* pipe-make-account_pipe_buffers-return-a-value-and-use-it.patch
* pipe-cap-initial-pipe-capacity-according-to-pipe-max-size-limit.patch
* ptrace-clear-tif_syscall_trace-on-ptrace-detach.patch
* kexec_file-allow-arch-specific-memory-walking-for-kexec_add_buffer.patch
* kexec_file-change-kexec_add_buffer-to-take-kexec_buf-as-argument.patch
* kexec_file-factor-out-kexec_locate_mem_hole-from-kexec_add_buffer.patch
* powerpc-change-places-using-config_kexec-to-use-config_kexec_core-instead.patch
* powerpc-factor-out-relocation-code-from-module_64c-to-elf_util_64c.patch
* powerpc-generalize-elf64_apply_relocate_add.patch
* powerpc-adapt-elf64_apply_relocate_add-for-kexec_file_load.patch
* powerpc-add-functions-to-read-elf-files-of-any-endianness.patch
* powerpc-implement-kexec_file_load.patch
* powerpc-add-code-to-work-with-device-trees-in-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load.patch
* powerpc-add-support-for-loading-elf-kernels-with-kexec_file_load-fix.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation.patch
* powerpc-add-purgatory-for-kexec_file_load-implementation-fix.patch
* powerpc-enable-config_kexec_file-in-powerpc-server-defconfigs.patch
* kexec_file-include-the-purgatory-segment-in-the-kexec-image-checksum.patch
* kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* powerpc-kexec_file-add-buffer-hand-over-support-for-the-next-kernel.patch
* kexec_file-add-mechanism-to-update-kexec-segments.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* ima-serialize-the-binary_runtime_measurements.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* rapidio-rio_cm-use-memdup_user-instead-of-duplicating-code.patch
* random-simplify-api-for-random-address-requests.patch
* x86-use-simpler-api-for-random-address-requests.patch
* arm-use-simpler-api-for-random-address-requests.patch
* arm64-use-simpler-api-for-random-address-requests.patch
* tile-use-simpler-api-for-random-address-requests.patch
* unicore32-use-simpler-api-for-random-address-requests.patch
* random-remove-unused-randomize_range.patch
* dma-mapping-introduce-the-dma_attr_no_warn-attribute.patch
* powerpc-implement-the-dma_attr_no_warn-attribute.patch
* nvme-use-the-dma_attr_no_warn-attribute.patch
* x86-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* mips-panic-replace-smp_send_stop-with-kdump-friendly-version-in-panic-path.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-fix.patch
* relay-use-irq_work-instead-of-plain-timer-for-deferred-wakeup-checkpatch-fixes.patch
* config-android-remove-config_ipv6_privacy.patch
* config-android-move-device-mapper-options-to-recommended.patch
* config-android-set-selinux-as-default-security-mode.patch
* config-android-enable-config_seccomp.patch
* ipc-semc-fix-complex_count-vs-simple-op-race.patch
* ipc-msg-implement-lockless-pipelined-wakeups.patch
* ipc-msg-batch-queue-sender-wakeups.patch
* ipc-msg-make-ss_wakeup-kill-arg-boolean.patch
* ipc-msg-lockless-security-checks-for-msgsnd.patch
* ipc-msg-avoid-waking-sender-upon-full-queue.patch
* ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes.patch
linux-next.patch
linux-next-rejects.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* include-linux-mlx5-deviceh-kill-build_bug_ons.patch
* kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* mm-kmemleak-avoid-using-__va-on-addresses-that-dont-have-a-lowmem-mapping.patch
* enable-code-completion-in-vim.patch
* kthread-add-kerneldoc-for-kthread_create.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0.patch
* hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix.patch
* treewide-remove-redundant-include-linux-kconfigh.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
^ permalink raw reply
* linux-next: manual merge of the powerpc tree with the kbuild tree
From: Stephen Rothwell @ 2016-09-21 0:24 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, PowerPC, Michal Marek
Cc: linux-next, linux-kernel, Al Viro, Nicholas Piggin
Hi all,
Today's linux-next merge of the powerpc tree got conflicts in:
arch/powerpc/kernel/misc_32.S
arch/powerpc/kernel/misc_64.S
between commit:
9445aa1a3062 ("ppc: move exports to definitions")
from the kbuild tree and commit:
6f698df10cb2 ("powerpc/kernel: Use kprobe blacklist for asm functions")
from the powerpc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/kernel/misc_32.S
index f5156105c5f3,03756ffdcd71..000000000000
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@@ -360,7 -358,8 +360,9 @@@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_
sync /* additional sync needed on g4 */
isync
blr
+ _ASM_NOKPROBE_SYMBOL(flush_icache_range)
+EXPORT_SYMBOL(flush_icache_range)
+
/*
* Flush a particular page from the data cache to RAM.
* Note: this is necessary because the instruction cache does *not*
diff --cc arch/powerpc/kernel/misc_64.S
index 8b526846e72a,5d7e583f1588..000000000000
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@@ -110,8 -109,8 +110,9 @@@ END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_
bdnz 2b
isync
blr
- .previous .text
+ _ASM_NOKPROBE_SYMBOL(flush_icache_range)
+EXPORT_SYMBOL(flush_icache_range)
+
/*
* Like above, but only do the D-cache.
*
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Michael Ellerman @ 2016-09-21 0:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel,
bauerman@linux.vnet.ibm.com
In-Reply-To: <20160921091622.53067648@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> On Tue, 20 Sep 2016 22:00:32 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>>
>> Ah yep looks like that's the problem, patch below should fix it?
>
> Yeah, I am just going to (logically) run "sed 's/CONFIG_WORD_SIZE/BITS/'"
> over the tree during the merge of the apm-current tree today.
>
>> I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
>> from scratch, so I'll see if Thiago can do that and send a new version.
>
> That could be better, but there are still some additions of
> CONFIG_WORD_SIZE elsewhere :-(
I don't see any others in yesterday's next?
cheers
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Thiago Jung Bauermann @ 2016-09-21 1:12 UTC (permalink / raw)
To: Michael Ellerman
Cc: Stephen Rothwell, Andrew Morton, linux-next, linux-kernel
In-Reply-To: <87bmzirta5.fsf@concordia.ellerman.id.au>
Am Mittwoch, 21 September 2016, 10:27:46 schrieb Michael Ellerman:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > On Tue, 20 Sep 2016 22:00:32 +1000 Michael Ellerman <mpe@ellerman.id.au>
wrote:
> >> Ah yep looks like that's the problem, patch below should fix it?
> >
> > Yeah, I am just going to (logically) run "sed
> > 's/CONFIG_WORD_SIZE/BITS/'"
> > over the tree during the merge of the apm-current tree today.
> >
> >> I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
> >> from scratch, so I'll see if Thiago can do that and send a new version.
> >
> > That could be better, but there are still some additions of
> > CONFIG_WORD_SIZE elsewhere :-(
>
> I don't see any others in yesterday's next?
This kbuild failure is one case:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2016-September/148898.html
elf_util_64.o is only built if CONFIG_WORD_SIZE=64. This is affects the
bisectabilty of many patches in the kexec_file_load series. Should I post a
new version rebased on powerpc/next?
--
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-21 2:02 UTC (permalink / raw)
To: Michael Ellerman; +Cc: Andrew Morton, linux-next, linux-kernel, bauerman
In-Reply-To: <87bmzirta5.fsf@concordia.ellerman.id.au>
Hi Michael,
On Wed, 21 Sep 2016 10:27:46 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > On Tue, 20 Sep 2016 22:00:32 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
> >>
> >> Ah yep looks like that's the problem, patch below should fix it?
> >
> > Yeah, I am just going to (logically) run "sed 's/CONFIG_WORD_SIZE/BITS/'"
> > over the tree during the merge of the apm-current tree today.
> >
> >> I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
> >> from scratch, so I'll see if Thiago can do that and send a new version.
> >
> > That could be better, but there are still some additions of
> > CONFIG_WORD_SIZE elsewhere :-(
>
> I don't see any others in yesterday's next?
I fixed the other one I found as it caused a build failure as well but
was more obvious (and I had had time to think about what was happening).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Thiago Jung Bauermann @ 2016-09-21 2:26 UTC (permalink / raw)
To: Michael Ellerman
Cc: Stephen Rothwell, Andrew Morton, linux-next, linux-kernel
In-Reply-To: <87mvj2srvj.fsf@concordia.ellerman.id.au>
Am Dienstag, 20 September 2016, 22:00:32 schrieb Michael Ellerman:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > On Tue, 20 Sep 2016 16:44:14 +1000 Stephen Rothwell
<sfr@canb.auug.org.au> wrote:
> >> After merging the akpm-current tree, today's linux-next build (powerpc
> >> ppc64_defconfig) failed like this:
> >>
> >> powerpc-linux-gcc: error: unrecognized command line option '-m'
> >> scripts/Makefile.build:290: recipe for target
> >> 'arch/powerpc/purgatory/printf.o' failed
> >>
> >> and a few more like that.
> >
> > OK, this is (most likely) caused by the CONFIG_WORD_SIZE -> BITS change
> > interacting with the KEXEC_FILE changes. Tomorrow I will do a better
> > merge conflict resolution patch that fixes all those.
>
> Ah yep looks like that's the problem, patch below should fix it?
>
> I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
> from scratch, so I'll see if Thiago can do that and send a new version.
I could move the purgatory inside arch/powerpc/boot and use its BOOTCFLAGS.
The needs of the purgatory and the boot wrapper are very similar. Would that
be better?
--
[]'s
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2016-09-21 3:23 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Rafael J. Wysocki
Cc: linux-next, linux-kernel, Viresh Kumar, Sebastian Andrzej Siewior
Hi all,
After merging the tip tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/cpufreq/cpufreq.c:1324:12: error: conflicting types for 'cpufreq_offline'
static int cpufreq_offline(unsigned int cpu)
^
drivers/cpufreq/cpufreq.c:1289:13: note: previous declaration of 'cpufreq_offline' was here
static void cpufreq_offline(unsigned int cpu);
^
Caused by commit
27622b061eb4 ("cpufreq: Convert to hotplug state machine")
interacting with commit
26619804e733 ("cpufreq: create link to policy only for registered CPUs")
from the pm tree.
I have applied the foloowing build fix for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Sep 2016 13:20:32 +1000
Subject: [PATCH] cpufreq: merge fix for type of cpufreq_offline changing
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/cpufreq/cpufreq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 611395cb115e..6e6c1fb60fbc 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1286,7 +1286,7 @@ out_free_policy:
return ret;
}
-static void cpufreq_offline(unsigned int cpu);
+static int cpufreq_offline(unsigned int cpu);
/**
* cpufreq_add_dev - the cpufreq interface for a CPU device.
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Sergey Senozhatsky @ 2016-09-21 5:18 UTC (permalink / raw)
To: akpm, ssantosh
Cc: davem, giovanni.cabiddu, gregkh, herbert, isdn, mingo, pebolle,
peterz, salvatore.benedetto, tadeusz.struk, tglx, mm-commits,
linux-kernel, sfr, linux-next, sergey.senozhatsky.work,
sergey.senozhatsky
In-Reply-To: <57e1b041.zRoBcsxStpPQoyeo%akpm@linux-foundation.org>
Hello,
On (09/20/16 14:55), akpm@linux-foundation.org wrote:
> ------------------------------------------------------
> From: Santosh Shilimkar <ssantosh@kernel.org>
> Subject: softirq: fix tasklet_kill() and its users
>
> Semantically the expectation from the tasklet init/kill API should be as
> below.
>
> tasklet_init() == Init and Enable scheduling
> tasklet_kill() == Disable scheduling and Destroy
>
> The tasklet_init() API exibits the above behavior but tasklet_kill() does
> not. The tasklet handler can still get scheduled and run even after
> tasklet_kill().
>
> There are 2, 3 places where drivers are working around this issue by
> calling tasklet_disable() which will add a usecount and thereby preventing
> the handlers from being called.
>
> tasklet_enable/tasklet_disable is a pair API and they are expected to be
> used together. Usage of tasklet_disable() *just* to work around tasklet
> scheduling after a kill is probably not the correct and intended use of
> the API. We also happen to see similar issues where in the shutdown path
> the tasklet_handler is getting called even after the tasklet_kill().
>
> We fix this by ensuring that tasklet_kill() does the right thing and
> thereby ensures that the tasklet handler won't run after tasklet_kil()
> with a very simple change. The patch fixes the tasklet code and also
> removes a few driver workarounds.
this commit makes ksoftirqd/x to burn CPUs on my system. with a small
addition of WARN_ON_ONCE(atomic_read(&t->count) < 1) to tasklet_action(),
I got
[ 0.411895] ------------[ cut here ]------------
[ 0.411956] WARNING: CPU: 0 PID: 6 at kernel/softirq.c:502 tasklet_action+0xb4/0x12e
[ 0.412018] Modules linked in:
[ 0.412111] CPU: 0 PID: 6 Comm: ksoftirqd/0 Not tainted 4.8.0-rc7-mm1-dbg-00278-g7f4fca2-dirty #58
[ 0.412273] ffff8801330efd30 ffffffff811f073c 0000000000000000 0000000000000000
[ 0.412484] ffff8801330efd70 ffffffff8103d23e 000001f6330efd50 ffffffff81849be0
[ 0.412696] ffffffff81849be8 ffffffff8179cbfc 0000000000000000 0000000000000000
[ 0.412907] Call Trace:
[ 0.412961] [<ffffffff811f073c>] dump_stack+0x68/0x92
[ 0.413020] [<ffffffff8103d23e>] __warn+0xb8/0xd3
[ 0.413079] [<ffffffff8103d2bf>] warn_slowpath_null+0x18/0x1a
[ 0.413138] [<ffffffff810413d8>] tasklet_action+0xb4/0x12e
[ 0.413197] [<ffffffff8104193a>] __do_softirq+0x103/0x20a
[ 0.413256] [<ffffffff81041a5b>] run_ksoftirqd+0x1a/0x4b
[ 0.413316] [<ffffffff8105a25e>] smpboot_thread_fn+0x20c/0x225
[ 0.413376] [<ffffffff8105a052>] ? sort_range+0x1d/0x1d
[ 0.413436] [<ffffffff810578d1>] kthread+0xf4/0xfc
[ 0.413494] [<ffffffff810577dd>] ? kthread_create_on_node+0x1df/0x1df
[ 0.413555] [<ffffffff81057784>] ? kthread_create_on_node+0x186/0x1df
[ 0.413616] [<ffffffff814c0a47>] ret_from_fork+0x27/0x40
[ 0.413735] ---[ end trace d79a87896622b4a4 ]---
-ss
> Link: http://lkml.kernel.org/r/1472089950-2724-1-git-send-email-ssantosh@kernel.org
> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Tadeusz Struk <tadeusz.struk@intel.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Paul Bolle <pebolle@tiscali.nl>
> Cc: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
> Cc: Salvatore Benedetto <salvatore.benedetto@intel.com>
> Cc: Karsten Keil <isdn@linux-pingi.de>
> Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@elte.hu>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> drivers/crypto/qat/qat_common/adf_isr.c | 1 -
> drivers/crypto/qat/qat_common/adf_sriov.c | 1 -
> drivers/crypto/qat/qat_common/adf_vf_isr.c | 2 --
> drivers/isdn/gigaset/interface.c | 1 -
> kernel/softirq.c | 7 ++++---
> 5 files changed, 4 insertions(+), 8 deletions(-)
>
> diff -puN drivers/crypto/qat/qat_common/adf_isr.c~softirq-fix-tasklet_kill-and-its-users drivers/crypto/qat/qat_common/adf_isr.c
> --- a/drivers/crypto/qat/qat_common/adf_isr.c~softirq-fix-tasklet_kill-and-its-users
> +++ a/drivers/crypto/qat/qat_common/adf_isr.c
> @@ -296,7 +296,6 @@ static void adf_cleanup_bh(struct adf_ac
> int i;
>
> for (i = 0; i < hw_data->num_banks; i++) {
> - tasklet_disable(&priv_data->banks[i].resp_handler);
> tasklet_kill(&priv_data->banks[i].resp_handler);
> }
> }
> diff -puN drivers/crypto/qat/qat_common/adf_sriov.c~softirq-fix-tasklet_kill-and-its-users drivers/crypto/qat/qat_common/adf_sriov.c
> --- a/drivers/crypto/qat/qat_common/adf_sriov.c~softirq-fix-tasklet_kill-and-its-users
> +++ a/drivers/crypto/qat/qat_common/adf_sriov.c
> @@ -204,7 +204,6 @@ void adf_disable_sriov(struct adf_accel_
> }
>
> for (i = 0, vf = accel_dev->pf.vf_info; i < totalvfs; i++, vf++) {
> - tasklet_disable(&vf->vf2pf_bh_tasklet);
> tasklet_kill(&vf->vf2pf_bh_tasklet);
> mutex_destroy(&vf->pf2vf_lock);
> }
> diff -puN drivers/crypto/qat/qat_common/adf_vf_isr.c~softirq-fix-tasklet_kill-and-its-users drivers/crypto/qat/qat_common/adf_vf_isr.c
> --- a/drivers/crypto/qat/qat_common/adf_vf_isr.c~softirq-fix-tasklet_kill-and-its-users
> +++ a/drivers/crypto/qat/qat_common/adf_vf_isr.c
> @@ -191,7 +191,6 @@ static int adf_setup_pf2vf_bh(struct adf
>
> static void adf_cleanup_pf2vf_bh(struct adf_accel_dev *accel_dev)
> {
> - tasklet_disable(&accel_dev->vf.pf2vf_bh_tasklet);
> tasklet_kill(&accel_dev->vf.pf2vf_bh_tasklet);
> mutex_destroy(&accel_dev->vf.vf2pf_lock);
> }
> @@ -268,7 +267,6 @@ static void adf_cleanup_bh(struct adf_ac
> {
> struct adf_etr_data *priv_data = accel_dev->transport;
>
> - tasklet_disable(&priv_data->banks[0].resp_handler);
> tasklet_kill(&priv_data->banks[0].resp_handler);
> }
>
> diff -puN drivers/isdn/gigaset/interface.c~softirq-fix-tasklet_kill-and-its-users drivers/isdn/gigaset/interface.c
> --- a/drivers/isdn/gigaset/interface.c~softirq-fix-tasklet_kill-and-its-users
> +++ a/drivers/isdn/gigaset/interface.c
> @@ -524,7 +524,6 @@ void gigaset_if_free(struct cardstate *c
> if (!drv->have_tty)
> return;
>
> - tasklet_disable(&cs->if_wake_tasklet);
> tasklet_kill(&cs->if_wake_tasklet);
> cs->tty_dev = NULL;
> tty_unregister_device(drv->tty, cs->minor_index);
> diff -puN kernel/softirq.c~softirq-fix-tasklet_kill-and-its-users kernel/softirq.c
> --- a/kernel/softirq.c~softirq-fix-tasklet_kill-and-its-users
> +++ a/kernel/softirq.c
> @@ -498,7 +498,7 @@ static void tasklet_action(struct softir
> list = list->next;
>
> if (tasklet_trylock(t)) {
> - if (!atomic_read(&t->count)) {
> + if (atomic_read(&t->count) == 1) {
> if (!test_and_clear_bit(TASKLET_STATE_SCHED,
> &t->state))
> BUG();
> @@ -534,7 +534,7 @@ static void tasklet_hi_action(struct sof
> list = list->next;
>
> if (tasklet_trylock(t)) {
> - if (!atomic_read(&t->count)) {
> + if (atomic_read(&t->count) == 1) {
> if (!test_and_clear_bit(TASKLET_STATE_SCHED,
> &t->state))
> BUG();
> @@ -559,7 +559,7 @@ void tasklet_init(struct tasklet_struct
> {
> t->next = NULL;
> t->state = 0;
> - atomic_set(&t->count, 0);
> + atomic_set(&t->count, 1);
> t->func = func;
> t->data = data;
> }
> @@ -576,6 +576,7 @@ void tasklet_kill(struct tasklet_struct
> } while (test_bit(TASKLET_STATE_SCHED, &t->state));
> }
> tasklet_unlock_wait(t);
> + atomic_dec(&t->count);
> clear_bit(TASKLET_STATE_SCHED, &t->state);
> }
> EXPORT_SYMBOL(tasklet_kill);
> _
>
> Patches currently in -mm which might be from ssantosh@kernel.org are
>
> softirq-fix-tasklet_kill-and-its-users.patch
>
> --
> To unsubscribe from this list: send the line "unsubscribe mm-commits" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the parisc-hd tree
From: Stephen Rothwell @ 2016-09-21 5:20 UTC (permalink / raw)
To: Andrew Morton, Helge Deller, Parisc List
Cc: linux-next, linux-kernel, Vineet Gupta
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
arch/parisc/Kconfig
between commit:
b5d5cf2b8a68 ("parisc: Drop BROKEN_RODATA config option")
from the parisc-hd tree and commit:
7b4d24d8c01d ("atomic64: no need for CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/parisc/Kconfig
index f8dc10dcf292,8a96bdcc3807..000000000000
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@@ -14,7 -14,7 +14,6 @@@ config PARIS
select BUILDTIME_EXTABLE_SORT
select HAVE_PERF_EVENTS
select GENERIC_ATOMIC64 if !64BIT
- select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
- select BROKEN_RODATA
select GENERIC_IRQ_PROBE
select GENERIC_PCI_IOMAP
select ARCH_HAVE_NMI_SAFE_CMPXCHG
^ permalink raw reply
* Re: linux-next: build failure after merge of the akpm-current tree
From: Stephen Rothwell @ 2016-09-21 5:59 UTC (permalink / raw)
To: Michael Ellerman
Cc: Andrew Morton, linux-next, linux-kernel,
bauerman@linux.vnet.ibm.com
In-Reply-To: <20160921091622.53067648@canb.auug.org.au>
Hi all,
On Wed, 21 Sep 2016 09:16:22 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 20 Sep 2016 22:00:32 +1000 Michael Ellerman <mpe@ellerman.id.au> wrote:
> >
> > Ah yep looks like that's the problem, patch below should fix it?
>
> Yeah, I am just going to (logically) run "sed 's/CONFIG_WORD_SIZE/BITS/'"
> over the tree during the merge of the apm-current tree today.
>
> > I think I'd actually prefer it if purgatory didn't redefine the CFLAGS
> > from scratch, so I'll see if Thiago can do that and send a new version.
>
> That could be better, but there are still some additions of
> CONFIG_WORD_SIZE elsewhere :-(
So here is the relevant parts of the merge resolution for merging the
akpm-current tree today.
diff --cc arch/powerpc/kernel/Makefile
index 1925341dbb9c,d12a84003283..e59ed6af0523
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@@ -104,11 -104,12 +104,12 @@@ obj-$(CONFIG_STACKTRACE) += stacktrace.
obj-$(CONFIG_SWIOTLB) += dma-swiotlb.o
pci64-$(CONFIG_PPC64) += pci_dn.o pci-hotplug.o isa-bridge.o
-obj-$(CONFIG_PCI) += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
+obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \
pci-common.o pci_of_scan.o
obj-$(CONFIG_PCI_MSI) += msi.o
- obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o \
+ obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \
- machine_kexec_$(CONFIG_WORD_SIZE).o
-obj-$(CONFIG_KEXEC_FILE) += kexec_elf_$(CONFIG_WORD_SIZE).o
+ machine_kexec_$(BITS).o
++obj-$(CONFIG_KEXEC_FILE) += kexec_elf_$(BITS).o
obj-$(CONFIG_AUDIT) += audit.o
obj64-$(CONFIG_AUDIT) += compat_audit.o
@@@ -123,6 -124,12 +124,12 @@@ ifneq ($(CONFIG_PPC_INDIRECT_PIO),y
obj-y += iomap.o
endif
+ ifneq ($(CONFIG_MODULES)$(CONFIG_KEXEC_FILE),)
-ifeq ($(CONFIG_WORD_SIZE),64)
++ifeq ($(BITS),64)
+ obj-y += elf_util.o elf_util_64.o
+ endif
+ endif
+
obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o
obj-$(CONFIG_PPC64) += $(obj64-y)
diff --cc arch/powerpc/purgatory/Makefile
index 000000000000,fea0308c7f01..bc3b9dc6eead
mode 000000,100644..100644
--- a/arch/powerpc/purgatory/Makefile
+++ b/arch/powerpc/purgatory/Makefile
@@@ -1,0 -1,48 +1,48 @@@
+ OBJECT_FILES_NON_STANDARD := y
+
+ purgatory-y := purgatory.o printf.o string.o v2wrap.o hvCall.o \
+ purgatory-ppc64.o console-ppc64.o crashdump_backup.o \
+ crtsavres.o sha256.o
+
+ targets += $(purgatory-y)
+ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
+
+ LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostartfiles \
+ -nostdlib -nodefaultlibs
+ targets += purgatory.ro
+
+ # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
+ # in turn leaves some undefined symbols like __fentry__ in purgatory and not
+ # sure how to relocate those. Like kexec-tools, use custom flags.
+
+ KBUILD_CFLAGS := -Wall -Wstrict-prototypes -fno-strict-aliasing \
+ -fno-zero-initialized-in-bss -fno-builtin -ffreestanding \
+ -fno-PIC -fno-PIE -fno-stack-protector -fno-exceptions \
- -msoft-float -MD -Os -m$(CONFIG_WORD_SIZE)
-KBUILD_AFLAGS := -fno-exceptions -msoft-float -m$(CONFIG_WORD_SIZE) \
++ -msoft-float -MD -Os -m$(BITS)
++KBUILD_AFLAGS := -fno-exceptions -msoft-float -m$(BITS) \
+ -D__ASSEMBLY__
+
+ ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
+ KBUILD_CFLAGS += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) \
+ -mlittle-endian
+ KBUILD_AFLAGS += $(call cc-option,-mabi=elfv2) -mlittle-endian
+ else
+ KBUILD_CFLAGS += $(call cc-option,-mcall-aixdesc) -mbig-endian
+ KBUILD_AFLAGS += -mbig-endian
+ endif
+
+ $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
+ $(call if_changed,ld)
+
+ targets += kexec-purgatory.c
+
+ CMD_BIN2C = $(objtree)/scripts/basic/bin2c
+ quiet_cmd_bin2c = BIN2C $@
+ cmd_bin2c = $(CMD_BIN2C) kexec_purgatory < $< > $@
+
+ $(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
+ $(call if_changed,bin2c)
+ @:
+
+
+ obj-$(CONFIG_KEXEC_FILE) += kexec-purgatory.o
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for Sep 21
From: Stephen Rothwell @ 2016-09-21 6:08 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160920:
The kbuild tree still had its build failure and warnings for PowerPC,
for which I applied a couple of patches
The powerpc tree gained conflicts against the kbuild tree.
The tip tree gained a build failure (due to an interaction with the pm
tree) for which I applied a merge fix patch.
The akpm-current tree gained a conflict against the parisc-hd tree and
lost a build failure and I applied a merge fix patch for the other.
Non-merge commits (relative to Linus' tree): 11180
8424 files changed, 456474 insertions(+), 237951 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 242 trees (counting Linus' and 34 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 (d2ffb0103aae Merge branch 'akpm' (patches from Andrew))
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (ed7d9a1d7da6 powerpc/powernv/pci: Fix missed TCE invalidations that should fallback to OPAL)
Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
Merging net/master (67a99b7061c0 qed: Fix stack corruption on probe)
Merging ipsec/master (b588479358ce xfrm: Fix memory leak of aead algorithm name)
Merging netfilter/master (440f895aa97f drivers: net: phy: xgene: Fix 'remove' function)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (3f640970a414 ALSA: hda - Fix headset mic detection problem for several Dell laptops)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (3be7988674ab Linux 4.8-rc7)
Merging usb-gadget-fixes/fixes (696118c016dd usb: dwc3: pci: fix build warning on !PM_SLEEP)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (4af2ff91ec3f Input: silead_gsl1680 - use "silead/" prefix for firmware loading)
Merging crypto-current/master (2db34e78f126 crypto: arm64/aes-ctr - fix NULL dereference in tail processing)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (3be7988674ab Linux 4.8-rc7)
Merging kbuild/for-next (fbe6e37dab97 kbuild: add arch specific post-link Makefile)
CONFLICT (content): Merge conflict in arch/Kconfig
Applying: ppc: there is no clear_pages to export
Applying: powerpc/64: whitelist unresolved modversions CRCs
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (270093671215 ARC: dw2 unwind: enable cfi pseudo ops in string lib)
Merging arm/for-next (32cb4b0bce85 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (89bb72f04b7b arm-soc: document merges)
Merging pinctrl/for-next (d6d8a9f007dc Merge branch 'devel' into for-next)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (85023b2e1325 arm64: pmu: Hoist pmu platform device name)
CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
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 (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (f5e14739ed35 CREDITS: Update fingerprint for Geert Uytterhoeven)
Merging m68knommu/for-next (066dc6943021 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (26d2a062a49c Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (910a86435dd7 parisc: Update comment regarding implementation of copy_user_page_asm)
Merging powerpc/next (9d82fd2fae92 MAINTAINERS: Update cxl maintainers)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (dcc096c540d7 s390: migrate exception table users off module.h and onto extable.h)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (56b508b018fd Merge branch 'for-next-next-4.9-20160909' into for-next-20160909)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (ad97c0a24566 [SMB3] Display number of credits available)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (5d3ddd84eaef udf: don't bother with full-page write optimisations in adinicb case)
Merging ext4/dev (e36767750532 blockgroup_lock.h: simplify definition of NR_BG_LOCKS)
Merging f2fs/dev (5905f9afa272 f2fs: handle error in recover_orphan_inode)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (8f40f60a4734 fuse: Add posix ACL support)
Merging gfs2/for-next (23e5671a79be gfs2: Fix extended attribute readahead optimization)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (06826fca0a6c nfsd: randomize SETCLIENTID reply to help distinguish servers)
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (8eac98b8beb4 ovl: during copy up, switch to mounter's creds early)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (4d50b3be79ed Merge branch 'iomap-4.9-dax' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
Merging vfs/for-next (3baf32898e1c parisc: use %pD)
Merging pci/next (503104ad2dc4 Merge branches 'pci/host-aardvark', 'pci/host-hv', 'pci/host-keystone', 'pci/host-rcar' and 'pci/host-tegra' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (fb9063c0a5e9 Merge branch 'for-4.9/upstream' into for-next)
Merging i2c/i2c/for-next (fd0f514448a9 Merge branch 'i2c/for-4.9' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (71f50f61bf01 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (625f866d6fef Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (5737f6c92681 mlx4: add missed recycle opportunity for XDP_TX on TX failure)
Merging ipsec-next/master (34a3d4b2d1f1 xfrm: fix header file comment reference to struct xfrm_replay_state_esn)
Merging netfilter-next/master (14e2dee0996f netfilter: nft_hash: fix hash overflow validation)
CONFLICT (content): Merge conflict in net/netfilter/nf_tables_netdev.c
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (80ba4f1d365a mwifiex: fix null pointer deference when adapter is null)
Merging bluetooth/master (af4168c5a925 Bluetooth: Set appearance only for LE capable controllers)
Merging mac80211-next/master (c13ed534b8db Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging rdma/for-next (64278fe89b72 Merge branch 'hns-roce' into k.o/for-4.9)
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging nand/nand/next (147054c1ccbd mtd: nand: Fix nand_command_lp() for 8bits opcodes)
Merging crypto/master (36e09e1f874b crypto: squash lines for simple wrapper functions)
Merging drm/drm-next (52f13a02b7d5 Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/imx-drm-core.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (51f592050a52 drm/i915: Unlock PPS registers after GPU reset)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (823d1bc10829 dma-buf/sync_file: fix documentation error)
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 (3459ab314ce7 drm/msm: bump kernel api version for explicit fencing)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (aaaae4bcfeee Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (a4bc746c41b5 ALSA: line6: fix ifnullfree.cocci warnings)
Merging sound-asoc/for-next (7de467e35998 Merge remote-tracking branches 'asoc/topic/tlv320dac33', 'asoc/topic/topology', 'asoc/topic/ux500' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (722dc54628ca Input: tps65218-pwrbutton - add support for tps65217 variant)
Merging block/for-next (984da77adcfa Merge branch 'for-4.9/block-irq' into for-next)
Merging lightnvm/for-next (b67347d7dc28 lightnvm: propagate device_add() error code)
Merging device-mapper/for-next (3075292fe80f dm cache policy smq: distribute entries to random levels when switching to smq)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (6d947b50d8b9 mmc: sdhci-acpi: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fcd4a4cc1359 raid5: allow arbitrary max_hw_sectors)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (fcb63d9f5c3a mfd: tps65217: Fix nonstandard declaration)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (bb1e41ba324f power: reset: st: Remove obsolete platforms from dt doc)
Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
Merging regulator/for-next (49503a990264 Merge remote-tracking branches 'regulator/topic/set-voltage', 'regulator/topic/tps65218' and 'regulator/topic/tps80031' into regulator-next)
Merging security/next (8a17ef9d8543 Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9b6a9ecc2d88 selinux: fix error return code in policydb_read())
Merging tpmdd/next (ebfd7532e985 tpm: add check for minimum buffer size in tpm_transmit())
Merging watchdog/master (3be7988674ab Linux 4.8-rc7)
Merging iommu/next (8b8d24825446 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/renesas' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (2e06285655b5 vfio: platform: mark symbols static where possible)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
Merging devicetree/for-next (f94277af03ea of/platform: Initialise dev->fwnode appropriately)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (b25589c028f8 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (7643e61a4816 Merge branch 'perf/core')
CONFLICT (content): Merge conflict in include/linux/jump_label.h
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
Applying: cpufreq: merge fix for type of cpufreq_offline changing
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (c7c35407cd86 EDAC, sb_edac: Remove NULL pointer check on array pci_tad)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (52e6bc6d43a4 bug: Avoid Kconfig warning for BUG_ON_DATA_CORRUPTION)
Merging kvm/linux-next (adad0d02a7d3 kvm: svm: fix unsigned compare less than zero comparison)
Merging kvm-arm/next (5d947a1447f9 KVM: ARM: cleanup kvm_timer_hyp_init)
Merging kvm-mips/next (397fc7ecb8e1 KVM: MIPS: Drop dubious EntryHi optimisation)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (aad9e5ba2433 KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init())
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (4f0fbdf22e73 xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc())
Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (fa1bc2a09f5f platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (2f5bb02ff224 Merge 4.8-rc5 into driver-core-next)
Merging tty/tty-next (d2ec3f77de8e pty: make ptmx file ops read-only after init)
Merging usb/usb-next (3a383cc0b8cc Revert "usb: gadget: NCM: Protect dev->port_usb using dev->lock")
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (7d7005180a7e staging: greybus: MAINTAINERS: add greybus protocol drivers maintainers)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging char-misc/char-misc-next (4b7b948b1fcd vme: fake: fix build for 64-bit dma_addr_t)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (ba021806f080 Merge branch 'topic/hsu' into next)
Merging cgroup/for-next (65a3de66d4ef Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (fb8be2382689 Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (445b12ae2df5 Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c2da060a2d88 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0203a5ff55d7 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (5519cf23ad54 clk: sunxi-ng: Fix reset offset for the A23 and A33)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6bee835dd54e samples: move mic/mpssd example code from Documentation)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (970fc7f4afd5 rtc: cmos: Initialize hpet timer before irq is registered)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (33b69bc53b00 Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (1b437b623704 ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
CONFLICT (content): Merge conflict in include/linux/relay.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Merging akpm/master (79d26d737398 treewide: remove redundant #include <linux/kconfig.h>)
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Viresh Kumar @ 2016-09-21 6:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Rafael J. Wysocki, linux-next, linux-kernel,
Sebastian Andrzej Siewior
In-Reply-To: <20160921132357.3ae9d8dd@canb.auug.org.au>
On 21-09-16, 13:23, Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> drivers/cpufreq/cpufreq.c:1324:12: error: conflicting types for 'cpufreq_offline'
> static int cpufreq_offline(unsigned int cpu)
> ^
> drivers/cpufreq/cpufreq.c:1289:13: note: previous declaration of 'cpufreq_offline' was here
> static void cpufreq_offline(unsigned int cpu);
> ^
>
> Caused by commit
>
> 27622b061eb4 ("cpufreq: Convert to hotplug state machine")
>
> interacting with commit
>
> 26619804e733 ("cpufreq: create link to policy only for registered CPUs")
>
> from the pm tree.
>
> I have applied the foloowing build fix for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 21 Sep 2016 13:20:32 +1000
> Subject: [PATCH] cpufreq: merge fix for type of cpufreq_offline changing
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/cpufreq/cpufreq.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 611395cb115e..6e6c1fb60fbc 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1286,7 +1286,7 @@ out_free_policy:
> return ret;
> }
>
> -static void cpufreq_offline(unsigned int cpu);
> +static int cpufreq_offline(unsigned int cpu);
Thanks and sorry about it. Looks fine.
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
--
viresh
^ permalink raw reply
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Sergey Senozhatsky @ 2016-09-21 8:09 UTC (permalink / raw)
To: ssantosh
Cc: akpm, davem, giovanni.cabiddu, gregkh, herbert, isdn, mingo,
pebolle, peterz, salvatore.benedetto, tadeusz.struk, tglx,
mm-commits, linux-kernel, sfr, linux-next, sergey.senozhatsky,
sergey.senozhatsky.work
In-Reply-To: <20160921051810.GA396@swordfish>
didn't look into the issue, but this thing
> > tasklet_init() == Init and Enable scheduling
[..]
> > @@ -559,7 +559,7 @@ void tasklet_init(struct tasklet_struct
> > {
> > t->next = NULL;
> > t->state = 0;
> > - atomic_set(&t->count, 0);
> > + atomic_set(&t->count, 1);
^^^^^^^^
> > t->func = func;
> > t->data = data;
> > }
seems to be in conflict with
#define DECLARE_TASKLET(name, func, data) \
struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data }
^^^^^^^
#define DECLARE_TASKLET_DISABLED(name, func, data) \
struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
^^^^^^^
as well as with the tasklet_{disable, enable} helpers
static inline void tasklet_disable_nosync(struct tasklet_struct *t)
{
atomic_inc(&t->count);
smp_mb__after_atomic();
}
static inline void tasklet_disable(struct tasklet_struct *t)
{
tasklet_disable_nosync(t);
tasklet_unlock_wait(t);
smp_mb();
}
static inline void tasklet_enable(struct tasklet_struct *t)
{
smp_mb__before_atomic();
atomic_dec(&t->count);
}
-ss
^ permalink raw reply
* next-20160921 build: 2 failures 4 warnings (next-20160921)
From: Build bot for Mark Brown @ 2016-09-21 9:18 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160921
Git describe: next-20160921
Commit: 4fbbc83e89 Add linux-next specific files for 20160921
Build Time: 85 min 15 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 4
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
6 warnings 0 mismatches : arm-multi_v5_defconfig
7 warnings 0 mismatches : arm-multi_v7_defconfig
4 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
3 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 4
2 ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
2 ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
2 ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings Summary: 4
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
2 ../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 4 errors, 0 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 4 errors, 4 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/lov/lov.ko] undefined!
ERROR: "lustre_swab_lov_mds_md" [drivers/staging/lustre/lustre/llite/lustre.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
arm64-defconfig
^ permalink raw reply
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Santosh Shilimkar @ 2016-09-21 17:23 UTC (permalink / raw)
To: Sergey Senozhatsky, ssantosh
Cc: akpm, davem, giovanni.cabiddu, gregkh, herbert, isdn, mingo,
pebolle, peterz, salvatore.benedetto, tadeusz.struk, tglx,
mm-commits, linux-kernel, sfr, linux-next, sergey.senozhatsky
In-Reply-To: <20160921080942.GA476@swordfish>
[-- Attachment #1: Type: text/plain, Size: 2597 bytes --]
On 9/21/2016 1:09 AM, Sergey Senozhatsky wrote:
> didn't look into the issue, but this thing
>
Thanks for reporting Sergey.
>>> tasklet_init() == Init and Enable scheduling
> [..]
>>> @@ -559,7 +559,7 @@ void tasklet_init(struct tasklet_struct
>>> {
>>> t->next = NULL;
>>> t->state = 0;
>>> - atomic_set(&t->count, 0);
>>> + atomic_set(&t->count, 1);
>
^^^^^^^^
>>> t->func = func;
>>> t->data = data;
>>> }
>
> seems to be in conflict with
>
Static helpers also needs to follow the API.
> #define DECLARE_TASKLET(name, func, data) \
> struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data }
> ^^^^^^^
>
> #define DECLARE_TASKLET_DISABLED(name, func, data) \
> struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
> ^^^^^^^
>
>
> as well as with the tasklet_{disable, enable} helpers
>
Those are fine since they work like a pair and the use count
is always balanced.
Am assuming one of the driver in your test is using the DECLARE_TASKLET
to init the tasklet and killed by tasklet_kill() which leaves that
tasklet to be still scheduled by tasklet action.
Can you please try below patch and see if you still see the issue ?
Attaching the same, just in case mailer eat the tabs.
Regards,
Santosh
From e3e676e501a59b2a7de6e9f99ec3917c157e9caf Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <ssantosh@kernel.org>
Date: Wed, 21 Sep 2016 09:58:51 -0700
Subject: [PATCH] softirq: fix DECLARE_TASKLET[_DISABLE] macros init state
In linux-next, commit 1f5e9c3bc47f ("softirq: fix tasklet_kill() and its
users")
changed the init state of the tasklet but missed to update the macros.
Fix them too.
Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
---
include/linux/interrupt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 72f0721..cabf575 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -521,10 +521,10 @@ struct tasklet_struct
};
#define DECLARE_TASKLET(name, func, data) \
-struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data }
+struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
#define DECLARE_TASKLET_DISABLED(name, func, data) \
-struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
+struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(2), func, data }
enum
--
1.9.1
[-- Attachment #2: 0001-softirq-fix-DECLARE_TASKLET-_DISABLE-macros-init-sta.patch --]
[-- Type: text/x-diff, Size: 1323 bytes --]
>From e3e676e501a59b2a7de6e9f99ec3917c157e9caf Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <ssantosh@kernel.org>
Date: Wed, 21 Sep 2016 09:58:51 -0700
Subject: [PATCH] softirq: fix DECLARE_TASKLET[_DISABLE] macros init state
In linux-next, commit 1f5e9c3bc47f ("softirq: fix tasklet_kill() and its users")
changed the init state of the tasklet but missed to update the macros.
Fix them too.
Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
---
include/linux/interrupt.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 72f0721..cabf575 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -521,10 +521,10 @@ struct tasklet_struct
};
#define DECLARE_TASKLET(name, func, data) \
-struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data }
+struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
#define DECLARE_TASKLET_DISABLED(name, func, data) \
-struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
+struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(2), func, data }
enum
--
1.9.1
^ permalink raw reply related
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Sergey Senozhatsky @ 2016-09-22 0:42 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: Sergey Senozhatsky, ssantosh, akpm, davem, giovanni.cabiddu,
gregkh, herbert, isdn, mingo, pebolle, peterz,
salvatore.benedetto, tadeusz.struk, tglx, mm-commits,
linux-kernel, sfr, linux-next, sergey.senozhatsky
In-Reply-To: <d072b085-2d07-066c-f1f7-7eab0a45273a@oracle.com>
Hello,
On (09/21/16 10:23), Santosh Shilimkar wrote:
> > > > tasklet_init() == Init and Enable scheduling
> > [..]
> > > > @@ -559,7 +559,7 @@ void tasklet_init(struct tasklet_struct
> > > > {
> > > > t->next = NULL;
> > > > t->state = 0;
> > > > - atomic_set(&t->count, 0);
> > > > + atomic_set(&t->count, 1);
> >
>
> ^^^^^^^^
> > > > t->func = func;
> > > > t->data = data;
> > > > }
> >
> > seems to be in conflict with
> >
> Static helpers also needs to follow the API.
>
> > #define DECLARE_TASKLET(name, func, data) \
> > struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data }
> > ^^^^^^^
> >
> > #define DECLARE_TASKLET_DISABLED(name, func, data) \
> > struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
> > ^^^^^^^
> >
>
> >
> > as well as with the tasklet_{disable, enable} helpers
> >
> Those are fine since they work like a pair and the use count
> is always balanced.
right, the point was that
DECLARE_TASKLET_DISABLED() equals to tasklet_init()
and
{DECLARE_TASKLET(); tasklet_disable();} equals to tasklet_init()
> Am assuming one of the driver in your test is using the DECLARE_TASKLET
> to init the tasklet and killed by tasklet_kill() which leaves that
> tasklet to be still scheduled by tasklet action.
yes, vt does something like this (kbd_bh).
> Can you please try below patch and see if you still see the issue ?
> Attaching the same, just in case mailer eat the tabs.
hm, didn't completely fix it. the vt is now happy, unlike usbnet.
and the usbnet case is rather alarming.
static inline void tasklet_schedule(struct tasklet_struct *t)
{
+ WARN_ON_ONCE(atomic_read(&t->count) < 1);
+
if (!test_and_set_bit(TASKLET_STATE_SCHED, &t->state))
__tasklet_schedule(t);
}
gives me the following backtrace
[ 36.937798] [<ffffffffa013ff12>] usbnet_open+0x1f9/0x24f [usbnet]
[ 36.937800] [<ffffffff813f7cf7>] __dev_open+0x8c/0xc8
[ 36.937801] [<ffffffff813f7f51>] __dev_change_flags+0xa2/0x13d
[ 36.937802] [<ffffffff813f800c>] dev_change_flags+0x20/0x53
[ 36.937803] [<ffffffff814089da>] do_setlink+0x2f6/0xa31
[ 36.937806] [<ffffffff810cfb66>] ? get_page_from_freelist+0x5f3/0x7b2
[ 36.937808] [<ffffffff810f1995>] ? handle_mm_fault+0x82d/0xcc4
[ 36.937809] [<ffffffff81409973>] rtnl_newlink+0x39b/0x705
[ 36.937812] [<ffffffff813f6d2e>] ? netdev_master_upper_dev_get+0xd/0x57
[ 36.937813] [<ffffffff814096e9>] ? rtnl_newlink+0x111/0x705
[ 36.937816] [<ffffffff81030c5f>] ? update_stack_state.constprop.1+0x4c/0x59
[ 36.937818] [<ffffffff81407737>] rtnetlink_rcv_msg+0x16c/0x17b
[ 36.937820] [<ffffffff814bf065>] ? mutex_lock_nested+0x31f/0x344
[ 36.937823] [<ffffffff8141c204>] ? netlink_deliver_tap+0x234/0x260
[ 36.937824] [<ffffffff814075cb>] ? __rtnl_unlock+0x5e/0x5e
[ 36.937826] [<ffffffff8141f498>] netlink_rcv_skb+0x42/0x83
[ 36.937827] [<ffffffff81407566>] rtnetlink_rcv+0x1e/0x25
[ 36.937828] [<ffffffff8141df8a>] netlink_unicast+0x101/0x18e
[ 36.937829] [<ffffffff8141e7ec>] netlink_sendmsg+0x2ef/0x300
[ 36.937832] [<ffffffff812022b7>] ? import_iovec+0x64/0x84
[ 36.937835] [<ffffffff813dc347>] sock_sendmsg+0xf/0x1a
[ 36.937836] [<ffffffff813dc55b>] ___sys_sendmsg+0x17f/0x1f8
[ 36.937838] [<ffffffff810752db>] ? __lock_is_held+0x3c/0x57
[ 36.937841] [<ffffffff81207e89>] ? __this_cpu_preempt_check+0x13/0x15
[ 36.937843] [<ffffffff813dd7ad>] __sys_sendmsg+0x40/0x61
[ 36.937844] [<ffffffff813dd7ad>] ? __sys_sendmsg+0x40/0x61
[ 36.937845] [<ffffffff813dd7d7>] SyS_sendmsg+0x9/0xb
[ 36.937847] [<ffffffff814c2f6a>] entry_SYSCALL_64_fastpath+0x18/0xad
and there are several big problems here.
looking at usbnet_probe()
int
usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
{
....
skb_queue_head_init (&dev->done);
skb_queue_head_init(&dev->rxq_pause);
dev->bh.func = usbnet_bh;
dev->bh.data = (unsigned long) dev;
INIT_WORK (&dev->kevent, usbnet_deferred_kevent);
....
first, sometimes tasklet initialisation is performed directly, not via
tasklet_init().
second, that 't->count == 0' eq 'tasklet_init()' is assumed to be sort of
a contract. so a simple kzalloc() works fine, and the patch breaks it.
a simple grep in drivers/net/
_next$ git grep tasklet_sched drivers/net/ | awk '{print $1}' | uniq | wc -l
60
_next$ git grep tasklet_init drivers/net/ | awk '{print $1}' | uniq | wc -l
52
and I don't know how many call-sites outside of drivers/net/ do something
like this.
-ss
^ permalink raw reply
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Santosh Shilimkar @ 2016-09-22 2:31 UTC (permalink / raw)
To: Sergey Senozhatsky, akpm
Cc: ssantosh, davem, giovanni.cabiddu, gregkh, herbert, isdn, mingo,
pebolle, peterz, salvatore.benedetto, tadeusz.struk, tglx,
mm-commits, linux-kernel, sfr, linux-next, sergey.senozhatsky
In-Reply-To: <20160922004204.GA701@swordfish>
On 9/21/2016 5:42 PM, Sergey Senozhatsky wrote:
> Hello,
>
> On (09/21/16 10:23), Santosh Shilimkar wrote:
[...]
>> Am assuming one of the driver in your test is using the DECLARE_TASKLET
>> to init the tasklet and killed by tasklet_kill() which leaves that
>> tasklet to be still scheduled by tasklet action.
>
> yes, vt does something like this (kbd_bh).
>
>> Can you please try below patch and see if you still see the issue ?
>> Attaching the same, just in case mailer eat the tabs.
>
> hm, didn't completely fix it. the vt is now happy, unlike usbnet.
Good that vt works now.
> and the usbnet case is rather alarming.
>
>
> looking at usbnet_probe()
>
> int
> usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
> {
> ....
> skb_queue_head_init (&dev->done);
> skb_queue_head_init(&dev->rxq_pause);
> dev->bh.func = usbnet_bh;
> dev->bh.data = (unsigned long) dev;
> INIT_WORK (&dev->kevent, usbnet_deferred_kevent);
> ....
>
>
> first, sometimes tasklet initialisation is performed directly, not via
> tasklet_init().
>
> second, that 't->count == 0' eq 'tasklet_init()' is assumed to be sort of
> a contract. so a simple kzalloc() works fine, and the patch breaks it.
>
Thats really bad that tasklet code is letting users call
tasklet_schedule() even without any tasklet_init or DECLARE_TASKLET.
> a simple grep in drivers/net/
>
> _next$ git grep tasklet_sched drivers/net/ | awk '{print $1}' | uniq | wc -l
> 60
>
> _next$ git grep tasklet_init drivers/net/ | awk '{print $1}' | uniq | wc -l
> 52
>
> and I don't know how many call-sites outside of drivers/net/ do something
> like this.
>
There are more :-(. Thanks for helping out Sergey.
# git grep tasklet_sched . | awk '{print $1}' | uniq | wc -l
269
# git grep tasklet_init . | awk '{print $1}' | uniq | wc -l
240
Andrew,
I requested you to include this patch but now am not sure anymore.
Looks like there are almost 30 more users which are directly
tweaking 'tasklet_struct' fields and calling other APIs. Hunting them
and fixing them probably would be an exercise and also those changes
needs those changed drivers to be tested.
What do you suggest ? At least this patch needs to be dropped as of now
till we can have complete coverage for those bad users.
Regards,
Santosh
^ permalink raw reply
* linux-next: Tree for Sep 22
From: Stephen Rothwell @ 2016-09-22 6:11 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160921:
The kbuild tree still had its build failure and warnings for PowerPC,
for which I applied a couple of patches
Non-merge commits (relative to Linus' tree): 11474
8534 files changed, 467826 insertions(+), 241038 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 242 trees (counting Linus' and 34 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 (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (ed7d9a1d7da6 powerpc/powernv/pci: Fix missed TCE invalidations that should fallback to OPAL)
Merging sparc/master (4620a06e4b3c shmem: Fix link error if huge pages support is disabled)
Merging net/master (b5036cd4ed31 ipmr, ip6mr: return lastuse relative to now)
Merging ipsec/master (63c43787d35e vti6: fix input path)
Merging netfilter/master (440f895aa97f drivers: net: phy: xgene: Fix 'remove' function)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (db68577966ab ALSA: ali5451: Fix out-of-bound position reporting)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (3be7988674ab Linux 4.8-rc7)
Merging usb-gadget-fixes/fixes (696118c016dd usb: dwc3: pci: fix build warning on !PM_SLEEP)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (4af2ff91ec3f Input: silead_gsl1680 - use "silead/" prefix for firmware loading)
Merging crypto-current/master (2db34e78f126 crypto: arm64/aes-ctr - fix NULL dereference in tail processing)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (3be7988674ab Linux 4.8-rc7)
Merging kbuild/for-next (fbe6e37dab97 kbuild: add arch specific post-link Makefile)
CONFLICT (content): Merge conflict in arch/Kconfig
Applying: ppc: there is no clear_pages to export
Applying: powerpc/64: whitelist unresolved modversions CRCs
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (270093671215 ARC: dw2 unwind: enable cfi pseudo ops in string lib)
Merging arm/for-next (cebdc42a4a9d Merge branch 'sa1111' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (89bb72f04b7b arm-soc: document merges)
Merging pinctrl/for-next (d6d8a9f007dc Merge branch 'devel' into for-next)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (0edfa8391664 arm64: migrate exception table users off module.h and onto extable.h)
CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
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 (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (f5e14739ed35 CREDITS: Update fingerprint for Geert Uytterhoeven)
Merging m68knommu/for-next (066dc6943021 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (26d2a062a49c Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (910a86435dd7 parisc: Update comment regarding implementation of copy_user_page_asm)
Merging powerpc/next (9d82fd2fae92 MAINTAINERS: Update cxl maintainers)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (dcc096c540d7 s390: migrate exception table users off module.h and onto extable.h)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9e8511ff7e3f Merge tag 'xtensa-for-next-20160731' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (56b508b018fd Merge branch 'for-next-next-4.9-20160909' into for-next-20160909)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (e1df6cab7969 Set previous session id correctly on SMB3 reconnect)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (5d3ddd84eaef udf: don't bother with full-page write optimisations in adinicb case)
Merging ext4/dev (e36767750532 blockgroup_lock.h: simplify definition of NR_BG_LOCKS)
Merging f2fs/dev (5905f9afa272 f2fs: handle error in recover_orphan_inode)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (8f40f60a4734 fuse: Add posix ACL support)
Merging gfs2/for-next (e0d735c1cc27 gfs2: fix to detect failure of register_shrinker)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (06826fca0a6c nfsd: randomize SETCLIENTID reply to help distinguish servers)
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (6a45b3628ce4 ovl: Fix info leak in ovl_lookup_temp())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (4d50b3be79ed Merge branch 'iomap-4.9-dax' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs-miklos/next (d55af8a321be vfs: add note about i_op->rename changes to porting)
Merging vfs/for-next (3baf32898e1c parisc: use %pD)
Merging pci/next (c4315f4b5ddc Merge branch 'pci/msi' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (fb9063c0a5e9 Merge branch 'for-4.9/upstream' into for-next)
Merging i2c/i2c/for-next (fd0f514448a9 Merge branch 'i2c/for-4.9' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (17e9217d41e1 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (625f866d6fef Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging net-next/master (c3d9b9f3de65 Merge branch 'bpf-hw-offload')
Merging ipsec-next/master (34a3d4b2d1f1 xfrm: fix header file comment reference to struct xfrm_replay_state_esn)
Merging netfilter-next/master (14e2dee0996f netfilter: nft_hash: fix hash overflow validation)
CONFLICT (content): Merge conflict in net/netfilter/nf_tables_netdev.c
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (80ba4f1d365a mwifiex: fix null pointer deference when adapter is null)
Merging bluetooth/master (af4168c5a925 Bluetooth: Set appearance only for LE capable controllers)
Merging mac80211-next/master (c13ed534b8db Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
Merging rdma/for-next (64278fe89b72 Merge branch 'hns-roce' into k.o/for-4.9)
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging nand/nand/next (8b7f577a1132 mtd: nand: Provide nand_cleanup() function to free NAND related resources)
Merging crypto/master (36e09e1f874b crypto: squash lines for simple wrapper functions)
Merging drm/drm-next (52f13a02b7d5 Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/imx-drm-core.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_audio.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_crtc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (3708d5e082c3 drm/i915: start adding dp mst audio)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (f15e6bb06e16 drm: Fix typo in encoder docs)
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 (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_gem_submit.c
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (aaaae4bcfeee Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (0da325afbdb8 ALSA: line6: snd-usb-line6 depends on CONFIG_SND_HWDEP)
Merging sound-asoc/for-next (3e3cd0fe0c46 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (51db013767c4 Input: serio - add hangup support)
Merging block/for-next (8e6026b19943 Merge branch 'for-4.9/block' into for-next)
Merging lightnvm/for-next (b67347d7dc28 lightnvm: propagate device_add() error code)
CONFLICT (content): Merge conflict in drivers/nvme/host/core.c
Merging device-mapper/for-next (83d17eb306b3 dm crypt: fix crash on exit)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (6d947b50d8b9 mmc: sdhci-acpi: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (30c8946566f3 raid5: handle register_shrinker failure)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (fcb63d9f5c3a mfd: tps65217: Fix nonstandard declaration)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (bb1e41ba324f power: reset: st: Remove obsolete platforms from dt doc)
Merging omap_dss2/for-next (ee65e18206f5 fb: adv7393: off by one in probe function)
Merging regulator/for-next (49503a990264 Merge remote-tracking branches 'regulator/topic/set-voltage', 'regulator/topic/tps65218' and 'regulator/topic/tps80031' into regulator-next)
Merging security/next (8a17ef9d8543 Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9b6a9ecc2d88 selinux: fix error return code in policydb_read())
Merging tpmdd/next (ebfd7532e985 tpm: add check for minimum buffer size in tpm_transmit())
Merging watchdog/master (3be7988674ab Linux 4.8-rc7)
Merging iommu/next (8b8d24825446 Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek' and 'arm/renesas' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (2e06285655b5 vfio: platform: mark symbols static where possible)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
Merging devicetree/for-next (f94277af03ea of/platform: Initialise dev->fwnode appropriately)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (b25589c028f8 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (6c0b8e2fee85 Merge branch 'smp/hotplug')
CONFLICT (content): Merge conflict in include/linux/jump_label.h
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
Applying: cpufreq: merge fix for type of cpufreq_offline changing
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (d6efab74f672 EDAC, amd64: Autoload module using x86_cpu_id)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (52e6bc6d43a4 bug: Avoid Kconfig warning for BUG_ON_DATA_CORRUPTION)
Merging kvm/linux-next (adad0d02a7d3 kvm: svm: fix unsigned compare less than zero comparison)
Merging kvm-arm/next (5d947a1447f9 KVM: ARM: cleanup kvm_timer_hyp_init)
Merging kvm-mips/next (397fc7ecb8e1 KVM: MIPS: Drop dubious EntryHi optimisation)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (aad9e5ba2433 KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init())
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (4f0fbdf22e73 xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc())
Merging percpu/for-next (a67823c1ed10 percpu-refcount: init ->confirm_switch member properly)
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (fa1bc2a09f5f platform/x86: toshiba_acpi: Fix typo in *_cooling_method_set function)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
Merging ipmi/for-next (37090ee7e76e ipmi/bt-bmc: add a dependency on ARCH_ASPEED)
Merging driver-core/driver-core-next (6ee6d1cb391c carl9170: fix debugfs crashes)
Merging tty/tty-next (d2ec3f77de8e pty: make ptmx file ops read-only after init)
Merging usb/usb-next (2fae9e5a7bab usb: misc: legousbtower: Fix NULL pointer deference)
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (92b8bd96fc1a staging: greybus: add maintainer for greybus platform drivers)
CONFLICT (content): Merge conflict in drivers/staging/octeon/ethernet-mdio.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging char-misc/char-misc-next (4b7b948b1fcd vme: fake: fix build for 64-bit dma_addr_t)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (ba021806f080 Merge branch 'topic/hsu' into next)
Merging cgroup/for-next (65a3de66d4ef Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (fb8be2382689 Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (445b12ae2df5 Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c2da060a2d88 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (0203a5ff55d7 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (aeaa4a79ff6a fs: Call d_automount with the filesystems creds)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (41d88559c31b clk: nxp: clk-lpc32xx: Unmap region obtained by of_iomap)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6bee835dd54e samples: move mic/mpssd example code from Documentation)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (473195f80f39 rtc: ac100: Add NULL checking for devm_kzalloc call)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (33b69bc53b00 Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (1b437b623704 ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
CONFLICT (content): Merge conflict in include/linux/relay.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Merging akpm/master (2f43d7d9f636 treewide: remove redundant #include <linux/kconfig.h>)
^ permalink raw reply
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Thomas Gleixner @ 2016-09-22 7:05 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: Sergey Senozhatsky, Andrew Morton, ssantosh, David Miller,
giovanni.cabiddu, gregkh, herbert, isdn, mingo, pebolle,
Peter Zijlstra, salvatore.benedetto, tadeusz.struk, mm-commits,
LKML, Stephen Rothwell, linux-next, sergey.senozhatsky,
Ingo Molnar
In-Reply-To: <36fffd08-17ec-0a73-17f3-378597e0c25a@oracle.com>
B1;2802;0cOn Wed, 21 Sep 2016, Santosh Shilimkar wrote:
> I requested you to include this patch but now am not sure anymore.
> Looks like there are almost 30 more users which are directly
> tweaking 'tasklet_struct' fields and calling other APIs. Hunting them
> and fixing them probably would be an exercise and also those changes
> needs those changed drivers to be tested.
>
> What do you suggest ? At least this patch needs to be dropped as of now
> till we can have complete coverage for those bad users.
Yes, it needs to be dropped. Stephen, can you please revert it from next?
How to fix this: The only way is to review all tasklet usage sites for
creative abuse and then fix them one by one. This needs to be done anyway
because those are ticking timebombs even without changes in the core
code. I looked at one of the offenders and it's broken today, it's just
protected by the extremly low probablity to hit the wreckage case.
What you can do to coerce the developers/maintainers of offending code into
looking at the mess they created/merged is to implement accessors for the
tasklet struct fields and replace the open coded fiddling with them.
Once that is done, rename the struct fields to something which is absurd
enough to type. But don't worry, you will find people doing that. I
catched a few brainwrecks who actually used:
irqdesc->core_internal_state__do_not_mess_with_it
in their code.
Now after having everything converted to accessors, you can add sanity
checks into the accessors and emit WARN_ONCE() when they are used in the
wrong context. That'll make them look and explain why they think that
fiddling in the internals is a good idea.
Thanks,
tglx
^ permalink raw reply
* next-20160922 build: 2 failures 4 warnings (next-20160922)
From: Build bot for Mark Brown @ 2016-09-22 10:08 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160922
Git describe: next-20160922
Commit: 6b9db9bb53 Add linux-next specific files for 20160922
Build Time: 86 min 8 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
6 warnings 0 mismatches : arm-multi_v5_defconfig
7 warnings 0 mismatches : arm-multi_v7_defconfig
4 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
3 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings Summary: 4
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
2 ../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 2 errors, 0 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 4 warnings, 0 section mismatches
Errors:
ERROR: "musb_root_disconnect" [drivers/usb/musb/sunxi.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
../drivers/dma/imx-sdma.c:673:13: warning: 'sdma_handle_channel_loop' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: build failure after merge of the kbuild tree
From: Michal Marek @ 2016-09-22 12:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Al Viro, Nicholas Piggin,
Michael Ellerman, linux-kbuild
In-Reply-To: <20160915160839.037798db@canb.auug.org.au>
On 2016-09-15 08:08, Stephen Rothwell wrote:
> Hi all,
>
> After merging the dax-misc tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> arch/powerpc/kernel/built-in.o: In function `__ksymtab_clear_pages':
> (___ksymtab+clear_pages+0x0): undefined reference to `clear_pages'
>
> Caused by commit
>
> 9445aa1a3062 ("ppc: move exports to definitions")
>
> I applied the following fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 15 Sep 2016 16:04:12 +1000
> Subject: [PATCH] ppc: there is no clear_pages to export
>
> Fixes: 9445aa1a3062 ("ppc: move exports to definitions")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Applied to kbuild.git#kbuild now.
Thanks,
Michal
^ permalink raw reply
* Re: + softirq-fix-tasklet_kill-and-its-users.patch added to -mm tree
From: Santosh Shilimkar @ 2016-09-22 16:08 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Sergey Senozhatsky, Andrew Morton, ssantosh, David Miller,
giovanni.cabiddu, gregkh, herbert, isdn, mingo, pebolle,
Peter Zijlstra, salvatore.benedetto, tadeusz.struk, mm-commits,
LKML, Stephen Rothwell, linux-next, sergey.senozhatsky,
Ingo Molnar
In-Reply-To: <alpine.DEB.2.20.1609220854090.5599@nanos>
On 9/22/2016 12:05 AM, Thomas Gleixner wrote:
> B1;2802;0cOn Wed, 21 Sep 2016, Santosh Shilimkar wrote:
>> I requested you to include this patch but now am not sure anymore.
>> Looks like there are almost 30 more users which are directly
>> tweaking 'tasklet_struct' fields and calling other APIs. Hunting them
>> and fixing them probably would be an exercise and also those changes
>> needs those changed drivers to be tested.
>>
>> What do you suggest ? At least this patch needs to be dropped as of now
>> till we can have complete coverage for those bad users.
>
> Yes, it needs to be dropped. Stephen, can you please revert it from next?
>
> How to fix this: The only way is to review all tasklet usage sites for
> creative abuse and then fix them one by one. This needs to be done anyway
> because those are ticking timebombs even without changes in the core
> code. I looked at one of the offenders and it's broken today, it's just
> protected by the extremly low probablity to hit the wreckage case.
>
> What you can do to coerce the developers/maintainers of offending code into
> looking at the mess they created/merged is to implement accessors for the
> tasklet struct fields and replace the open coded fiddling with them.
>
> Once that is done, rename the struct fields to something which is absurd
> enough to type. But don't worry, you will find people doing that. I
> catched a few brainwrecks who actually used:
>
> irqdesc->core_internal_state__do_not_mess_with_it
>
> in their code.
>
> Now after having everything converted to accessors, you can add sanity
> checks into the accessors and emit WARN_ONCE() when they are used in the
> wrong context. That'll make them look and explain why they think that
> fiddling in the internals is a good idea.
>
Thanks Thomas for suggestion and looking into it. Sounds a good plan
to me to tackle this mess. I will give a try and hopefully with help
of those maintainers come up with a series first to fix the
existing bad users. As you said, fixing core will be simple after that.
Regards,
Santosh
^ 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