* linux-next: manual merge of the md tree with the block tree
From: Stephen Rothwell @ 2017-04-10 2:08 UTC (permalink / raw)
To: Shaohua Li, Jens Axboe
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, NeilBrown
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid5.c
between commit:
48920ff2a5a9 ("block: remove the discard_zeroes_data flag")
from the block tree and commit:
97d53438081e ("Revert "md/raid5: limit request size according to implementation limits"")
from the md 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 drivers/md/raid5.c
index 2efdb0d67460,6036d5e41ddd..000000000000
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@@ -7253,17 -7361,13 +7358,9 @@@ static int raid5_run(struct mddev *mdde
stripe = (stripe | (stripe-1)) + 1;
mddev->queue->limits.discard_alignment = stripe;
mddev->queue->limits.discard_granularity = stripe;
- /*
- * unaligned part of discard request will be ignored, so can't
- * guarantee discard_zeroes_data
- */
- mddev->queue->limits.discard_zeroes_data = 0;
- /*
- * We use 16-bit counter of active stripes in bi_phys_segments
- * (minus one for over-loaded initialization)
- */
- blk_queue_max_hw_sectors(mddev->queue, 0xfffe * STRIPE_SECTORS);
- blk_queue_max_discard_sectors(mddev->queue,
- 0xfffe * STRIPE_SECTORS);
-
blk_queue_max_write_same_sectors(mddev->queue, 0);
+ blk_queue_max_write_zeroes_sectors(mddev->queue, 0);
rdev_for_each(rdev, mddev) {
disk_stack_limits(mddev->gendisk, rdev->bdev,
^ permalink raw reply
* linux-next: manual merge of the md tree with the block tree
From: Stephen Rothwell @ 2017-04-10 2:03 UTC (permalink / raw)
To: Shaohua Li, Jens Axboe
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, Ming Lei
Hi Shaohua,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/md.h
between commit:
3deff1a70d59 ("md: support REQ_OP_WRITE_ZEROES")
from the block tree and commits:
d8e29fbc3bed ("md: move two macros into md.h")
513e2faa0138 ("md: prepare for managing resync I/O pages in clean way")
from the md 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 drivers/md/md.h
index 1e76d64ce180,0418b29945e7..000000000000
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@@ -710,10 -719,58 +719,65 @@@ static inline void mddev_check_writesam
mddev->queue->limits.max_write_same_sectors = 0;
}
+static inline void mddev_check_write_zeroes(struct mddev *mddev, struct bio *bio)
+{
+ if (bio_op(bio) == REQ_OP_WRITE_ZEROES &&
+ !bdev_get_queue(bio->bi_bdev)->limits.max_write_zeroes_sectors)
+ mddev->queue->limits.max_write_zeroes_sectors = 0;
+}
++
+ /* Maximum size of each resync request */
+ #define RESYNC_BLOCK_SIZE (64*1024)
+ #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)
+
+ /* for managing resync I/O pages */
+ struct resync_pages {
+ unsigned idx; /* for get/put page from the pool */
+ void *raid_bio;
+ struct page *pages[RESYNC_PAGES];
+ };
+
+ static inline int resync_alloc_pages(struct resync_pages *rp,
+ gfp_t gfp_flags)
+ {
+ int i;
+
+ for (i = 0; i < RESYNC_PAGES; i++) {
+ rp->pages[i] = alloc_page(gfp_flags);
+ if (!rp->pages[i])
+ goto out_free;
+ }
+
+ return 0;
+
+ out_free:
+ while (--i >= 0)
+ put_page(rp->pages[i]);
+ return -ENOMEM;
+ }
+
+ static inline void resync_free_pages(struct resync_pages *rp)
+ {
+ int i;
+
+ for (i = 0; i < RESYNC_PAGES; i++)
+ put_page(rp->pages[i]);
+ }
+
+ static inline void resync_get_all_pages(struct resync_pages *rp)
+ {
+ int i;
+
+ for (i = 0; i < RESYNC_PAGES; i++)
+ get_page(rp->pages[i]);
+ }
+
+ static inline struct page *resync_fetch_page(struct resync_pages *rp,
+ unsigned idx)
+ {
+ if (WARN_ON_ONCE(idx >= RESYNC_PAGES))
+ return NULL;
+ return rp->pages[idx];
+ }
+
#endif /* _MD_MD_H */
^ permalink raw reply
* mmotm 2017-04-07-15-53 uploaded
From: akpm @ 2017-04-07 22:54 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-04-07-15-53 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.11-rc5:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* mm-fix-page_vma_mapped_walk-for-ksm-pages.patch
* userfaultfd-report-actual-registered-features-in-fdinfo.patch
* fix-print-order-in-show_free_areas.patch
* vmlinuxlds-add-missing-vmlinux_symbol-macros.patch
* ptrace-fix-ptrace_listen-race-corrupting-task-state.patch
* ptrace-fix-ptrace_listen-race-corrupting-task-state-checkpatch-fixes.patch
* mm-thp-fix-setting-of-defermadvise-thp-defrag-mode.patch
* dax-fix-radix-tree-insertion-race.patch
* mm-swap_cgroup-reschedule-when-neeed-in-swap_cgroup_swapoff.patch
* mailmap-update-yakir-yang-email-address.patch
* mm-move-pcp-and-lru-pcp-drainging-into-single-wq.patch
* mm-move-pcp-and-lru-pcp-drainging-into-single-wq-fix.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* dax-add-tracepoints-to-dax_iomap_pte_fault.patch
* dax-add-tracepoints-to-dax_pfn_mkwrite.patch
* dax-add-tracepoints-to-dax_load_hole.patch
* dax-add-tracepoints-to-dax_writeback_mapping_range.patch
* dax-add-tracepoints-to-dax_writeback_mapping_range-fix.patch
* dax-add-tracepoint-to-dax_writeback_one.patch
* dax-add-tracepoint-to-dax_insert_mapping.patch
* kbuild-consolidate-header-generation-from-asm-offset-information.patch
* fs-ocfs2-cluster-use-setup_timer.patch
* ocfs2-o2hb-revert-hb-threshold-to-keep-compatible.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called.patch
* ocfs2-old-mle-put-and-release-after-the-function-dlm_add_migration_mle-called-fix.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks.patch
* ocfs2-dlm-optimization-of-code-while-free-dead-node-locks-checkpatch-fixes.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* mm-fix-100%-cpu-kswapd-busyloop-on-unreclaimable-nodes.patch
* mm-fix-100%-cpu-kswapd-busyloop-on-unreclaimable-nodes-fix.patch
* mm-fix-100%-cpu-kswapd-busyloop-on-unreclaimable-nodes-fix-2.patch
* mm-fix-check-for-reclaimable-pages-in-pf_memalloc-reclaim-throttling.patch
* mm-remove-seemingly-spurious-reclaimability-check-from-laptop_mode-gating.patch
* mm-remove-unnecessary-reclaimability-check-from-numa-balancing-target.patch
* mm-dont-avoid-high-priority-reclaim-on-unreclaimable-nodes.patch
* mm-dont-avoid-high-priority-reclaim-on-memcg-limit-reclaim.patch
* mm-delete-nr_pages_scanned-and-pgdat_reclaimable.patch
* revert-mm-vmscan-account-for-skipped-pages-as-a-partial-scan.patch
* mm-remove-unnecessary-back-off-function-when-retrying-page-reclaim.patch
* writeback-use-setup_deferrable_timer.patch
* mm-delete-unnecessary-ttu_-flags.patch
* mm-dont-assume-anonymous-pages-have-swapbacked-flag.patch
* mm-move-madv_free-pages-into-lru_inactive_file-list.patch
* mm-move-madv_free-pages-into-lru_inactive_file-list-checkpatch-fixes.patch
* mm-reclaim-madv_free-pages.patch
* mm-reclaim-madv_free-pages-fix.patch
* mm-fix-lazyfree-bug-on-check-in-try_to_unmap_one.patch
* mm-fix-lazyfree-bug-on-check-in-try_to_unmap_one-fix.patch
* mm-enable-madv_free-for-swapless-system.patch
* proc-show-madv_free-pages-info-in-smaps.patch
* proc-show-madv_free-pages-info-in-smaps-fix.patch
* mm-memcontrol-provide-shmem-statistics.patch
* thp-reduce-indentation-level-in-change_huge_pmd.patch
* thp-fix-madv_dontneed-vs-numa-balancing-race.patch
* mm-drop-unused-pmdp_huge_get_and_clear_notify.patch
* thp-fix-madv_dontneed-vs-madv_free-race.patch
* thp-fix-madv_dontneed-vs-madv_free-race-fix.patch
* thp-fix-madv_dontneed-vs-clear-soft-dirty-race.patch
* mm-swap-fix-a-race-in-free_swap_and_cache.patch
* mm-use-is_migrate_highatomic-to-simplify-the-code.patch
* mm-use-is_migrate_highatomic-to-simplify-the-code-fix.patch
* mm-use-is_migrate_isolate_page-to-simplify-the-code.patch
* mm-vmstat-print-non-populated-zones-in-zoneinfo.patch
* mm-vmstat-suppress-pcp-stats-for-unpopulated-zones-in-zoneinfo.patch
* zram-reduce-load-operation-in-page_same_filled.patch
* lockdep-teach-lockdep-about-memalloc_noio_save.patch
* lockdep-allow-to-disable-reclaim-lockup-detection.patch
* xfs-abstract-pf_fstrans-to-pf_memalloc_nofs.patch
* mm-introduce-memalloc_nofs_saverestore-api.patch
* mm-introduce-memalloc_nofs_saverestore-api-fix.patch
* xfs-use-memalloc_nofs_saverestore-instead-of-memalloc_noio.patch
* jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context.patch
* jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context-fix.patch
* jbd2-make-the-whole-kjournald2-kthread-nofs-safe.patch
* jbd2-make-the-whole-kjournald2-kthread-nofs-safe-checkpatch-fixes.patch
* mm-tighten-up-the-fault-path-a-little.patch
* mm-remove-rodata_test_data-export-add-pr_fmt.patch
* mm-compaction-reorder-fields-in-struct-compact_control.patch
* mm-compaction-remove-redundant-watermark-check-in-compact_finished.patch
* mm-page_alloc-split-smallest-stolen-page-in-fallback.patch
* mm-page_alloc-split-smallest-stolen-page-in-fallback-fix.patch
* mm-page_alloc-count-movable-pages-when-stealing-from-pageblock.patch
* mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix.patch
* mm-compaction-change-migrate_async_suitable-to-suitable_migration_source.patch
* mm-compaction-add-migratetype-to-compact_control.patch
* mm-compaction-restrict-async-compaction-to-pageblocks-of-same-migratetype.patch
* mm-compaction-finish-whole-pageblock-to-reduce-fragmentation.patch
* mm-do-not-use-double-negation-for-testing-page-flags.patch
* mm-vmscan-fix-zone-balance-check-in-prepare_kswapd_sleep.patch
* mm-vmscan-only-clear-pgdat-congested-dirty-writeback-state-when-balanced.patch
* mm-vmscan-prevent-kswapd-sleeping-prematurely-due-to-mismatched-classzone_idx.patch
* mm-vmscan-prevent-kswapd-sleeping-prematurely-due-to-mismatched-classzone_idx-fix.patch
* mm-page_alloc-__gfp_nowarn-shouldnt-suppress-stall-warnings.patch
* mm-sparse-refine-usemap_size-a-little.patch
* mm-compaction-ignore-block-suitable-after-check-large-free-page.patch
* mm-vmscan-more-restrictive-condition-for-retry-in-do_try_to_free_pages.patch
* mm-vmscan-more-restrictive-condition-for-retry-in-do_try_to_free_pages-v5.patch
* mm-remove-unncessary-ret-in-page_referenced.patch
* mm-remove-swap_dirty-in-ttu.patch
* mm-remove-swap_mlock-check-for-swap_success-in-ttu.patch
* mm-make-the-try_to_munlock-void-function.patch
* mm-remove-swap_mlock-in-ttu.patch
* mm-remove-swap_again-in-ttu.patch
* mm-make-ttus-return-boolean.patch
* mm-make-rmap_walk-void-function.patch
* mm-make-rmap_one-boolean-function.patch
* mm-remove-swap_.patch
* mm-remove-swap_-fix.patch
* mm-swap-fix-comment-in-__read_swap_cache_async.patch
* mm-swap-improve-readability-via-make-spin_lock-unlock-balanced.patch
* mm-swap-avoid-lock-swap_avail_lock-when-held-cluster-lock.patch
* mm-enable-page-poisoning-early-at-boot.patch
* mm-enable-page-poisoning-early-at-boot-v2.patch
* mm-include-linux-migrateh-fixing-checkpatch-warning-regarding-function-definition.patch
* swap-add-warning-if-swap-slots-cache-failed-to-initialize.patch
* swap-add-warning-if-swap-slots-cache-failed-to-initialize-fix.patch
* mm-fix-spelling-error.patch
* userfaultfd-selftest-combine-all-cases-into-the-single-executable.patch
* zram-handle-multiple-pages-attached-bios-bvec.patch
* zram-partial-io-refactoring.patch
* zram-use-zram_slot_lock-instead-of-raw-bit_spin_lock-op.patch
* zram-remove-zram_meta-structure.patch
* zram-introduce-zram-data-accessor.patch
* mm-add-additional-consistency-check.patch
* oom-improve-oom-disable-handling.patch
* mm-mmap-replace-shm_huge_mask-with-map_huge_mask-inside-mmap_pgoff.patch
* mm-vmscan-fix-io-refault-regression-in-cache-workingset-transition.patch
* mm-memcontrol-clean-up-memoryevents-counting-function.patch
* mm-memcontrol-re-use-global-vm-event-enum.patch
* mm-memcontrol-re-use-node-vm-page-state-enum.patch
* mm-memcontrol-use-node-page-state-naming-scheme-for-memcg.patch
* mm-swap-remove-unused-function-prototype.patch
* mm-prevent-potential-recursive-reclaim-due-to-clearing-pf_memalloc.patch
* mm-introduce-memalloc_noreclaim_saverestore.patch
* treewide-convert-pf_memalloc-manipulations-to-new-helpers.patch
* mtd-nand-nandsim-convert-to-memalloc_noreclaim_.patch
* documentation-vm-add-hugetlbfs-reservation-overview.patch
* mm-swap-use-kvzalloc-to-allocate-some-swap-data-structure.patch
* mm-swap-sort-swap-entries-before-free.patch
* mm-page_alloc-return-0-in-case-this-node-has-no-page-within-the-zone.patch
* mm-vmscan-do-not-pass-reclaimed-slab-to-vmpressure.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* kasan-introduce-helper-functions-for-determining-bug-type.patch
* kasan-unify-report-headers.patch
* kasan-change-allocation-and-freeing-stack-traces-headers.patch
* kasan-simplify-address-description-logic.patch
* kasan-change-report-header.patch
* kasan-improve-slab-object-description.patch
* kasan-print-page-description-after-stacks.patch
* kasan-improve-double-free-report-format.patch
* kasan-separate-report-parts-by-empty-lines.patch
* proc-remove-cast-from-memory-allocation.patch
* proc-sysctl-fix-the-int-overflow-for-jiffies-conversion.patch
* drivers-virt-use-get_user_pages_unlocked.patch
* jiffiesh-declare-jiffies-and-jiffies_64-with-____cacheline_aligned_in_smp.patch
* module-verify-address-is-read-only.patch
* extable-verify-address-is-read-only.patch
* locking-hung_task-defer-showing-held-locks.patch
* vmci-fix-a-couple-integer-overflow-tests.patch
* revert-lib-test_sortc-make-it-explicitly-non-modular.patch
* lib-add-module-support-to-array-based-sort-tests.patch
* lib-add-module-support-to-linked-list-sorting-tests.patch
* firmware-makefile-force-recompilation-if-makefile-changes.patch
* checkpatch-remove-obsolete-config_experimental-checks.patch
* checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions.patch
* checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix.patch
* checkpatch-add-ability-to-find-bad-uses-of-vsprintf-%pfoo-extensions-fix-fix.patch
* checkpatch-improve-embedded_function_name-test.patch
* checkpatch-allow-space-leading-blank-lines-in-email-headers.patch
* reiserfs-use-designated-initializers.patch
* cpumask-make-nr_cpumask_bits-unsigned.patch
* crash-move-crashkernel-parsing-and-vmcore-related-code-under-config_crash_core.patch
* ia64-reuse-append_elf_note-and-final_note-functions.patch
* powerpc-fadump-remove-dependency-with-config_kexec.patch
* powerpc-fadump-reuse-crashkernel-parameter-for-fadump-memory-reservation.patch
* powerpc-fadump-update-documentation-about-crashkernel-parameter-reuse.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* uapi-fix-linux-sysctlh-userspace-compilation-errors.patch
* ns-allow-ns_entries-to-have-custom-symlink-content.patch
* pidns-expose-task-pid_ns_for_children-to-userspace.patch
* taskstats-add-e-u-stime-for-tgid-command.patch
* taskstats-add-e-u-stime-for-tgid-command-fix.patch
* taskstats-add-e-u-stime-for-tgid-command-fix-fix.patch
* kcov-simplify-interrupt-check.patch
* scripts-gdb-add-lx-fdtdump-command.patch
* kernel-reboot-add-devm_register_reboot_notifier.patch
* kernel-reboot-add-devm_register_reboot_notifier-fix.patch
* fault-inject-use-correct-check-for-interrupts.patch
* fault-inject-support-systematic-fault-injection.patch
* fault-inject-support-systematic-fault-injection-fix.patch
* fault-inject-automatically-detect-the-number-base-for-fail-nth-write-interface.patch
* fault-inject-parse-as-natural-1-based-value-for-fail-nth-write-interface.patch
* fault-inject-make-fail-nth-read-write-interface-symmetric.patch
* fault-inject-simplify-access-check-for-fail-nth.patch
* fault-inject-add-proc-pid-fail-nth.patch
* zlib-inflate-fix-potential-buffer-overflow.patch
* initramfs-provide-a-way-to-ignore-image-provided-by-bootloader.patch
* initramfs-use-vfs_stat-lstat-directly.patch
* ipc-shm-some-shmat-cleanups.patch
* sysvipc-cacheline-align-kern_ipc_perm.patch
linux-next.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
* sparc64-ng4-memset-32-bits-overflow.patch
* mm-zeroing-hash-tables-in-allocator.patch
* mm-updated-callers-to-use-hash_zero-flag.patch
* mm-adaptive-hash-table-scaling.patch
* mm-introduce-kvalloc-helpers.patch
* mm-introduce-kvalloc-helpers-fix.patch
* mm-support-__gfp_repeat-in-kvmalloc_node-for-32kb.patch
* rhashtable-simplify-a-strange-allocation-pattern.patch
* ila-simplify-a-strange-allocation-pattern.patch
* xattr-zero-out-memory-copied-to-userspace-in-getxattr.patch
* treewide-use-kvalloc-rather-than-opencoded-variants.patch
* net-use-kvmalloc-with-__gfp_repeat-rather-than-open-coded-variant.patch
* md-use-kvmalloc-rather-than-opencoded-variant.patch
* bcache-use-kvmalloc.patch
* mm-vmalloc-use-__gfp_highmem-implicitly.patch
* scripts-spellingtxt-add-memory-pattern-and-fix-typos.patch
* scripts-spellingtxt-add-regsiter-register-spelling-mistake.patch
* scripts-spellingtxt-add-intialised-pattern-and-fix-typo-instances.patch
* treewide-correct-diffrent-and-banlance-typos.patch
* treewide-move-set_memory_-functions-away-from-cacheflushh.patch
* arm-use-set_memoryh-header.patch
* arm64-use-set_memoryh-header.patch
* s390-use-set_memoryh-header.patch
* x86-use-set_memoryh-header.patch
* agp-use-set_memoryh-header.patch
* drm-use-set_memoryh-header.patch
* drm-use-set_memoryh-header-fix.patch
* intel_th-use-set_memoryh-header.patch
* watchdog-hpwdt-use-set_memoryh-header.patch
* bpf-use-set_memoryh-header.patch
* module-use-set_memoryh-header.patch
* pm-hibernate-use-set_memoryh-header.patch
* alsa-use-set_memoryh-header.patch
* misc-sram-use-set_memoryh-header.patch
* video-vermilion-use-set_memoryh-header.patch
* drivers-staging-media-atomisp-pci-atomisp2-use-set_memoryh.patch
* treewide-decouple-cacheflushh-and-set_memoryh.patch
* kref-remove-warn_on-for-null-release-functions.patch
* megasas-remove-expensive-inline-from-megasas_return_cmd.patch
* remove-expensive-warn_on-in-pagefault_disabled_dec.patch
* fs-remove-set-but-not-checked-aop_flag_uninterruptible-flag.patch
* docs-vm-transhuge-fix-few-trivial-typos.patch
* docs-vm-transhuge-fix-few-trivial-typos-fix.patch
* format-security-move-static-strings-to-const.patch
* mm-memory-hotplug-add-memory-type-parameter-to-arch_add-remove_memory.patch
* mm-put_page-move-zone_device-page-reference-decrement-v2.patch
* mm-unaddressable-memory-new-type-of-zone_device-for-unaddressable-memory.patch
* mm-zone_device-x86-add-support-for-un-addressable-device-memory.patch
* mm-migrate-new-migrate-mode-migrate_sync_no_copy.patch
* mm-migrate-new-memory-migration-helper-for-use-with-device-memory-v4.patch
* mm-migrate-migrate_vma-unmap-page-from-vma-while-collecting-pages.patch
* mm-hmm-heterogeneous-memory-management-hmm-for-short.patch
* mm-hmm-mirror-mirror-process-address-space-on-device-with-hmm-helpers.patch
* mm-hmm-mirror-helper-to-snapshot-cpu-page-table-v2.patch
* mm-hmm-mirror-device-page-fault-handler.patch
* mm-migrate-support-un-addressable-zone_device-page-in-migration.patch
* mm-migrate-allow-migrate_vma-to-alloc-new-page-on-empty-entry.patch
* mm-hmm-devmem-device-memory-hotplug-using-zone_device.patch
* mm-hmm-devmem-device-memory-hotplug-using-zone_device-fix.patch
* mm-hmm-devmem-dummy-hmm-device-for-zone_device-memory-v2.patch
* hmm-heterogeneous-memory-management-documentation.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
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* 64993 linux-next
From: muirs @ 2017-04-07 19:52 UTC (permalink / raw)
To: linux-next
[-- Attachment #1: 9693372287544.zip --]
[-- Type: application/zip, Size: 25 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
From: Bart Van Assche @ 2017-04-07 19:50 UTC (permalink / raw)
To: sfr@canb.auug.org.au, logang@deltatee.com, greg@kroah.com,
martin.petersen@oracle.com, arnd@arndb.de
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
ooo@electrozaur.com, openosd@gmail.com,
linux-next@vger.kernel.org
In-Reply-To: <ba19c6cf-a762-f7f7-6e27-ef64e3e578c1@deltatee.com>
On Fri, 2017-04-07 at 13:29 -0600, Logan Gunthorpe wrote:
> On 07/04/17 09:49 AM, Bart Van Assche wrote:
> > Sorry that I had not yet noticed Logan's patch series. Should my two
> > patches that conflict with Logan's patch series be dropped and reworked
> > after Logan's patches are upstream?
>
> Yeah, Greg took my patchset around a few maintainers relatively quickly.
> This is the second conflict, so sorry about that. Looks like the easiest
> thing would be to just base your change off of mine. It doesn't look too
> difficult. If you can do it before my patch hits upstream, I'd
> appreciate some testing and/or review as no one from the scsi side
> responded and that particular patch was a bit more involved than I would
> have liked.
Boaz, had you noticed Logan's osd patch? If not, can you have a look?
Thanks,
Bart.
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
From: Logan Gunthorpe @ 2017-04-07 19:29 UTC (permalink / raw)
To: Bart Van Assche, Stephen Rothwell, Martin K. Petersen, Greg KH,
Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
linux-scsi@vger.kernel.org
In-Reply-To: <47b500d6-0700-812f-dda3-44a14014b66e@sandisk.com>
Hi Bart,
On 07/04/17 09:49 AM, Bart Van Assche wrote:
> Sorry that I had not yet noticed Logan's patch series. Should my two
> patches that conflict with Logan's patch series be dropped and reworked
> after Logan's patches are upstream?
Yeah, Greg took my patchset around a few maintainers relatively quickly.
This is the second conflict, so sorry about that. Looks like the easiest
thing would be to just base your change off of mine. It doesn't look too
difficult. If you can do it before my patch hits upstream, I'd
appreciate some testing and/or review as no one from the scsi side
responded and that particular patch was a bit more involved than I would
have liked.
Thanks,
Logan
^ permalink raw reply
* Re: linux-next: Tree for Apr 7 (btrfs)
From: David Sterba @ 2017-04-07 16:05 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, Linux-Next Mailing List,
Linux Kernel Mailing List, linux-btrfs
In-Reply-To: <b8b42950-e775-398d-1364-8bb7c117aa12@infradead.org>
On Fri, Apr 07, 2017 at 08:10:48AM -0700, Randy Dunlap wrote:
> On 04/07/17 08:08, Randy Dunlap wrote:
> > On 04/07/17 01:27, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Changes since 20170406:
> >>
> >
> > on i386:
> >
> > ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
> >
> > Reported-by: Randy Dunlap <rdunlap@infradead.org>
> >
>
> or when built-in:
>
> fs/built-in.o: In function `scrub_bio_end_io_worker':
> scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
> fs/built-in.o: In function `scrub_raid56_parity':
> scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
> scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'
Sorry, I can't reproduce it here, I've also tried my other for-next
snapshot branches, same. We have some recent patches that could trigger
the __udivdi3 build check,
"Btrfs: update scrub_parity to use u64 stripe_len" (7d0ef8b4dbbd22)
manual check or with help of coccinell didn't show me any instances of
64bit division with / .
^ permalink raw reply
* Re: linux-next: manual merge of the scsi-mkp tree with the char-misc tree
From: Bart Van Assche @ 2017-04-07 15:49 UTC (permalink / raw)
To: Stephen Rothwell, Martin K. Petersen, Greg KH, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Bart Van Assche, Logan Gunthorpe, linux-scsi@vger.kernel.org
In-Reply-To: <20170407153351.0ecafd59@canb.auug.org.au>
On 04/06/2017 10:33 PM, Stephen Rothwell wrote:
> Hi Martin,
>
> Today's linux-next merge of the scsi-mkp tree got a conflict in:
>
> drivers/scsi/osd/osd_uld.c
>
> between commit:
>
> ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function")
>
> from the char-misc tree and commit:
>
> c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value")
>
> from the scsi-mkp tree.
>
> I am not sure how to resolve this, so I have just effectively recerted
> the latter commit fo today. Better suggestions welcome.
>
> I fixed it up 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.
(+linux-scsi)
Hello Martin,
Sorry that I had not yet noticed Logan's patch series. Should my two
patches that conflict with Logan's patch series be dropped and reworked
after Logan's patches are upstream?
Thanks,
Bart.
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Cong Wang @ 2017-04-07 15:46 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux-Next Mailing List,
Linux Kernel Mailing List, Jiri Kosina
In-Reply-To: <20170407101202.30ec5a4e@canb.auug.org.au>
On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> diff --cc net/sched/sch_generic.c
> index 1a2f9e964330,3e64d23e098c..000000000000
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
> }
> }
> #ifdef CONFIG_NET_SCHED
> - if (dev->qdisc)
> + if (dev->qdisc != &noop_qdisc)
> - qdisc_hash_add(dev->qdisc);
> + qdisc_hash_add(dev->qdisc, false);
> #endif
> }
Looks good to me.
Thanks.
^ permalink raw reply
* Re: linux-next: Tree for Apr 7 (btrfs)
From: Randy Dunlap @ 2017-04-07 15:10 UTC (permalink / raw)
To: Stephen Rothwell, Linux-Next Mailing List
Cc: Linux Kernel Mailing List, linux-btrfs
In-Reply-To: <3f143e53-652b-8690-d71c-dae42ab14a09@infradead.org>
On 04/07/17 08:08, Randy Dunlap wrote:
> On 04/07/17 01:27, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20170406:
>>
>
> on i386:
>
> ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
>
or when built-in:
fs/built-in.o: In function `scrub_bio_end_io_worker':
scrub.c:(.text+0x3d1908): undefined reference to `__udivdi3'
fs/built-in.o: In function `scrub_raid56_parity':
scrub.c:(.text+0x3d23cc): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3342): undefined reference to `__udivdi3'
scrub.c:(.text+0x3d3755): undefined reference to `__udivdi3'
--
~Randy
^ permalink raw reply
* Re: linux-next: Tree for Apr 7 (btrfs)
From: Randy Dunlap @ 2017-04-07 15:08 UTC (permalink / raw)
To: Stephen Rothwell, Linux-Next Mailing List
Cc: Linux Kernel Mailing List, linux-btrfs
In-Reply-To: <20170407182732.455c5c90@canb.auug.org.au>
On 04/07/17 01:27, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20170406:
>
on i386:
ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined!
Reported-by: Randy Dunlap <rdunlap@infradead.org>
--
~Randy
^ permalink raw reply
* next-20170407 build: 1 failures 3 warnings (next-20170407)
From: Build bot for Mark Brown @ 2017-04-07 12:06 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170407
Git describe: next-20170407
Commit: 5efce14289 Add linux-next specific files for 20170407
Build Time: 114 min 57 sec
Passed: 9 / 10 ( 90.00 %)
Failed: 1 / 10 ( 10.00 %)
Errors: 1
Warnings: 3
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__aeabi_uldivmod" [fs/btrfs/btrfs.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-multi_v5_defconfig
1 warnings 0 mismatches : arm-multi_v7_defconfig
1 warnings 0 mismatches : x86_64-defconfig
2 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__aeabi_uldivmod" [fs/btrfs/btrfs.ko] undefined!
Warnings Summary: 3
6 ../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
2 ../drivers/scsi/osd/osd_uld.c:457:2: warning: ignoring return value of 'scsi_device_get', declared with attribute warn_unused_result [-Wunused-result]
1 ../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
../drivers/scsi/osd/osd_uld.c:457:2: warning: ignoring return value of 'scsi_device_get', declared with attribute warn_unused_result [-Wunused-result]
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 2 warnings, 0 section mismatches
Errors:
ERROR: "__aeabi_uldivmod" [fs/btrfs/btrfs.ko] undefined!
Warnings:
../drivers/scsi/osd/osd_uld.c:457:2: warning: ignoring return value of 'scsi_device_get', declared with attribute warn_unused_result [-Wunused-result]
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../include/linux/kernel.h:755:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
arm-multi_v4t_defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the arm64 tree
From: Stephen Rothwell @ 2017-04-07 9:25 UTC (permalink / raw)
To: Catalin Marinas
Cc: Andrew Morton, Linux-Next Mailing List, Linux Kernel Mailing List,
AKASHI Takahiro, Laura Abbott
In-Reply-To: <20170407084835.GA18291@e104818-lin.cambridge.arm.com>
Hi Catalin,
On Fri, 7 Apr 2017 09:48:35 +0100 Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> Thanks for fixing this up. Not ideal, indeed, but I can push a clean-up
> patch after -rc1 to move set_memory_valid() to an arm64-specific
> set_memory.h (which would include asm-generic/set_memory.h). Given that
> my for-next branch is based on 4.11-rc3, I can't do this now without
> risking breaking other things.
Actually, I suspect that the patch in Andrew's series will be updated
to do that. This part of Andrew's patch series is applied on top of
all the other linux-next trees and is sent to Linus fairly late in the
merge window.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: manual merge of the akpm tree with the arm64 tree
From: Catalin Marinas @ 2017-04-07 8:48 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Linux-Next Mailing List, Linux Kernel Mailing List,
AKASHI Takahiro, Laura Abbott
In-Reply-To: <20170407174120.0b0baadf@canb.auug.org.au>
Hi Stephen,
On Fri, Apr 07, 2017 at 05:41:20PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/arm64/include/asm/cacheflush.h
>
> between commit:
>
> 9b0aa14e3155 ("arm64: mm: add set_memory_valid()")
>
> from the arm64 tree and patch:
>
> "treewide: move set_memory_* functions away from cacheflush.h"
>
> from the akpm tree.
>
> I fixed it up (see below - not ideal ...) and can carry the fix as
> necessary.
Thanks for fixing this up. Not ideal, indeed, but I can push a clean-up
patch after -rc1 to move set_memory_valid() to an arm64-specific
set_memory.h (which would include asm-generic/set_memory.h). Given that
my for-next branch is based on 4.11-rc3, I can't do this now without
risking breaking other things.
--
Catalin
^ permalink raw reply
* linux-next: Tree for Apr 7
From: Stephen Rothwell @ 2017-04-07 8:27 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Changes since 20170406:
The vfs tree gained a conflict against the s390 tree.
The net-next tree gained conflicts against the net and vfs trees
The kvm-ppc tree gained a conflict against the kvm tree and a build
failure for which I reverted 4 commits.
The kvms390 tree gained conflicts against the kvm and kvm-ppc trees.
The mfd tree still had its build failure for which I reverted a commit.
The usb-gadget tree gained conflicts against the usb tree.
The scsi-mkp tree gained a conflict against the char-misc tree.
The akpm tree gained a conflict against the arm64 tree and lost a patch
that turned up elsewhere.
Non-merge commits (relative to Linus' tree): 7906
7907 files changed, 923252 insertions(+), 161456 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
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 256 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (977674c06b18 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition)
Merging arc-current/for-curr (a71c9a1c779f Linux 4.11-rc5)
Merging arm-current/fixes (35512d971274 Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes)
Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (88b1bf7268f5 powerpc/mm: Add missing global TLB invalidate if cxl is active)
Merging sparc/master (86e1066fe2af sparc: remove unused wp_works_ok macro)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (16cf72bb0856 team: call netdev_change_features out of team lock)
Merging ipsec/master (89e357d83c06 af_key: Add lock to key dump)
Merging netfilter/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO check)
Merging ipvs/master (0b9aefea8600 tcp: minimize false-positives on TCP/GRO check)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
Merging mac80211/master (75514b665485 net: ethernet: ti: cpsw: wake tx queues on ndo_tx_timeout)
Merging sound-current/for-linus (2f726aec19a9 ALSA: hda - fix a problem for lineout on a Dell AIO machine)
Merging pci-current/for-linus (794a8604fe6e PCI: dwc: Fix dw_pcie_ops NULL pointer dereference)
Merging driver-core.current/driver-core-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging tty.current/tty-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5)
Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held)
Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
Merging staging.current/staging-linus (a6d361404d81 Merge tag 'iio-fixes-for-4.11d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (5659495a7a14 uapi: add missing install of userio.h)
Merging crypto-current/master (40c98cb57cdb crypto: caam - fix RNG deinstantiation error checking)
Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
Merging vfio-fixes/for-linus (65b1adebfe43 vfio: Rework group release notifier warning)
Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-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 (b2376407f989 mfd: cros-ec: Fix host command buffer size)
Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats)
Merging drm-intel-fixes/for-linux-next-fixes (cf082a4a264d Merge tag 'gvt-fixes-2017-04-01' of https://github.com/01org/gvt-linux into drm-intel-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (a71c9a1c779f Linux 4.11-rc5)
Merging kbuild/for-next (e68966e4f52e Merge branch 'uapi' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (0c4441f0b734 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (3071f13d75f6 perf: qcom: Add L3 cache PMU driver)
Merging arm-soc/for-next (60e1ed69406f arm-soc: document merges)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (fabfb0f29bb5 Merge branch 'at91-dt' into at91-next)
Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (abffca6fb621 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (9abf3e9b9cc8 Merge branch 'for_4.12/soc-pmdomain' into next)
Merging mvebu/for-next (55c66a310963 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (08e244fab835 Merge branch 'omap-for-v4.12/defconfig' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12)
Merging renesas/next (ce0f28606ca8 Merge branches 'arm64-dt-for-v4.12', 'dt-for-v4.12' and 'sysc-for-v4.12' into next)
Merging rockchip/for-next (84c1b7fec3d5 Merge branch 'v4.12-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (835ca0530460 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next)
Merging tegra/for-next (e4f6f5202ff8 Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (b824b9306823 arm64: print a fault message when attempting to write RO memory)
Merging clk/clk-next (e19400cf41f4 clk: qcom: msm8996: Fix the vfe1 powerdomain name)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
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 (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (120815c1c1b9 m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks)
Merging metag/for-next (d3ba2e922d4d metag/usercopy: Add 64-bit get_user support)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (d72c4a87e3df Merge branch 'linus' into mips-for-linux-next)
Merging nios2/for-next (d8f347ba35cf nios2: enable earlycon support)
Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (a9f6b6b8cd2f Merge tag 'usb-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging powerpc/next (11fe909d2362 powerpc/powernv: Add OPAL exports attributes to sysfs)
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (df26c2e87e6c s390/cpumf: simplify detection of guest samples)
CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild
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 (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (d0c32cdc395c Merge branch 'xtensa-dma-map-fix' into xtensa-for-next)
Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation)
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (2d1d18079404 Merge branch 'for-next-next-v4.12-20170406' into for-next-20170406)
Merging ceph/master (633ee407b9d1 libceph: force GFP_NOIO for socket allocations)
Merging cifs/for-next (ecfe1ae23bd7 Reset TreeId to zero on SMB2 TREE_CONNECT)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
Merging ext3/for_next (1acf736831f4 Merge branch 'fsnotify' into for_next)
Merging ext4/dev (d67d64f42314 ext4: fix two spelling nits)
Merging f2fs/dev (65f770f2ead7 f2fs: avoid IO split due to mixed WB_SYNC_ALL and WB_SYNC_NONE)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (9a87ad3da905 fuse: release: private_data cannot be NULL)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (a71c9a1c779f Linux 4.11-rc5)
Merging nfsd/nfsd-next (7920c2f404a3 lockd: fix lockd shutdown race)
Merging orangefs/for-next (e98bdb3059cb Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next)
Merging overlayfs/overlayfs-next (b1eaa950f7e9 ovl: lockdep annotate of nested stacked overlayfs inode lock)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (4c934c7dd60c xfs: report realtime space information via the rtbitmap)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (03b723221568 Merge branch 'work.uaccess' into for-next)
CONFLICT (content): Merge conflict in arch/s390/Kconfig
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (257ab443118b printk: Correctly handle preemption in console_unlock())
Merging pci/next (d7566c5014b8 Merge branch 'pci/host-mvebu' into next)
Merging pstore/for-next/pstore (eec50d76a6ee pstore: Drop needless inode lock during population)
Merging hid/for-next (5d497a0a562b Merge branch 'for-4.12/wacom' into for-next)
Merging i2c/i2c/for-next (aab817ebee6f Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
Merging hwmon-staging/hwmon-next (cc96f6f6d766 hwmon: Support for ASPEED PWM/Fan tach)
Merging jc_docs/docs-next (0e056eb5530d kernel-api.rst: fix a series of errors when parsing C files)
Merging v4l-dvb/master (2f65ec0567f7 [media] s5p-g2d: Fix error handling)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (6f9655b1b81f drivers/video: Convert remaining uses of pr_warning to pr_warn)
Merging pm/linux-next (bc3d898b0e5d Merge branch 'pm-cpuidle' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next)
Merging thermal-soc/next (c64d1b57043e Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (dc423b6be10c Merge branch 'ftgmac-rework-batch2-rx-path')
CONFLICT (content): Merge conflict in net/sched/sch_generic.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/ibm/ibmvnic.c
Merging ipsec-next/master (6c786bcb29dd xfrm: branchless addr4_match() on 64-bit)
Merging netfilter-next/master (592d42ac7fd3 Merge branch 'qed-IOV-cleanups')
Merging ipvs-next/master (e24113769960 ipvs: remove unused variable)
Merging wireless-drivers-next/master (1aed89640a89 mwifiex: apply radar flag)
Merging bluetooth/master (3eed8950c0f8 Bluetooth: L2CAP: Don't return -EAGAIN if out of credits)
Merging mac80211-next/master (a339e4c226c0 cfg80211: add intro to documentation)
Merging rdma/for-next (b58fc8049790 IB/hfi1: Eliminate synchronize_rcu() in mr delete)
Merging gfs2/for-next (d4d7fc12b642 gfs2: Re-enable fallocate for the rindex)
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (a779475bdf56 mtd: nand: allow drivers to request minimum alignment for passed buffer)
Merging spi-nor/next (0859c617ba1f mtd: spi-nor: Add support for N25Q256A11)
Merging crypto/master (ad1064cd612e crypto: xts - drop gf128mul dependency)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
Merging drm/drm-next (016877811568 Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (b268d9fe0f10 drm/i915: Use the right mapping_gfp_mask for final shmem allocation)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/vgpu.c
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c
Merging drm-misc/for-linux-next (09bffa6e5192 drm: omap: use common OF graph helpers)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (849f0512efc9 msm/drm: gpu: Dynamically locate the clocks from the device tree)
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/adreno/adreno_gpu.c
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (cda0c3ce3297 drm: mali-dp: remove unused variable)
Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo)
Merging kspp/for-next/kspp (517e1fbeb65f mm/usercopy: Drop extra is_vmalloc_or_module() check)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (f87e7f25893d ALSA: hda - Improved position reporting on SKL+)
Merging sound-asoc/for-next (eca7fa89876f Merge remote-tracking branches 'asoc/topic/wm8903', 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next)
Merging modules/modules-next (5bd933fe4481 module: set .init_array alignment to 8)
Merging input/next (deeb1e902fbc Input: use svg files instead of xfig in force feedback documentation)
CONFLICT (content): Merge conflict in Documentation/input/ff.rst
Merging block/for-next (2a874b7af2f3 Merge branch 'for-4.12/block' into for-next)
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (3591b6613c18 Merge branch 'dm-4.11' into dm-next)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (72cc952b8954 Merge branch 'fixes' into next)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (8fc04e6ea02d md: raid1: kill warning on powerpc_pseries)
CONFLICT (content): Merge conflict in drivers/md/raid5.h
Merging mfd/for-mfd-next (eb2a445f7d8f mfd: intel_soc_pmic: Fix a mess with compilation units)
Applying: Revert "mfd: intel_soc_pmic: Fix a mess with compilation units"
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (5782dcb20370 power: supply: bq24190_charger: Don't spam the logs on charger plug / unplug)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (533ffbd550e8 Merge remote-tracking branches 'regulator/topic/settle' and 'regulator/topic/twl6030' into regulator-next)
Merging security/next (622f6e326570 apparmor: Make path_max parameter readonly)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (f1c316a3ab9d KEYS: add SP800-56A KDF support for DH)
Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug)
Merging tpmdd/next (c93bebd62678 tpm: fix handling of the TPM 2.0 event logs)
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm_crb.c
Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail)
Merging iommu/next (41346dad4de0 Merge branches 'x86/vt-d', 'arm/core', 'core' and 'iommu/fixes' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_pages)
Merging trivial/for-next (4f6cce39105e Fix dead URLs to ftp.kernel.org)
Merging audit/next (36fe46d172e5 audit: normalize NETFILTER_PKT)
CONFLICT (content): Merge conflict in net/netfilter/xt_AUDIT.c
Merging devicetree/for-next (8654cb8d0371 dtc: update warning settings for new bus and node/property name checks)
Merging mailbox/mailbox-for-next (73874913d504 mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX)
Merging spi/for-next (a0d1f303c543 Merge remote-tracking branches 'spi/topic/test', 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (71c4271c9a58 Merge branch 'x86/vdso')
CONFLICT (content): Merge conflict in drivers/firmware/efi/efi-pstore.c
CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (621c4fe3cca5 EDAC, thunderx: Fix L2C MCI interrupt disable)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (696ced4fb1d7 tracing/kprobes: expose maxactive for kretprobe in kprobe_events)
Merging rcu/rcu/next (ac70aaf72670 doc: Emphasize that "toy" RCU requires recursive rwlock)
Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (715958f921c2 Merge tag 'kvm_mips_4.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips)
Merging kvm-arm/next (255905e4ff0f KVM: arm/arm64: vgic: Improve sync_hwstate performance)
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (63b7f2b544c3 KVM: PPC: Book3S PR: Do not fail emulation with mtspr/mfspr for unknown SPRs)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging kvms390/next (1721ee7d57c4 KVM: s390: introduce AIS capability)
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
Merging xen-tip/linux-next (9a0f13debac9 x86/xen: remove unused static function from smp_pv.c)
Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages())
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (0d90fca74e2c platform/x86: asus-nb-wmi: Add wapf4 quirk for the X302UA)
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 (cd3b0b05328e leds: cpcap: new driver)
Merging ipmi/for-next (31151bf07a52 ipmi: bt-bmc: Add ast2500 compatible string)
Merging driver-core/driver-core-next (96fb7e256a06 Merge 4.11-rc4 into driver-core-next)
Merging usb/usb-next (cb2e3d461b26 Merge 4.11-rc5 into usb-next)
Merging usb-gadget/next (f7649d3a6c8b usb: gadget: mv_u3d: fix error handling in mv_u3d_probe())
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/amd5536udc.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/Kconfig
Merging usb-serial/usb-next (e1fdd5b26201 USB: serial: drop obsolete open-race workaround)
Merging usb-chipidea-next/ci-for-usb-next (4f4555cfe704 usb: chipidea: udc: update gadget state after bus resume)
Merging phy-next/next (6629c9873e74 phy: rockchip-usb: Add vbus regulator support.)
Merging tty/tty-next (9ccd8d744592 Merge 4.11-rc5 into tty-next)
Merging char-misc/char-misc-next (57c0eabbd57e Merge 4.11-rc4 into char-misc-next)
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation)
Merging staging/staging-next (edf5e79422a9 Merge tag 'iio-for-4.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sir.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sir.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_sasem.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_sasem.c left in tree.
$ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c
Merging mux/for-next (5238347fea92 mux: adg792a: add mux controller driver for ADG792A/G)
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging slave-dma/next (cb220e16013c Merge branch 'topic/cppi' into next)
Merging cgroup/for-next (2b29fbe02b78 Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (13365ca5cc33 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (bf5ea6fba78b scsi: qla4xxx: drop redundant init_completion)
CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c
Merging target-updates/for-next (9f7ebfc64d2c tcm: make pi data verification configurable)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors)
Merging libata/for-next (0a7d2635b8cf Merge branch 'for-4.12' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (cc79d42a7d7e virtio_net: fix support for small rings)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (d85f6bb30759 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c
Merging pinctrl/for-next (b2740b4f018d Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (786b1f7c95d7 Merge branch 'pinctrl-next' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (cf4db7047d02 Merge branch 'for-4.12/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 (040757f738e1 ucount: Remove the atomicity from ucount->count)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (8044e92eb7c2 Merge branch 'for-4.12/upstream' into for-next)
CONFLICT (content): Merge conflict in include/linux/sched.h
CONFLICT (content): Merge conflict in include/linux/init_task.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
Merging coresight/next (c749b99b9ade coresight: Fix reference count for software sources)
Merging rtc/rtc-next (04767b9fc231 dt-bindings: rtc: document the rtc-sh bindings)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (22486cb6d929 acpi, nfit: remove unnecessary newline)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Applying: Revert "KVM: PPC: Add MMIO emulation for remaining floating-point instructions"
Applying: Revert "KVM: PPC: Emulation for more integer loads and stores"
Applying: Revert "KVM: PPC: Add MMIO emulation for stdx (store doubleword indexed)"
Applying: Revert "KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions"
Merging akpm-current/current (35ea10aa2207 sysv,ipc: cacheline align kern_ipc_perm)
Applying: linux-next-rejects
$ git checkout -b akpm remotes/origin/akpm/master
Applying: sparc64: NG4 memset 32 bits overflow
Applying: mm: zero hash tables in allocator
Applying: mm: update callers to use HASH_ZERO flag
Applying: mm: adaptive hash table scaling
Applying: mm: introduce kv[mz]alloc helpers
Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up
Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB
Applying: lib/rhashtable.c: simplify a strange allocation pattern
Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern
Applying: fs/xattr.c: zero out memory copied to userspace in getxattr
Applying: treewide: use kv[mz]alloc* rather than opencoded variants
Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant
Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant
Applying: drivers/md/bcache/super.c: use kvmalloc
Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly
Applying: scripts/spelling.txt: add "memory" pattern and fix typos
Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: treewide: spelling: correct diffrent[iate] and banlance typos
Applying: treewide: move set_memory_* functions away from cacheflush.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cacheflush.h
Applying: arm: use set_memory.h header
Applying: arm64: use set_memory.h header
Applying: s390: use set_memory.h header
Applying: x86: use set_memory.h header
Applying: agp: use set_memory.h header
Applying: drm: use set_memory.h header
Applying: drm-use-set_memoryh-header-fix
Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header
Applying: drivers/watchdog/hpwdt.c: use set_memory.h header
Applying: include/linux/filter.h: use set_memory.h header
Applying: kernel/module.c: use set_memory.h header
Applying: kernel/power/snapshot.c: use set_memory.h header
Applying: alsa: use set_memory.h header
Applying: drivers/misc/sram-exec.c: use set_memory.h header
Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header
Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h
Applying: treewide: decouple cacheflush.h and set_memory.h
Applying: kref: remove WARN_ON for NULL release functions
Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd
Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec
Applying: fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag
Merging akpm/master (e7bdf14d8df7 fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag)
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the arm64 tree
From: Stephen Rothwell @ 2017-04-07 7:41 UTC (permalink / raw)
To: Andrew Morton, Catalin Marinas
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
AKASHI Takahiro, Laura Abbott
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
arch/arm64/include/asm/cacheflush.h
between commit:
9b0aa14e3155 ("arm64: mm: add set_memory_valid()")
from the arm64 tree and patch:
"treewide: move set_memory_* functions away from cacheflush.h"
from the akpm tree.
I fixed it up (see below - not ideal ...) 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/arm64/include/asm/cacheflush.h
index 728f933cef8c,7db6962fc4b4..000000000000
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
@@@ -150,10 -151,4 +151,6 @@@ static inline void flush_cache_vunmap(u
{
}
- int set_memory_ro(unsigned long addr, int numpages);
- int set_memory_rw(unsigned long addr, int numpages);
- int set_memory_x(unsigned long addr, int numpages);
- int set_memory_nx(unsigned long addr, int numpages);
+int set_memory_valid(unsigned long addr, unsigned long size, int enable);
+
#endif
^ permalink raw reply
* linux-next: build failure after merge of the kvm-ppc tree
From: Stephen Rothwell @ 2017-04-07 6:37 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Bin Lu
Hi Paul,
After merging the kvm-ppc tree, today's linux-next build (powerpc
allyesconfig) failed like this:
arch/powerpc/kvm/fpu.o:(.opd+0x0): multiple definition of `fps_fres'
arch/powerpc/kvm/fpu.o:(.opd+0x0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fres':
(.text+0x0): multiple definition of `.fps_fres'
arch/powerpc/kvm/fpu.o:(.text+0x0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x18): multiple definition of `fps_frsqrte'
arch/powerpc/kvm/fpu.o:(.opd+0x18): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_frsqrte':
(.text+0x20): multiple definition of `.fps_frsqrte'
arch/powerpc/kvm/fpu.o:(.text+0x20): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x30): multiple definition of `fps_fsqrts'
arch/powerpc/kvm/fpu.o:(.opd+0x30): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsqrts':
(.text+0x40): multiple definition of `.fps_fsqrts'
arch/powerpc/kvm/fpu.o:(.text+0x40): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x48): multiple definition of `fps_fadds'
arch/powerpc/kvm/fpu.o:(.opd+0x48): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fadds':
(.text+0x60): multiple definition of `.fps_fadds'
arch/powerpc/kvm/fpu.o:(.text+0x60): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x60): multiple definition of `fps_fdivs'
arch/powerpc/kvm/fpu.o:(.opd+0x60): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fdivs':
(.text+0x84): multiple definition of `.fps_fdivs'
arch/powerpc/kvm/fpu.o:(.text+0x84): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x78): multiple definition of `fps_fmuls'
arch/powerpc/kvm/fpu.o:(.opd+0x78): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmuls':
(.text+0xa8): multiple definition of `.fps_fmuls'
arch/powerpc/kvm/fpu.o:(.text+0xa8): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x90): multiple definition of `fps_fsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x90): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsubs':
(.text+0xcc): multiple definition of `.fps_fsubs'
arch/powerpc/kvm/fpu.o:(.text+0xcc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xa8): multiple definition of `fps_fmadds'
arch/powerpc/kvm/fpu.o:(.opd+0xa8): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmadds':
(.text+0xf0): multiple definition of `.fps_fmadds'
arch/powerpc/kvm/fpu.o:(.text+0xf0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xc0): multiple definition of `fps_fmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0xc0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fmsubs':
(.text+0x118): multiple definition of `.fps_fmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x118): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xd8): multiple definition of `fps_fnmadds'
arch/powerpc/kvm/fpu.o:(.opd+0xd8): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fnmadds':
(.text+0x140): multiple definition of `.fps_fnmadds'
arch/powerpc/kvm/fpu.o:(.text+0x140): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0xf0): multiple definition of `fps_fnmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0xf0): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fnmsubs':
(.text+0x168): multiple definition of `.fps_fnmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x168): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x108): multiple definition of `fps_fsel'
arch/powerpc/kvm/fpu.o:(.opd+0x108): first defined here
arch/powerpc/kvm/fpu.o: In function `fps_fsel':
(.text+0x190): multiple definition of `.fps_fsel'
arch/powerpc/kvm/fpu.o:(.text+0x190): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x120): multiple definition of `fpd_fsqrts'
arch/powerpc/kvm/fpu.o:(.opd+0x120): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsqrts':
(.text+0x1f0): multiple definition of `.fpd_fsqrts'
arch/powerpc/kvm/fpu.o:(.text+0x1f0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x138): multiple definition of `fpd_frsqrtes'
arch/powerpc/kvm/fpu.o:(.opd+0x138): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsqrtes':
(.text+0x204): multiple definition of `.fpd_frsqrtes'
arch/powerpc/kvm/fpu.o:(.text+0x204): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x150): multiple definition of `fpd_fres'
arch/powerpc/kvm/fpu.o:(.opd+0x150): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fres':
(.text+0x218): multiple definition of `.fpd_fres'
arch/powerpc/kvm/fpu.o:(.text+0x218): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x168): multiple definition of `fpd_frsp'
arch/powerpc/kvm/fpu.o:(.opd+0x168): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsp':
(.text+0x22c): multiple definition of `.fpd_frsp'
arch/powerpc/kvm/fpu.o:(.text+0x22c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x180): multiple definition of `fpd_fctiw'
arch/powerpc/kvm/fpu.o:(.opd+0x180): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fctiw':
(.text+0x240): multiple definition of `.fpd_fctiw'
arch/powerpc/kvm/fpu.o:(.text+0x240): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x198): multiple definition of `fpd_fctiwz'
arch/powerpc/kvm/fpu.o:(.opd+0x198): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fctiwz':
(.text+0x254): multiple definition of `.fpd_fctiwz'
arch/powerpc/kvm/fpu.o:(.text+0x254): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1b0): multiple definition of `fpd_fsqrt'
arch/powerpc/kvm/fpu.o:(.opd+0x1b0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsqrt':
(.text+0x268): multiple definition of `.fpd_fsqrt'
arch/powerpc/kvm/fpu.o:(.text+0x268): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1c8): multiple definition of `fpd_fre'
arch/powerpc/kvm/fpu.o:(.opd+0x1c8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fre':
(.text+0x27c): multiple definition of `.fpd_fre'
arch/powerpc/kvm/fpu.o:(.text+0x27c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1e0): multiple definition of `fpd_frsqrte'
arch/powerpc/kvm/fpu.o:(.opd+0x1e0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_frsqrte':
(.text+0x290): multiple definition of `.fpd_frsqrte'
arch/powerpc/kvm/fpu.o:(.text+0x290): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x1f8): multiple definition of `fpd_fneg'
arch/powerpc/kvm/fpu.o:(.opd+0x1f8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fneg':
(.text+0x2a4): multiple definition of `.fpd_fneg'
arch/powerpc/kvm/fpu.o:(.text+0x2a4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x210): multiple definition of `fpd_fabs'
arch/powerpc/kvm/fpu.o:(.opd+0x210): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fabs':
(.text+0x2b8): multiple definition of `.fpd_fabs'
arch/powerpc/kvm/fpu.o:(.text+0x2b8): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x228): multiple definition of `fpd_fadds'
arch/powerpc/kvm/fpu.o:(.opd+0x228): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fadds':
(.text+0x2cc): multiple definition of `.fpd_fadds'
arch/powerpc/kvm/fpu.o:(.text+0x2cc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x240): multiple definition of `fpd_fsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x240): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsubs':
(.text+0x2e0): multiple definition of `.fpd_fsubs'
arch/powerpc/kvm/fpu.o:(.text+0x2e0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x258): multiple definition of `fpd_fdivs'
arch/powerpc/kvm/fpu.o:(.opd+0x258): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fdivs':
(.text+0x2f4): multiple definition of `.fpd_fdivs'
arch/powerpc/kvm/fpu.o:(.text+0x2f4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x270): multiple definition of `fpd_fmuls'
arch/powerpc/kvm/fpu.o:(.opd+0x270): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmuls':
(.text+0x308): multiple definition of `.fpd_fmuls'
arch/powerpc/kvm/fpu.o:(.text+0x308): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x288): multiple definition of `fpd_fcmpu'
arch/powerpc/kvm/fpu.o:(.opd+0x288): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcmpu':
(.text+0x31c): multiple definition of `.fpd_fcmpu'
arch/powerpc/kvm/fpu.o:(.text+0x31c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2a0): multiple definition of `fpd_fcpsgn'
arch/powerpc/kvm/fpu.o:(.opd+0x2a0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcpsgn':
(.text+0x34c): multiple definition of `.fpd_fcpsgn'
arch/powerpc/kvm/fpu.o:(.text+0x34c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2b8): multiple definition of `fpd_fdiv'
arch/powerpc/kvm/fpu.o:(.opd+0x2b8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fdiv':
(.text+0x360): multiple definition of `.fpd_fdiv'
arch/powerpc/kvm/fpu.o:(.text+0x360): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2d0): multiple definition of `fpd_fadd'
arch/powerpc/kvm/fpu.o:(.opd+0x2d0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fadd':
(.text+0x374): multiple definition of `.fpd_fadd'
arch/powerpc/kvm/fpu.o:(.text+0x374): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x2e8): multiple definition of `fpd_fmul'
arch/powerpc/kvm/fpu.o:(.opd+0x2e8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmul':
(.text+0x388): multiple definition of `.fpd_fmul'
arch/powerpc/kvm/fpu.o:(.text+0x388): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x300): multiple definition of `fpd_fcmpo'
arch/powerpc/kvm/fpu.o:(.opd+0x300): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fcmpo':
(.text+0x39c): multiple definition of `.fpd_fcmpo'
arch/powerpc/kvm/fpu.o:(.text+0x39c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x318): multiple definition of `fpd_fsub'
arch/powerpc/kvm/fpu.o:(.opd+0x318): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsub':
(.text+0x3cc): multiple definition of `.fpd_fsub'
arch/powerpc/kvm/fpu.o:(.text+0x3cc): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x330): multiple definition of `fpd_fmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x330): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmsubs':
(.text+0x3e0): multiple definition of `.fpd_fmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x3e0): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x348): multiple definition of `fpd_fmadds'
arch/powerpc/kvm/fpu.o:(.opd+0x348): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmadds':
(.text+0x3f4): multiple definition of `.fpd_fmadds'
arch/powerpc/kvm/fpu.o:(.text+0x3f4): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x360): multiple definition of `fpd_fnmsubs'
arch/powerpc/kvm/fpu.o:(.opd+0x360): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmsubs':
(.text+0x408): multiple definition of `.fpd_fnmsubs'
arch/powerpc/kvm/fpu.o:(.text+0x408): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x378): multiple definition of `fpd_fnmadds'
arch/powerpc/kvm/fpu.o:(.opd+0x378): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmadds':
(.text+0x41c): multiple definition of `.fpd_fnmadds'
arch/powerpc/kvm/fpu.o:(.text+0x41c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x390): multiple definition of `fpd_fsel'
arch/powerpc/kvm/fpu.o:(.opd+0x390): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fsel':
(.text+0x430): multiple definition of `.fpd_fsel'
arch/powerpc/kvm/fpu.o:(.text+0x430): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3a8): multiple definition of `fpd_fmsub'
arch/powerpc/kvm/fpu.o:(.opd+0x3a8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmsub':
(.text+0x444): multiple definition of `.fpd_fmsub'
arch/powerpc/kvm/fpu.o:(.text+0x444): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3c0): multiple definition of `fpd_fmadd'
arch/powerpc/kvm/fpu.o:(.opd+0x3c0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fmadd':
(.text+0x458): multiple definition of `.fpd_fmadd'
arch/powerpc/kvm/fpu.o:(.text+0x458): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3d8): multiple definition of `fpd_fnmsub'
arch/powerpc/kvm/fpu.o:(.opd+0x3d8): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmsub':
(.text+0x46c): multiple definition of `.fpd_fnmsub'
arch/powerpc/kvm/fpu.o:(.text+0x46c): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x3f0): multiple definition of `fpd_fnmadd'
arch/powerpc/kvm/fpu.o:(.opd+0x3f0): first defined here
arch/powerpc/kvm/fpu.o: In function `fpd_fnmadd':
(.text+0x480): multiple definition of `.fpd_fnmadd'
arch/powerpc/kvm/fpu.o:(.text+0x480): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x408): multiple definition of `kvm_cvt_fd'
arch/powerpc/kvm/fpu.o:(.opd+0x408): first defined here
arch/powerpc/kvm/fpu.o: In function `kvm_cvt_fd':
(.text+0x494): multiple definition of `.kvm_cvt_fd'
arch/powerpc/kvm/fpu.o:(.text+0x494): first defined here
arch/powerpc/kvm/fpu.o:(.opd+0x420): multiple definition of `kvm_cvt_df'
arch/powerpc/kvm/fpu.o:(.opd+0x420): first defined here
arch/powerpc/kvm/fpu.o: In function `kvm_cvt_df':
(.text+0x4a0): multiple definition of `.kvm_cvt_df'
arch/powerpc/kvm/fpu.o:(.text+0x4a0): first defined here
Caused by commit
f8513214ac9d ("KVM: PPC: Book3S: Add MMIO emulation for FP and VSX instructions")
I have reverted that commit (and the following three commits) for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the scsi-mkp tree with the char-misc tree
From: Stephen Rothwell @ 2017-04-07 5:33 UTC (permalink / raw)
To: Martin K. Petersen, Greg KH, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Bart Van Assche, Logan Gunthorpe
Hi Martin,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/osd/osd_uld.c
between commit:
ac1ddc584e98 ("scsi: utilize new cdev_device_add helper function")
from the char-misc tree and commit:
c02465fa13b6 ("scsi: osd_uld: Check scsi_device_get() return value")
from the scsi-mkp tree.
I am not sure how to resolve this, so I have just effectively recerted
the latter commit fo today. Better suggestions welcome.
I fixed it up and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the usb-gadget tree with the usb tree
From: Stephen Rothwell @ 2017-04-07 4:45 UTC (permalink / raw)
To: Felipe Balbi, Greg KH
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Romain Perier,
Gustavo A. R. Silva
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in:
drivers/usb/gadget/udc/amd5536udc.c
between commit:
b5a6a4e5baef ("usb: gadget: amd5536udc: Replace PCI pool old API")
from the usb tree and commit:
7bf80fcd797f ("usb: gadget: udc: avoid use of freed pointer")
from the usb-gadget 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 drivers/usb/gadget/udc/amd5536udc.c
index 270876b438ab,91d0f1a4dac1..000000000000
--- a/drivers/usb/gadget/udc/amd5536udc.c
+++ b/drivers/usb/gadget/udc/amd5536udc.c
@@@ -618,17 -579,12 +579,12 @@@ static void udc_free_dma_chain(struct u
DBG(dev, "free chain req = %p\n", req);
/* do not free first desc., will be done by free for request */
- td_last = req->td_data;
- td = phys_to_virt(td_last->next);
-
for (i = 1; i < req->chain_len; i++) {
- dma_pool_free(dev->data_requests, td,
- (dma_addr_t)td_last->next);
- td_last = td;
- td = phys_to_virt(td_last->next);
+ td = phys_to_virt(addr);
+ addr_next = (dma_addr_t)td->next;
- pci_pool_free(dev->data_requests, td, addr);
++ dma_pool_free(dev->data_requests, td, addr);
+ addr = addr_next;
}
-
- return ret_val;
}
/* Frees request packet, called by gadget driver */
^ permalink raw reply
* linux-next: manual merge of the usb-gadget tree with the usb tree
From: Stephen Rothwell @ 2017-04-07 4:41 UTC (permalink / raw)
To: Felipe Balbi, Greg KH
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, yuan linyu,
Raviteja Garimella
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got conflicts in:
drivers/usb/gadget/udc/Kconfig
between commit:
2c93e790e825 ("usb: add CONFIG_USB_PCI for system have both PCI HW and non-PCI based USB HW")
from the usb tree and commit:
5dbc49aebd0a ("usb: gadget: udc: amd5536: split core and PCI layer")
from the usb-gadget 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 drivers/usb/gadget/udc/Kconfig
index c6cc9d3270ac,707814da6000..000000000000
--- a/drivers/usb/gadget/udc/Kconfig
+++ b/drivers/usb/gadget/udc/Kconfig
@@@ -277,7 -292,8 +292,8 @@@ source "drivers/usb/gadget/udc/bdc/Kcon
config USB_AMD5536UDC
tristate "AMD5536 UDC"
- depends on PCI
+ depends on USB_PCI
+ select USB_SNP_CORE
help
The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
It is a USB Highspeed DMA capable USB device controller. Beside ep0
^ permalink raw reply
* linux-next: manual merge of the kvms390 tree with the kvm and kvm-ppc trees
From: Stephen Rothwell @ 2017-04-07 4:14 UTC (permalink / raw)
To: Christian Borntraeger, Cornelia Huck, Marcelo Tosatti,
Gleb Natapov, KVM, Paul Mackerras
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Yi Min Zhao,
Fei Li, Fan Zhang, James Hogan, Alexey Kardashevskiy
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
include/uapi/linux/kvm.h
between commits:
a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities")
578fd61d2d21 ("KVM: MIPS: Add 64BIT capability")
from the kvm tree, commit:
2e60acebefd8 ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")
from the kvm-ppc tree and commits
4e0b1ab72b8a ("KVM: s390: gs support for kvm guests")
1721ee7d57c4 ("KVM: s390: introduce AIS capability")
from the kvms390 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 include/uapi/linux/kvm.h
index 1c7418d8f404,acfee5f4b5b2..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -887,10 -883,9 +887,13 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_PPC_MMU_RADIX 134
#define KVM_CAP_PPC_MMU_HASH_V3 135
#define KVM_CAP_IMMEDIATE_EXIT 136
-#define KVM_CAP_S390_GS 137
-#define KVM_CAP_S390_AIS 138
+#define KVM_CAP_MIPS_VZ 137
+#define KVM_CAP_MIPS_TE 138
+#define KVM_CAP_MIPS_64BIT 139
+#define KVM_CAP_SPAPR_TCE_VFIO 140
++#define KVM_CAP_S390_GS 141
++#define KVM_CAP_S390_AIS 142
+ #define KVM_CAP_S390_CMMA_MIGRATION 216
#ifdef KVM_CAP_IRQ_ROUTING
^ permalink raw reply
* linux-next: manual merge of the kvm-ppc tree with the kvm tree
From: Stephen Rothwell @ 2017-04-07 4:06 UTC (permalink / raw)
To: Paul Mackerras, Marcelo Tosatti, Gleb Natapov, KVM
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Alexey Kardashevskiy, James Hogan
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities")
from the kvm tree and commit:
2e60acebefd8 ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")
from the kvm-ppc 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 include/uapi/linux/kvm.h
index 1e1a6c728a18,0f8a5e6528aa..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -887,9 -883,7 +887,10 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_PPC_MMU_RADIX 134
#define KVM_CAP_PPC_MMU_HASH_V3 135
#define KVM_CAP_IMMEDIATE_EXIT 136
-#define KVM_CAP_SPAPR_TCE_VFIO 137
+#define KVM_CAP_MIPS_VZ 137
+#define KVM_CAP_MIPS_TE 138
+#define KVM_CAP_MIPS_64BIT 139
++#define KVM_CAP_SPAPR_TCE_VFIO 140
#ifdef KVM_CAP_IRQ_ROUTING
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the vfs tree
From: Stephen Rothwell @ 2017-04-07 0:22 UTC (permalink / raw)
To: David Miller, Networking, Al Viro
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Nathan Fontenot
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/ibm/ibmvnic.c
between commit:
98998345a579 ("ibmvnic: fix kstrtoul, copy_from_user and copy_to_user misuse")
from the vfs tree and commit:
e704f0434ea6 ("ibmvnic: Remove debugfs support")
from the net-next tree.
I fixed it up (the latter removed all the code modified by the former,
so I just did that) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2017-04-07 0:12 UTC (permalink / raw)
To: David Miller, Networking
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Cong Wang,
Jiri Kosina
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sched/sch_generic.c
between commit:
92f9170621a1 ("net_sched: check noop_qdisc before qdisc_hash_add()")
from the net tree and commit:
49b499718fa1 ("net: sched: make default fifo qdiscs appear in the dump")
from the net-next 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 net/sched/sch_generic.c
index 1a2f9e964330,3e64d23e098c..000000000000
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
}
}
#ifdef CONFIG_NET_SCHED
- if (dev->qdisc)
+ if (dev->qdisc != &noop_qdisc)
- qdisc_hash_add(dev->qdisc);
+ qdisc_hash_add(dev->qdisc, false);
#endif
}
^ permalink raw reply
* linux-next: manual merge of the vfs tree with the s390 tree
From: Stephen Rothwell @ 2017-04-06 23:26 UTC (permalink / raw)
To: Al Viro, Martin Schwidefsky, Heiko Carstens
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
arch/s390/Kconfig
between commit:
59cea29a34eb ("s390: remove HAVE_ARCH_EARLY_PFN_TO_NID select statement")
from the s390 tree and commit:
37df4b8ce129 ("HAVE_ARCH_HARDENED_USERCOPY is unconditional now")
from the vfs 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/s390/Kconfig
index 249c2771be0e,b8b143432381..000000000000
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -124,7 -123,7 +124,6 @@@ config S39
select GENERIC_TIME_VSYSCALL
select HAVE_ALIGNED_STRUCT_PAGE if SLUB
select HAVE_ARCH_AUDITSYSCALL
- select HAVE_ARCH_HARDENED_USERCOPY
- select HAVE_ARCH_EARLY_PFN_TO_NID
select HAVE_ARCH_JUMP_LABEL
select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
select HAVE_ARCH_SECCOMP_FILTER
^ 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