* [PATCH 4/9] [v2] arm64: defconfig: enable EFI_CAPSULE_LOADER
From: Timur Tabi @ 2017-05-03 16:17 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
CONFIG_EFI_CAPSULE_LOADER allows the user to update the EFI firmware,
which is useful on ARM64 server platforms.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b2c579d..8099aeb 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -483,6 +483,7 @@ CONFIG_PHY_XGENE=y
CONFIG_PHY_TEGRA_XUSB=y
CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_EFI_CAPSULE_LOADER=y
CONFIG_ACPI=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* [PATCH 5/9] arm64: defconfig: enable support for PCIe hotplug
From: Timur Tabi @ 2017-05-03 16:17 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
Some ARM64 server systems support PCIe hotplug, so enable the options
for that.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8099aeb..f6b86a1 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -61,7 +61,10 @@ CONFIG_ARCH_XGENE=y
CONFIG_ARCH_ZX=y
CONFIG_ARCH_ZYNQMP=y
CONFIG_PCI=y
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCI_IOV=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
CONFIG_PCI_LAYERSCAPE=y
CONFIG_PCI_HISI=y
CONFIG_PCIE_QCOM=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* [PATCH 6/9] arm64: defconfig: enable APEI and GHES features
From: Timur Tabi @ 2017-05-03 16:17 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
ARM64 server platforms can support ACPI Platform Error Interface (APEI)
and Generic Hardware Error Source (GHES) features, so enable them.
Platforms which support the firmware-first RAS error reporting model
require APEI and GHES functionality for the OS to receive and report
error records provided by the platform.
PCIe AER functionality is required for PCIe AER errors to be properly
reported and recovered from.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f6b86a1..389f97f 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -488,6 +488,9 @@ CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_EFI_CAPSULE_LOADER=y
CONFIG_ACPI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* [PATCH 7/9] [v2] arm64: defconfig: enable EDAC options
From: Timur Tabi @ 2017-05-03 16:17 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
Enable EDAC (Error Detection and Correction) support for ARM64 server
systems that feature it, so that user space applications can be
notified of memory errors.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 389f97f..b8b1374 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -418,6 +418,7 @@ CONFIG_LEDS_SYSCON=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_EDAC=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX77686=y
CONFIG_RTC_DRV_RK808=m
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* [PATCH 8/9] arm64: defconfig: enable QCOM_L2_PMU and QCOM_L3_PMU
From: Timur Tabi @ 2017-05-03 16:17 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
Now that the drivers are available, enable support for L2 and L3
performance monitoring Qualcomm Datacenter Technologies Centriq SoCs.
These PMU drivers provide support for performance optimization.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b8b1374..424064b 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -485,6 +485,8 @@ CONFIG_PHY_ROCKCHIP_INNO_USB2=y
CONFIG_PHY_ROCKCHIP_EMMC=y
CONFIG_PHY_XGENE=y
CONFIG_PHY_TEGRA_XUSB=y
+CONFIG_QCOM_L2_PMU=y
+CONFIG_QCOM_L3_PMU=y
CONFIG_ARM_SCPI_PROTOCOL=y
CONFIG_RASPBERRYPI_FIRMWARE=y
CONFIG_EFI_CAPSULE_LOADER=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* [PATCH 9/9] arm64: defconfig: enable the Qualcomm Technologies EMAC Ethernet driver
From: Timur Tabi @ 2017-05-03 16:18 UTC (permalink / raw)
To: arm, linux-arm-kernel, linux-next, Gregory CLEMENT,
Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: timur
In-Reply-To: <1493828280-6620-1-git-send-email-timur@codeaurora.org>
The EMAC is present on Qualcomm Technologies' server and some mobile
chips, and is used as the primary Ethernet interface.
Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 424064b..9f574c3 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -191,6 +191,7 @@ CONFIG_IGBVF=y
CONFIG_MVNETA=y
CONFIG_MVPP2=y
CONFIG_SKY2=y
+CONFIG_QCOM_EMAC=m
CONFIG_RAVB=y
CONFIG_SMC91X=y
CONFIG_SMSC911X=y
--
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm
Technologies, Inc. Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
^ permalink raw reply related
* linux-next: incomplete commits in the ceph tree
From: Stephen Rothwell @ 2017-05-03 21:48 UTC (permalink / raw)
To: Sage Weil
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Ilya Dryomov
Hi Sage,
I noticed several new commits in the ceph tree today that have no
Singn-off-by from their committer (Ilya). :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm 2017-05-03-15-16 uploaded
From: akpm @ 2017-05-03 22:17 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2017-05-03-15-16 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:
(patches marked "*" will be included in linux-next)
origin.patch
i-need-old-gcc.patch
* dma-debug-make-locking-to-work-for-rt.patch
* scripts-spellingtxt-add-several-more-common-spelling-mistakes.patch
* blackfin-bf609-let-clk_disable-return-immediately-if-clk-is-null.patch
* fs-ocfs2-cluster-use-setup_timer.patch
* ocfs2-o2hb-revert-hb-threshold-to-keep-compatible.patch
* fs-ocfs2-cluster-use-offset_in_page-macro.patch
* slab-avoid-ipis-when-creating-kmem-caches.patch
* mm-fix-100%-cpu-kswapd-busyloop-on-unreclaimable-nodes.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-reclaim-madv_free-pages.patch
* mm-fix-lazyfree-bug-on-check-in-try_to_unmap_one.patch
* mm-enable-madv_free-for-swapless-system.patch
* proc-show-madv_free-pages-info-in-smaps.patch
* mm-memcontrol-provide-shmem-statistics.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_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
* 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
* xfs-use-memalloc_nofs_saverestore-instead-of-memalloc_noio.patch
* jbd2-mark-the-transaction-context-with-the-scope-gfp_nofs-context.patch
* jbd2-make-the-whole-kjournald2-kthread-nofs-safe.patch
* mm-tighten-up-the-fault-path-a-little.patch
* mm-remove-rodata_test_data-export-add-pr_fmt.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-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-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-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-include-linux-migrateh-fixing-checkpatch-warning-regarding-function-definition.patch
* swap-add-warning-if-swap-slots-cache-failed-to-initialize.patch
* mm-fix-spelling-error.patch
* userfaultfd-selftest-combine-all-cases-into-the-single-executable.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
* documentation-vm-add-hugetlbfs-reservation-overview.patch
* mm-madvise-clean-up-madv_soft_offline-and-madv_hwpoison.patch
* mm-madvise-move-up-the-behavior-parameter-validation.patch
* mm-softoffline-add-page-flag-description-in-error-paths.patch
* mm-page_alloc-remove-debug_guardpage_minorder-test-in-warn_alloc.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
* zram-use-zram_free_page-instead-of-open-coded.patch
* zram-reduce-load-operation-in-page_same_filled.patch
* fs-fix-data-invalidation-in-the-cleancache-during-direct-io.patch
* fs-block_dev-always-invalidate-cleancache-in-invalidate_bdev.patch
* mm-truncate-bail-out-early-from-invalidate_inode_pages2_range-if-mapping-is-empty.patch
* mm-truncate-avoid-pointless-cleancache_invalidate_inode-calls.patch
* mm-gup-fix-access_ok-argument-type.patch
* mm-swap-fix-swap-space-leak-in-error-path-of-swap_free_entries.patch
* mm-hwpoison-call-shake_page-unconditionally.patch
* mm-hwpoison-call-shake_page-after-try_to_unmap-for-mlocked-page.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
* mm-uncharge-poisoned-pages.patch
* mm-skip-hwpoisoned-pages-when-onlining-pages.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.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-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-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
* 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
* make-help-add-tools-help-target.patch
* locking-hung_task-defer-showing-held-locks.patch
* vmci-fix-a-couple-integer-overflow-tests.patch
* c2port-checking-for-null-instead-of-is_err.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
* checkpatch-avoid-suggesting-struct-definitions-should-be-const.patch
* checkpatch-improve-multistatement_macro_use_do_while-test.patch
* checkpatch-clarify-the-embedded_function_name-message.patch
* checkpatch-special-audit-for-revert-commit-line.patch
* checkpatch-improve-kalloc-with-multiplication-and-sizeof-test.patch
* checkpatch-add-typedefsfile.patch
* checkpatch-improve-the-embedded-function-name-test-for-patch-contexts.patch
* checkpatch-improve-the-suspect_code_indent-test.patch
* reiserfs-use-designated-initializers.patch
* fork-free-vmapped-stacks-in-cache-when-cpus-are-offline.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
* pidns-disable-pid-allocation-if-pid_ns_prepare_proc-is-failed-in-alloc_pid.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-simplify-access-check-for-fail-nth-fix.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-git-rejects.patch
* imx7-fix-kconfig-warning-and-build-errors.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-vmalloc-properly-track-vmalloc-users.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-swap-use-kvzalloc-to-allocate-some-swap-data-structure.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
* treewide-decouple-cacheflushh-and-set_memoryh-fix.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
* fs-f2fs-use-ktime_get_real_seconds-for-sit_info-times.patch
* trace-make-trace_hwlat-timestamp-y2038-safe.patch
* fs-cifs-replace-current_time-by-other-appropriate-apis.patch
* fs-ceph-current_time-with-ktime_get_real_ts.patch
* fs-ufs-use-ktime_get_real_ts64-for-birthtime.patch
* fs-ubifs-replace-current_time_sec-with-current_time.patch
* lustre-replace-current_time-macro.patch
* apparmorfs-replace-current_time-with-current_time.patch
* gfs2-replace-current_time-with-current_time.patch
* time-delete-current_time_sec-and-current_time.patch
* time-delete-current_fs_time-function.patch
* mm-huge_memory-use-zap_deposited_table-more.patch
* mm-huge_memory-deposit-a-pgtable-for-dax-pmd-faults-when-required.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
* treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix.patch
* mtd-nand-nandsim-convert-to-memalloc_noreclaim_.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_writeback_one-fix.patch
* dax-add-tracepoint-to-dax_insert_mapping.patch
* selftests-vm-add-a-test-for-virtual-address-range-mapping.patch
* lib-crc-ccitt-add-ccitt-false-crc16-variant.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.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
^ permalink raw reply
* linux-next: build warning after merge of the drm tree
From: Stephen Rothwell @ 2017-05-03 22:33 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, ARM
Cc: : Dave Airlie, Jeffy Chen, Sean Paul, Linux-Next Mailing List,
Linux Kernel Mailing List
Hi all,
Sorry that I did not notice this at the time ... This is now in Linus'
tree.
After merging the drm tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
arch/arm/configs/multi_v7_defconfig:596:warning: symbol value 'm' invalid for ROCKCHIP_ANALOGIX_DP
arch/arm/configs/multi_v7_defconfig:597:warning: symbol value 'm' invalid for ROCKCHIP_DW_HDMI
arch/arm/configs/multi_v7_defconfig:598:warning: symbol value 'm' invalid for ROCKCHIP_DW_MIPI_DSI
arch/arm/configs/multi_v7_defconfig:599:warning: symbol value 'm' invalid for ROCKCHIP_INNO_HDMI
Introduced by commit
8820b68bd378 ("drm/rockchip: Refactor the component match logic.")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the f2fs tree with the fscrypt tree
From: Stephen Rothwell @ 2017-05-03 23:40 UTC (permalink / raw)
To: Jaegeuk Kim, Theodore Ts'o
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Tomohiro Kusumi
Hi Jaegeuk,
Today's linux-next merge of the f2fs tree got a conflict in:
fs/f2fs/inline.c
between commit:
5fc36386d220 ("f2fs: check entire encrypted bigname when finding a dentry")
from the fscrypt tree and commit:
64c24ecb3cff ("f2fs: split make_dentry_ptr() into block and inline versions")
from the f2fs 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 fs/f2fs/inline.c
index fa729ff6b2f9,0ccdefe9fdba..000000000000
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@@ -533,8 -533,8 +533,8 @@@ int f2fs_add_inline_entry(struct inode
f2fs_wait_on_page_writeback(ipage, NODE, true);
- name_hash = f2fs_dentry_hash(new_name);
+ name_hash = f2fs_dentry_hash(new_name, NULL);
- make_dentry_ptr(NULL, &d, (void *)dentry_blk, 2);
+ make_dentry_ptr_inline(NULL, &d, dentry_blk);
f2fs_update_dentry(ino, mode, &d, new_name, name_hash, bit_pos);
set_page_dirty(ipage);
^ permalink raw reply
* Re: linux-next: build failure after merge of the drm-misc tree
From: Stephen Rothwell @ 2017-05-03 23:50 UTC (permalink / raw)
To: Daniel Vetter, Intel Graphics, DRI, Olof Johansson, Arnd Bergmann,
ARM
Cc: Jens Wiklander, Linux-Next Mailing List, Logan Gunthorpe,
Linux Kernel Mailing List, Sumit Semwal
In-Reply-To: <20170421121014.3ee14a83@canb.auug.org.au>
Hi all,
On Fri, 21 Apr 2017 12:10:14 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/tee/tee_shm.c:87:2: error: unknown field 'kmap_atomic' specified in initializer
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap_atomic = tee_shm_op_kmap_atomic,
> ^
> drivers/tee/tee_shm.c:87:17: note: (near initialization for 'tee_shm_dma_buf_ops.begin_cpu_access')
> drivers/tee/tee_shm.c:88:2: error: unknown field 'kmap' specified in initializer
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
> .kmap = tee_shm_op_kmap,
> ^
> drivers/tee/tee_shm.c:88:10: note: (near initialization for 'tee_shm_dma_buf_ops.end_cpu_access')
>
> Caused by commit
>
> f9b67f0014cb ("dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro")
>
> interacting with commit
>
> 967c9cca2cc5 ("tee: generic TEE subsystem")
>
> from the arm-soc tree.
>
> I applied the following merge fix patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 21 Apr 2017 12:06:32 +1000
> Subject: [PATCH] tee: merge fix for dma-ops field name changes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/tee/tee_shm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 0be1e3e93bee..4e14c9c9cb1c 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = {
> .map_dma_buf = tee_shm_op_map_dma_buf,
> .unmap_dma_buf = tee_shm_op_unmap_dma_buf,
> .release = tee_shm_op_release,
> - .kmap_atomic = tee_shm_op_kmap_atomic,
> - .kmap = tee_shm_op_kmap,
> + .map_atomic = tee_shm_op_kmap_atomic,
> + .map = tee_shm_op_kmap,
> .mmap = tee_shm_op_mmap,
> };
>
> --
> 2.11.0
This fixup is now needed when merging the arm-soc tree with Linus' tree.
--
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply
* next-20170503 build: 0 failures 1 warnings (next-20170503)
From: Build bot for Mark Brown @ 2017-05-04 0:46 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170503
Git describe: next-20170503
Commit: 5add46905b Add linux-next specific files for 20170503
Build Time: 301 min 26 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 1
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 1
2 ../drivers/of/unittest.c:2199:25: warning: 'last_sibling' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/of/unittest.c:2199:25: warning: 'last_sibling' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/of/unittest.c:2199:25: warning: 'last_sibling' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* linux-next: build failure after merge of the spi-nor tree
From: Stephen Rothwell @ 2017-05-04 0:51 UTC (permalink / raw)
To: Cyrille Pitchen
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Brian Norris
Hi Cyrille,
After merging the spi-nor tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from include/linux/printk.h:329:0,
from include/linux/kernel.h:13,
from include/linux/clk.h:16,
from drivers/mtd/spi-nor/stm32-quadspi.c:8:
drivers/mtd/spi-nor/stm32-quadspi.c: In function 'stm32_qspi_read':
drivers/mtd/spi-nor/stm32-quadspi.c:378:21: warning: format '%x' expects argument of type 'unsigned int', but argument 7 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_dbg(qspi->dev, "read(%#.2x): buf:%p from:%#.8x len:%#x\n",
^
include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
__dynamic_dev_dbg(&descriptor, dev, fmt, \
^
drivers/mtd/spi-nor/stm32-quadspi.c:378:2: note: in expansion of macro 'dev_dbg'
dev_dbg(qspi->dev, "read(%#.2x): buf:%p from:%#.8x len:%#x\n",
^
drivers/mtd/spi-nor/stm32-quadspi.c: In function 'stm32_qspi_write':
drivers/mtd/spi-nor/stm32-quadspi.c:405:15: warning: format '%x' expects argument of type 'unsigned int', but argument 7 has type 'size_t {aka long unsigned int}' [-Wformat=]
dev_dbg(dev, "write(%#.2x): buf:%p to:%#.8x len:%#x\n",
^
include/linux/dynamic_debug.h:134:39: note: in definition of macro 'dynamic_dev_dbg'
__dynamic_dev_dbg(&descriptor, dev, fmt, \
^
drivers/mtd/spi-nor/stm32-quadspi.c:405:2: note: in expansion of macro 'dev_dbg'
dev_dbg(dev, "write(%#.2x): buf:%p to:%#.8x len:%#x\n",
^
drivers/mtd/spi-nor/stm32-quadspi.c: In function 'stm32_qspi_flash_setup':
drivers/mtd/spi-nor/stm32-quadspi.c:543:27: error: 'SZ_1K' undeclared (first use in this function)
flash->fsize = FSIZE_VAL(SZ_1K);
^
drivers/mtd/spi-nor/stm32-quadspi.c:110:33: note: in definition of macro 'FSIZE_VAL'
#define FSIZE_VAL(size) (__fls(size) - 1)
^
drivers/mtd/spi-nor/stm32-quadspi.c:543:27: note: each undeclared identifier is reported only once for each function it appears in
flash->fsize = FSIZE_VAL(SZ_1K);
^
drivers/mtd/spi-nor/stm32-quadspi.c:110:33: note: in definition of macro 'FSIZE_VAL'
#define FSIZE_VAL(size) (__fls(size) - 1)
^
Exposed by commit
7a754f2016a0 ("mtd: spi-nor: stm32-quadspi: allow building with COMPILE_TEST")
I have used the spi-nor tree from next-20170503 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warning after merge of the drm tree
From: Stephen Rothwell @ 2017-05-04 1:42 UTC (permalink / raw)
To: Jeffy
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel@lists.infradea,
: Dave Airlie, Sean Paul, Linux-NextMailing List,
Linux Kernel Mailing List
In-Reply-To: <tencent_62AF37B85899E2EA593CCE3B@qq.com>
Hi Jeffy,
On Thu, 4 May 2017 09:18:12 +0800 "Jeffy" <jeffy.chen@rock-chips.com> wrote:
>
> it should be fixed by "Arnd Bergmann"<arnd@arndb.de>(thanks a lot by the way) in:
>
> 4a85aae multi_v7_defconfig: make Rockchip DRM drivers built-in
Thanks for the heads up, I will await the arm-soc merges.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: Tree for May 4
From: Stephen Rothwell @ 2017-05-04 4:33 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Please do not add any v4.13 destined material in your linux-next
included branches until after v4.12-rc1 has been released.
Changes since 20170503:
The f2fs tree gained a conflict against the fscrypt tree.
The spi-nor tree gained a build failure so I used the version from
next-20170503.
Non-merge commits (relative to Linus' tree): 5569
5838 files changed, 527380 insertions(+), 94813 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 258 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 (1684096b1ed8 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma)
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 (36b5a5152119 arc: axs10x: Fix ARC PGU default clock frequency)
Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y)
Merging sparc/master (8c64415cc1f5 sparc: Remove redundant tests in boot_flags_init().)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (f411af682218 Merge branch 'ibmvnic-Updated-reset-handler-andcode-fixes')
Merging ipsec/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging netfilter/master (9744a6fcefcb netfilter: nf_tables: check if same extensions are set when adding elements)
Merging ipvs/master (c8d6c6b496dc ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
Merging mac80211/master (a351e9b9fc24 Linux 4.11)
Merging sound-current/for-linus (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam))
Merging driver-core.current/driver-core-linus (39da7c509acf Linux 4.11-rc6)
Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7)
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 (39da7c509acf Linux 4.11-rc6)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (0337966d121e Merge branch 'next' into for-linus)
Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
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 (5a7ad1146caa Linux 4.11-rc8)
Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline)
Merging kbuild/for-next (11d5300b0fc9 Merge branch 'kbuild' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/crypto.h
CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild
CONFLICT (modify/delete): arch/avr32/include/uapi/asm/Kbuild deleted in HEAD and modified in kbuild/for-next. Version kbuild/for-next of arch/avr32/include/uapi/asm/Kbuild left in tree.
$ git rm -f arch/avr32/include/uapi/asm/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 (c92a90a5060a Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework)
Merging arm-soc/for-next (47ee9017f4d1 Merge branches 'next/arm64', 'next/drivers', 'next/dt' and 'next/dt64' into for-next)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32746g-eval.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
Applying: tee: merge fix for dma-ops field name changes
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 (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/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 (990df0480610 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (4495c08e8472 Linux 4.11-rc2)
Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5a0bbcf7ab0f 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 (c8906b237adf Merge branch 'fixes-for-v4.12' into next)
Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' 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 (226464bdf486 Merge branch 'fixes' 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 (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (2f9a0bec6597 arm64: Print DT machine model in setup_machine_fdt())
CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h
Merging clk/clk-next (0119dc6132d2 clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL)
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 (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
CONFLICT (content): Merge conflict in arch/metag/include/asm/uaccess.h
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (b153c82756e9 Merge branch '4.11-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
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 (4f7d029b9bf0 Linux 4.11-rc7)
Merging powerpc/next (700b7eadd562 powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it)
CONFLICT (content): Merge conflict in kernel/kprobes.c
Merging fsl/next (726bd223105c powerpc/8xx: Adding support of IRQ in MPC8xx GPIO)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (db55947dd2d0 s390/uprobes: fix compile for !KPROBES)
Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux)
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 (5b4236e17cc1 um: Fix to call read_initrd after init_bootmem)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (382b06261081 MAINTAINERS: fscrypt: update mailing list, patchwork, and git)
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 (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425)
Merging ceph/master (696f9ce47070 ceph: fix memory leak in __ceph_setxattr())
Merging cifs/for-next (3998e6b87d42 CIFS: fix oplock break deadlocks)
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 (07f7e3135e58 Merge branch 'fsnotify' into for_next)
Merging ext4/dev (1efd3f764621 ext4: replace BUG_ON with WARN_ONCE in ext4_end_bio())
Merging f2fs/dev (5b0ef73c9d19 f2fs: show available_nids in f2fs/status)
CONFLICT (content): Merge conflict in fs/f2fs/inline.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (c296cfe26bdd pNFS: Fix NULL dereference in pnfs_generic_alloc_ds_commits)
CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
Merging nfsd/nfsd-next (ed6473ddc704 NFSv4: Fix callback server shutdown)
Merging orangefs/for-next (907bfcd8d8a6 orangefs: handle zero size write in debugfs)
Merging overlayfs/overlayfs-next (4a99f3c83dc4 ovl: do not set overlay.opaque on non-dir create)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (32fe905c17f0 ubifs: Fix O_TMPFILE corner case in ubifs_link())
Merging xfs/for-next (e20c8a517f25 xfs: wait on new inodes during quotaoff dquot release)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (ef3296e0e82f Merge branch 'for-linus' into for-next)
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 (cf39bf58afda printk: fix double printing with earlycon)
Merging pci/next (3146c8f4de9b Merge branch 'pci/remove' into next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/pci.h
CONFLICT (content): Merge conflict in drivers/pci/msi.c
Merging pstore/for-next/pstore (3a7d2fd16c57 pstore: Solve lockdep warning by moving inode locks)
Merging hid/for-next (38c81b5434ac Merge branch 'for-4.11/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' 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 (6eaaea144dc5 hwmon: (pmbus) Add client driver for IR35221)
Merging jc_docs/docs-next (9bb0e9cb04c8 docs: Fix a couple typos)
Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_hdmi.c
Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next)
Merging fbdev/fbdev-for-next (5c9cfda13dc5 drivers/video/fbdev/omap/lcd_mipid.c: Use time comparison kernel macros)
Merging pm/linux-next (a061321a7e70 Merge branches 'acpi-pmic', 'powercap' and 'pm-cpuidle' into linux-next)
CONFLICT (content): Merge conflict in drivers/acpi/acpi_apd.c
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 (19fd1783c24e Merge branch 'work-linus' into work-next)
CONFLICT (content): Merge conflict in drivers/thermal/Makefile
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
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 (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.)
Merging netfilter-next/master (a01aa920b8e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (47d272f0f988 Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (2da711ac3f6d Bluetooth: Skip vendor diagnostic configuration for HCI User Channel)
Merging mac80211-next/master (e3bf4c61da80 sparc64: Fix BPF JIT wrt. branches and ldimm64 instructions.)
Merging rdma/for-next (24b43c99647b infiniband: avoid dereferencing uninitialized dst on error path)
Merging gfs2/for-next (d552a2b9b33e GFS2: Non-recursive delete)
Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1)
Merging l2-mtd/master (6a623e076944 mtd: nand: add ooblayout for old hamming layout)
Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program)
Merging spi-nor/next (cf534074d39b dt-bindings: Document the STM32 QSPI bindings)
$ git reset --hard HEAD^
Merging next-20170503 version of spi-nor
Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging drm/drm-next (8b03d1ed2c43 Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (88326ef05b26 drm/i915: Confirm the request is still active before adding it to the await)
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 (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2)
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 (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo)
Merging imx-drm/imx-drm/next (3d1df96ad468 drm/imx: merge imx-drm-core and ipuv3-crtc in one module)
Merging etnaviv/etnaviv/next (78ec187f64fa drm/etnaviv: submit support for out-fences)
Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
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 (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (20d5c84bef06 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next)
Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string)
Merging input/next (8a038b83e012 Input: ar1021_i2c - use BIT to check for a bit)
Merging block/for-next (4d1ee100af58 Merge branch 'for-4.12/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (c52ae1eba966 dm: introduce a new DM_MAPIO_KILL return value)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (a627f025eb05 mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (b506335e5d2b md/raid10: skip spare disk as 'first' disk)
Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos)
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (99484df028dd power: supply: bq27xxx: Add power_supply_battery_info support)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next)
Merging security/next (8979b02aaf1d tpm: Fix reference count to main device)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug)
Merging tpmdd/next (8979b02aaf1d tpm: Fix reference count to main device)
Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
Merging iommu/next (92504e055554 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure)
Merging devicetree/for-next (ee320b33b4a3 of: fix uninitialized variable warning for overlay test)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (282ec0ea65da Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (fbd781de3bac Merge branch 'x86/vdso')
Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
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 (f8d5549df25e EDAC, ghes: Do not enable it by default)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (8bbb767495af Merge branch 'for-next/ftrace/core' into trace/for-next)
Merging rcu/rcu/next (933dfbd7c437 rcu: Open-code the rcu_cblist_n_lazy_cbs() function)
Merging kvm/linux-next (bd17117bb2af Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (1edb632133ef ARM: KVM: Fix idmap stub entry when running Thumb-2 code)
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic.h
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic-v2.c
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (fb7dcf723dd2 Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/cpu_setup_power.S
Applying: powerpc: merge fix for powerpc_debugfs_root move.
Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8)
Merging xen-tip/linux-next (3dbd8204af48 xen: Move xen_have_vector_callback definition to enlighten.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 (6df97f85611c platform/x86: Make SILEAD_DMI depend on TOUCHSCREEN_SILEAD)
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support)
Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response)
Merging driver-core/driver-core-next (523aa3586ffb Merge 4.11-rc6 into driver-core-next)
Merging usb/usb-next (c034a43e72dd staging: typec: Fairchild FUSB302 Type-c chip driver)
CONFLICT (content): Merge conflict in Documentation/media/v4l-drivers/philips.rst
Merging usb-gadget/next (48eab1f28d49 usb: gadget: udc: atmel: Update Kconfig help for fifo_mode = 0)
Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit)
Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group)
Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency)
Merging tty/tty-next (8e1c21f48694 serial: small Makefile reordering)
CONFLICT (content): Merge conflict in include/linux/serdev.h
Merging char-misc/char-misc-next (2a76f89fa58c firmware: google memconsole: Fix return value check in platform_memconsole_init())
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Applying: firmware: google memconsole: merge fix for e820.h move
Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation)
Merging staging/staging-next (11270059e8d0 staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd)
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.
CONFLICT (content): Merge conflict in drivers/staging/media/Makefile
CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
$ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c
Applying: staging: merge fix for add/change_virtual-intf API change
Applying: staging: merge fix for "nl80211: allow multiple active scheduled scan requests"
Applying: staging: rtl8723bs: fix up for cfg80211_roamed() API change
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (64fe6098da04 Merge branch 'for-linus' into next)
Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (e83d14310c40 Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/sd.c
CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c
Applying: scsi: osd_uld: fix mismerge
Merging scsi-mkp/for-next (e7731da36f10 scsi: qla4xxx: fix spelling mistake: "Tempalate" -> "Template")
Merging target-updates/for-next (47f4cce7c72d tcmu: fix module removal due to stuck thread)
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 (6b0778cd8a78 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 (d635daaa99c6 ptr_ring: batched ring producer)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break)
CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c
Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623)
Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac 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 (d66bb1607e2d proc: Fix unbalanced hard link numbers)
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 (945f8f5f8633 selftests: x86: add missing executables to .gitignore)
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 (608822c0f7af Merge branch 'for-4.12/upstream' into for-next)
Merging coresight/next (8b3fa19142e8 coresight: tmc: minor fix for output log)
Merging rtc/rtc-next (5d05e81516cf rtc: sh: mark PM functions as unused)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (b9193db97d30 Merge branch 'for-4.12/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in drivers/block/brd.c
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)
Merging akpm-current/current (7bb2cbad0cfc sysv,ipc: cacheline align kern_ipc_perm)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests
$ git checkout -b akpm remotes/origin/akpm/master
Applying: imx7: fix Kconfig warning and build errors
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, vmalloc: properly track vmalloc users
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, swap: use kvzalloc to allocate some swap data structures
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
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: kprobes/x86: merge fix for set_memory.h decoupling
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
Applying: Documentation/vm/transhuge.txt: fix trivial typos
Applying: docs-vm-transhuge-fix-few-trivial-typos-fix
Applying: format-security: move static strings to const
Applying: fs: f2fs: use ktime_get_real_seconds for sit_info times
Applying: trace: make trace_hwlat timestamp y2038 safe
Applying: fs: cifs: replace CURRENT_TIME by other appropriate apis
Applying: fs: ceph: CURRENT_TIME with ktime_get_real_ts()
Applying: fs: ufs: use ktime_get_real_ts64() for birthtime
Applying: fs: ubifs: replace CURRENT_TIME_SEC with current_time
Applying: lustre: replace CURRENT_TIME macro
Applying: apparmorfs: replace CURRENT_TIME with current_time()
Applying: gfs2: replace CURRENT_TIME with current_time
Applying: time: delete CURRENT_TIME_SEC and CURRENT_TIME
Applying: time: delete current_fs_time()
Applying: mm/huge_memory.c.c: use zap_deposited_table() more
Applying: mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
Applying: mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC
Applying: mm: introduce memalloc_noreclaim_{save,restore}
Applying: treewide: convert PF_MEMALLOC manipulations to new helpers
Applying: treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix
Applying: mtd: nand: nandsim: convert to memalloc_noreclaim_*()
Applying: dax: add tracepoints to dax_iomap_pte_fault()
Applying: dax: add tracepoints to dax_pfn_mkwrite()
Applying: dax: add tracepoints to dax_load_hole()
Applying: dax: add tracepoints to dax_writeback_mapping_range()
Applying: dax: fix regression in dax_writeback_mapping_range()
Applying: dax: add tracepoint to dax_writeback_one()
Applying: dax-add-tracepoint-to-dax_writeback_one-fix
Applying: dax: add tracepoint to dax_insert_mapping()
Applying: selftests/vm: add a test for virtual address range mapping
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (a5c5de8b6188 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* Re: linux-next: incomplete commits in the ceph tree
From: Ilya Dryomov @ 2017-05-04 7:34 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Sage Weil, Linux-Next Mailing List, Linux Kernel Mailing List
In-Reply-To: <20170504074837.608e72d3@canb.auug.org.au>
On Wed, May 3, 2017 at 11:48 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Sage,
>
> I noticed several new commits in the ceph tree today that have no
> Singn-off-by from their committer (Ilya). :-(
I've just fixed that, thanks for the heads up!
Ilya
^ permalink raw reply
* mmotm git tree since-4.11 branch created (was: mmotm 2017-05-03-15-16 uploaded)
From: Michal Hocko @ 2017-05-04 11:51 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, broonie
In-Reply-To: <590a56eb.l+Eu7L7Jdv9KEqSs%akpm@linux-foundation.org>
I have just created since-4.11 branch in mm git tree
(http://git.kernel.org/?p=linux/kernel/git/mhocko/mm.git;a=summary). It
is based on v4.11 tag in Linus tree and mmotm-2017-05-03-15-16.
As usual mmotm trees are tagged with signed tag
(finger print BB43 1E25 7FB8 660F F2F1 D22D 48E2 09A2 B310 E347)
The shortlog says:
Andi Kleen (3):
kref: remove WARN_ON for NULL release functions
drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd
include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec
Andrew Morton (4):
mm-page_alloc-count-movable-pages-when-stealing-from-pageblock-fix
drm-use-set_memoryh-header-fix
docs-vm-transhuge-fix-few-trivial-typos-fix
dax-add-tracepoint-to-dax_writeback_one-fix
Andrey Konovalov (9):
kasan: introduce helper functions for determining bug type
kasan: unify report headers
kasan: change allocation and freeing stack traces headers
kasan: simplify address description logic
kasan: change report header
kasan: improve slab object description
kasan: print page description after stacks
kasan: improve double-free report format
kasan: separate report parts by empty lines
Andrey Ryabinin (4):
fs: fix data invalidation in the cleancache during direct IO
fs/block_dev: always invalidate cleancache in invalidate_bdev()
mm/truncate: bail out early from invalidate_inode_pages2_range() if mapping is empty
mm/truncate: avoid pointless cleancache_invalidate_inode() calls.
Andrey Vostrikov (1):
lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Anshuman Khandual (5):
mm/mmap: replace SHM_HUGE_MASK with MAP_HUGE_MASK inside mmap_pgoff
mm/madvise.c: clean up MADV_SOFT_OFFLINE and MADV_HWPOISON
mm/madvise: move up the behavior parameter validation
mm/memory-failure.c: add page flag description in error paths
selftests/vm: add a test for virtual address range mapping
Arnd Bergmann (3):
block, dax: use correct format string in bdev_dax_supported
mm/gup.c: fix access_ok() argument type
drivers/misc: aspeed-lpc-ctrl: fix printk format warning again
Colin Ian King (1):
scripts/spelling.txt: add several more common spelling mistakes
Cyril Bur (2):
drivers/misc: Add Aspeed LPC control driver
drivers/misc: Aspeed LPC control fix compile error and warning
Dan Williams (37):
device-dax: fix cdev leak
acpi, nfit: fix acpi_get_table leak
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
device-dax: rename 'dax_dev' to 'dev_dax'
dax: refactor dax-fs into a generic provider of 'struct dax_device' instances
Revert "libnvdimm: band aid btt vs clear poison locking"
acpi, nfit: add support for acpi 6.1 dimm state flags
tools/testing/nvdimm: test acpi 6.1 health state flags
acpi, nfit: support "map failed" dimms
acpi, nfit: collate health state flags
acpi, nfit: limit ->flush_probe() to initialization work
tools/testing/nvdimm: fix nfit_test shutdown crash
acpi, nfit: fix module unload vs workqueue shutdown race
dax: add a facility to lookup a dax device by 'host' device name
dax: introduce dax_operations
pmem: add dax_operations support
axon_ram: add dax_operations support
brd: add dax_operations support
dcssblk: add dax_operations support
block: kill bdev_dax_capable()
dax: introduce dax_direct_access()
dm: add dax_device and dax_operations support
libnvdimm, region: fix flush hint detection crash
dm: teach dm-targets to use a dax_device + dax_operations
ext2, ext4, xfs: retrieve dax_device for iomap operations
Revert "block: use DAX for partition table reads"
filesystem-dax: convert to dax_direct_access()
block, dax: convert bdev_dax_supported() to dax_direct_access()
block: remove block_device_operations ->direct_access()
x86, dax, pmem: remove indirection around memcpy_from_pmem()
libnvdimm, region: sysfs trigger for nvdimm_flush()
acpi, nfit: kill ACPI_NFIT_DEBUG
libnvdimm: rework region badblocks clearing
libnvdimm: fix nvdimm_bus_lock() vs device_lock() ordering
libnvdimm: restore "libnvdimm: band aid btt vs clear poison locking"
device-dax: fix sysfs attribute deadlock
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Dave Jiang (5):
libnvdimm: add mechanism to publish badblocks at the region level
libnvdimm: Add 'resource' sysfs attribute to regions
libnvdimm: add support for clear poison list and badblocks for device dax
device-dax, tools/testing/nvdimm: enable device-dax with mock resources
libnvdimm: fix clear poison locking with spinlock and GFP_NOWAIT allocation
David Rientjes (2):
mm, vmstat: print non-populated zones in zoneinfo
mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo
Deepa Dinamani (2):
fs: f2fs: use ktime_get_real_seconds for sit_info times
trace: make trace_hwlat timestamp y2038 safe
Dinh Nguyen (1):
fpga: fix sparse warnings in fpga-mgr and fpga-bridge
Dmitry Torokhov (2):
rapidio: use is_visible() to hide switch-specific attributes
zorro: stop creating attributes by hand
Florian Fainelli (2):
FPGA: Add TS-7300 FPGA manager
ARM: ep93xx: Register ts73xx-fpga manager driver for TS-7300
Geert Uytterhoeven (5):
auxdisplay: charlcd: Extract character LCD core from misc/panel
auxdisplay: charlcd: Add support for 4-bit interfaces
auxdisplay: charlcd: Add support for displays with more than two lines
dt-bindings: auxdisplay: Add bindings for Hitachi HD44780
auxdisplay: Add HD44780 Character LCD support
Geliang Tang (3):
fs/ocfs2/cluster: use setup_timer
fs/ocfs2/cluster: use offset_in_page() macro
mm/page-writeback.c: use setup_deferrable_timer
Gerald Schaefer (1):
brd: fix uninitialized use of brd->dax_dev
Greg Thelen (1):
slab: avoid IPIs when creating kmem caches
Hao Lee (1):
mm: fix spelling error
Huang Ying (7):
mm, swap: Fix a race in free_swap_and_cache()
mm, swap: fix comment in __read_swap_cache_async
mm, swap: improve readability via make spin_lock/unlock balanced
mm, swap: avoid lock swap_avail_lock when held cluster lock
mm, swap: remove unused function prototype
mm/swapfile.c: fix swap space leak in error path of swap_free_entries()
mm, swap: use kvzalloc to allocate some swap data structures
Joe Perches (1):
drivers/char: Convert remaining use of pr_warning to pr_warn
Joel Holdsworth (2):
Documentation: Add binding document for Lattice iCE40 FPGA manager
fpga: Add support for Lattice iCE40 FPGAs
Johannes Weiner (16):
mm: fix 100% CPU kswapd busyloop on unreclaimable nodes
mm: fix check for reclaimable pages in PF_MEMALLOC reclaim throttling
mm: remove seemingly spurious reclaimability check from laptop_mode gating
mm: remove unnecessary reclaimability check from NUMA balancing target
mm: don't avoid high-priority reclaim on unreclaimable nodes
mm: don't avoid high-priority reclaim on memcg limit reclaim
mm: delete NR_PAGES_SCANNED and pgdat_reclaimable()
Revert "mm, vmscan: account for skipped pages as a partial scan"
mm: remove unnecessary back-off function when retrying page reclaim
mm: memcontrol: provide shmem statistics
mm: page_alloc: __GFP_NOWARN shouldn't suppress stall warnings
mm: vmscan: fix IO/refault regression in cache workingset transition
mm: memcontrol: clean up memory.events counting function
mm: memcontrol: re-use global VM event enum
mm: memcontrol: re-use node VM page state enum
mm: memcontrol: use node page state naming scheme for memcg
Junxiao Bi (1):
ocfs2: o2hb: revert hb threshold to keep compatible
K. Y. Srinivasan (2):
Drivers: hv: Fix a typo
Drivers: hv: Base autoeoi enablement based on hypervisor hints
Kees Cook (2):
mm: remove rodata_test_data export, add pr_fmt
format-security: move static strings to const
Laura Abbott (15):
treewide: move set_memory_* functions away from cacheflush.h
arm: use set_memory.h header
arm64: use set_memory.h header
s390: use set_memory.h header
x86: use set_memory.h header
agp: use set_memory.h header
drm: use set_memory.h header
drivers/hwtracing/intel_th/msu.c: use set_memory.h header
drivers/watchdog/hpwdt.c: use set_memory.h header
include/linux/filter.h: use set_memory.h header
kernel/module.c: use set_memory.h header
kernel/power/snapshot.c: use set_memory.h header
alsa: use set_memory.h header
drivers/misc/sram-exec.c: use set_memory.h header
drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header
Laurent Dufour (2):
mm: uncharge poisoned pages
mm: skip HWPoisoned pages when onlining pages
Linda Knippers (3):
acpi, nfit: allow override of built-in bitmasks for nvdimm DSMs
acpi, nfit: allow specifying a default DSM family
acpi, nfit: remove unnecessary newline
Logan Gunthorpe (2):
chardev: add helper function to register char devs with a struct device
device-dax: utilize new cdev_device_add helper function
Mariusz Bialonczyk (4):
w1: add missing DS2413 documentation
w1: add support for DS2438 Smart Battery Monitor
w1: add documentation for w1_ds2438
w1: w1_ds2760.h: fix defines indentation
Martyn Welch (2):
docs: Add kernel-doc comments to VME driver API
docs: Update VME documentation to include kerneldoc comments
Masahiro Yamada (1):
blackfin: bf609: let clk_disable() return immediately if clk is NULL
Matt Ranostay (2):
pps: add ioctl_compat function to correct ioctl definitions
pps: fix padding issue with PPS_FETCH for ioctl_compat
Matthew Wilcox (1):
mm: tighten up the fault path a little
Matthias Kaehlcke (1):
hpet: Make cmd parameter of hpet_ioctl_common() unsigned
Mel Gorman (2):
mm, vmscan: only clear pgdat congested/dirty/writeback state when balanced
mm, vmscan: prevent kswapd sleeping prematurely due to mismatched classzone_idx
Michal Hocko (19):
Merge remote-tracking branch 'nvdim/libnvdimm-for-next' into mmotm-since-4.11
lockdep: allow to disable reclaim lockup detection
xfs: abstract PF_FSTRANS to PF_MEMALLOC_NOFS
mm: introduce memalloc_nofs_{save,restore} API
xfs: use memalloc_nofs_{save,restore} instead of memalloc_noio*
jbd2: mark the transaction context with the scope GFP_NOFS context
jbd2: make the whole kjournald2 kthread NOFS safe
oom: improve oom disable handling
mm: introduce kv[mz]alloc helpers
mm, vmalloc: properly track vmalloc users
mm: support __GFP_REPEAT in kvmalloc_node for >32kB
lib/rhashtable.c: simplify a strange allocation pattern
net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern
fs/xattr.c: zero out memory copied to userspace in getxattr
treewide: use kv[mz]alloc* rather than opencoded variants
net: use kvmalloc with __GFP_REPEAT rather than open coded variant
drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant
drivers/md/bcache/super.c: use kvmalloc
mm, vmalloc: use __GFP_HIGHMEM implicitly
Mike Kravetz (1):
Documentation: vm, add hugetlbfs reservation overview
Mike Rapoport (1):
userfaultfd: selftest: combine all cases into a single executable
Minchan Kim (18):
mm: fix lazyfree BUG_ON check in try_to_unmap_one()
mm: do not use double negation for testing page flags
mm: remove unncessary ret in page_referenced
mm: remove SWAP_DIRTY in ttu
mm: remove SWAP_MLOCK check for SWAP_SUCCESS in ttu
mm: make try_to_munlock() return void
mm: remove SWAP_MLOCK in ttu
mm: remove SWAP_AGAIN in ttu
mm: make ttu's return boolean
mm: make rmap_walk() return void
mm: make rmap_one boolean function
mm: remove SWAP_[SUCCESS|AGAIN|FAIL]
zram: handle multiple pages attached bio's bvec
zram: partial IO refactoring
zram: use zram_slot_lock instead of raw bit_spin_lock op
zram: remove zram_meta structure
zram: introduce zram data accessor
zram: use zram_free_page instead of open-coded
Ming Lei (1):
MAINTAINERS: update firmware loader entry
Moritz Fischer (4):
fpga: Add flag to indicate bitstream needs decrypting
fpga: zynq: Add support for encrypted bitstreams
fpga: region: Add fpga-region property 'encrypted-fpga-config'
fpga: bridge: Replace open-coded list_for_each + list_entry
Naoya Horiguchi (2):
mm: hwpoison: call shake_page() unconditionally
mm: hwpoison: call shake_page() after try_to_unmap() for mlocked page
Nikolay Borisov (1):
lockdep: teach lockdep about memalloc_noio_save
Oliver O'Halloran (3):
device-dax: improve fault handler debug output
mm/huge_memory.c.c: use zap_deposited_table() more
mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
Pankaj Gupta (1):
lib/dma-debug.c: make locking work for RT
Pavel Tatashin (4):
sparc64: NG4 memset 32 bits overflow
mm: zero hash tables in allocator
mm: update callers to use HASH_ZERO flag
mm: adaptive hash table scaling
Pushkar Jambhlekar (2):
device-dax: fix dax_dev_huge_fault() unknown fault size handling
include/linux/migrate.h: add arg names to prototype
Rob Herring (1):
binder: Add 'hwbinder' to the default devices
Ross Zwisler (7):
dax: add tracepoints to dax_iomap_pte_fault()
dax: add tracepoints to dax_pfn_mkwrite()
dax: add tracepoints to dax_load_hole()
dax: add tracepoints to dax_writeback_mapping_range()
dax: fix regression in dax_writeback_mapping_range()
dax: add tracepoint to dax_writeback_one()
dax: add tracepoint to dax_insert_mapping()
Sangwoo Park (1):
zram: reduce load operation in page_same_filled
SeongJae Park (1):
Documentation/vm/transhuge.txt: fix trivial typos
Shantanu Goel (1):
mm, vmscan: fix zone balance check in prepare_kswapd_sleep
Shaohua Li (6):
mm: delete unnecessary TTU_* flags
mm: don't assume anonymous pages have SwapBacked flag
mm: move MADV_FREE pages into LRU_INACTIVE_FILE list
mm: reclaim MADV_FREE pages
mm: enable MADV_FREE for swapless system
proc: show MADV_FREE pages info in smaps
Stephen Boyd (2):
scripts/spelling.txt: add "memory" pattern and fix typos
scripts/spelling.txt: Add regsiter -> register spelling mistake
Stephen Hemminger (9):
vmbus: only reschedule tasklet if time limit exceeded
hyperv: fix warning about missing prototype
vmbus: remove useless return's
vmbus: remove unnecessary initialization
vmbus: fix spelling errors
hyperv: remove unnecessary return variable
vmbus: make channel_message table constant
vmbus: cleanup header file style
vmbus: expose debug info for drivers
Stephen Rothwell (2):
mm: introduce kv[mz]alloc helpers - f2fs fix up
kprobes/x86: merge fix for set_memory.h decoupling
Tetsuo Handa (2):
mm, page_alloc: remove debug_guardpage_minorder() test in warn_alloc()
fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag
Tim Chen (1):
mm/swap_slots.c: add warning if swap slots cache failed to initialize
Toshi Kani (3):
libnvdimm: fix phys_addr for nvdimm_clear_poison
libnvdimm, pmem: fix a NULL pointer BUG in nd_pmem_notify
libnvdimm: fix clear length of nvdimm_forget_poison()
Vinayak Menon (2):
mm: enable page poisoning early at boot
mm: vmscan: do not pass reclaimed slab to vmpressure
Vlastimil Babka (14):
mm, compaction: reorder fields in struct compact_control
mm, compaction: remove redundant watermark check in compact_finished()
mm, page_alloc: split smallest stolen page in fallback
mm-page_alloc-split-smallest-stolen-page-in-fallback-fix
mm, page_alloc: count movable pages when stealing from pageblock
mm, compaction: change migrate_async_suitable() to suitable_migration_source()
mm, compaction: add migratetype to compact_control
mm, compaction: restrict async compaction to pageblocks of same migratetype
mm, compaction: finish whole pageblock to reduce fragmentation
mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC
mm: introduce memalloc_noreclaim_{save,restore}
treewide: convert PF_MEMALLOC manipulations to new helpers
treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix
mtd: nand: nandsim: convert to memalloc_noreclaim_*()
Wei Yang (2):
mm/sparse: refine usemap_size() a little
mm/page_alloc: return 0 in case this node has no page within the zone
Xishi Qiu (2):
mm: use is_migrate_highatomic() to simplify the code
mm: use is_migrate_isolate_page() to simplify the code
Yisheng Xie (2):
mm/compaction: ignore block suitable after check large free page
mm/vmscan: more restrictive condition for retry in do_try_to_free_pages
zhong jiang (2):
mm/page_owner: align with pageblock_nr pages
mm/vmstat.c: walk the zone in pageblock_nr_pages steps
--
Michal Hocko
SUSE Labs
--
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
* next-20170504 build: 0 failures 0 warnings (next-20170504)
From: Build bot for Mark Brown @ 2017-05-04 14:16 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170504
Git describe: next-20170504
Commit: ef57eb19c9 Add linux-next specific files for 20170504
Build Time: 310 min 3 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 0
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
-------------------------------------------------------------------------------
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allmodconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the staging tree
From: Greg KH @ 2017-05-04 23:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Johannes Berg, Linux-Next Mailing List, Linux Kernel Mailing List,
Hans de Goede, Avraham Stern, Luca Coelho
In-Reply-To: <20170501144218.4f794945@canb.auug.org.au>
On Mon, May 01, 2017 at 02:42:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c: In function 'rtw_cfg80211_indicate_connect':
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:552:6: error: passing argument 2 of 'cfg80211_roamed' from incompatible pointer type [-Werror=incompatible-pointer-types]
> , notify_channel
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'struct cfg80211_roam_info *' but argument is of type 'struct ieee80211_channel *'
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:553:6: warning: passing argument 3 of 'cfg80211_roamed' makes integer from pointer without a cast [-Wint-conversion]
> , cur_network->network.MacAddress
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: expected 'gfp_t {aka unsigned int}' but argument is of type 'unsigned char *'
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:551:3: error: too many arguments to function 'cfg80211_roamed'
> cfg80211_roamed(padapter->pnetdev
> ^
> In file included from drivers/staging/rtl8723bs/include/osdep_service_linux.h:50:0,
> from drivers/staging/rtl8723bs/include/osdep_service.h:23,
> from drivers/staging/rtl8723bs/include/drv_types.h:29,
> from drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c:17:
> include/net/cfg80211.h:5435:6: note: declared here
> void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,
> ^
>
> Caused by commit
>
> 554c0a3abf21 ("staging: Add rtl8723bs sdio wifi driver")
>
> interacting with commit
>
> 29ce6ecbb83c ("cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss()")
>
> from the mac80211-next tree.
>
> I applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 1 May 2017 14:34:17 +1000
> Subject: [PATCH] staging: rtl8723bs: fix up for cfg80211_roamed() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> index f092a72bffda..5e7a61f24f8d 100644
> --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
> @@ -542,20 +542,24 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
> struct ieee80211_channel *notify_channel;
> u32 freq;
> u16 channel = cur_network->network.Configuration.DSConfig;
> + struct cfg80211_roam_info roam_info = {};
>
> freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
>
> notify_channel = ieee80211_get_channel(wiphy, freq);
>
> DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
> - cfg80211_roamed(padapter->pnetdev
> - , notify_channel
> - , cur_network->network.MacAddress
> - , pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2
> - , pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2
> - , pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6
> - , pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6
> - , GFP_ATOMIC);
> + roam_info.channel = notify_channel;
> + roam_info.bssid = cur_network->network.MacAddress;
> + roam_info.req_ie =
> + pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2;
> + roam_info.req_ie_len =
> + pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2;
> + roam_info.resp_ie =
> + pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6;
> + roam_info.resp_ie_len =
> + pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6;
> + cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC);
> }
> else
> {
> --
> 2.11.0
>
Thanks for the patch, that's the joy of adding new drivers...
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with the usb tree
From: Greg KH @ 2017-05-04 23:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Guenter Roeck,
Gilad Ben-Yossef, Michael Zoran
In-Reply-To: <20170501140949.2c07b08d@canb.auug.org.au>
On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/Makefile
>
> between commit:
>
> f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
>
> from the usb tree and commit:
>
> 051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
> abefd6741d54 ("staging: ccree: introduce CryptoCell HW driver")
>
> from the staging 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.
I'm the maintainer of both :)
Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.
greg k-h
^ permalink raw reply
* linux-next: manual merge of the rdma tree with the pci tree
From: Stephen Rothwell @ 2017-05-05 0:19 UTC (permalink / raw)
To: Doug Ledford, Bjorn Helgaas
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, Michael J. Ruhl
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
drivers/infiniband/hw/hfi1/hfi.h
between commit:
21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")
from the pci tree and commit:
f4cd87652919 ("IB/hfi1: Name function prototype parameters")
from the rdma 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/infiniband/hw/hfi1/hfi.h
index 14063bd30c2a,509df984a09f..000000000000
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@@ -1821,13 -1815,15 +1815,14 @@@ void hfi1_verbs_unregister_sysfs(struc
/* Hook for sysfs read of QSFP */
int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len);
- int hfi1_pcie_init(struct pci_dev *, const struct pci_device_id *);
- void hfi1_pcie_cleanup(struct pci_dev *);
- int hfi1_pcie_ddinit(struct hfi1_devdata *, struct pci_dev *);
+ int hfi1_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent);
+ void hfi1_pcie_cleanup(struct pci_dev *pdev);
+ int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev);
void hfi1_pcie_ddcleanup(struct hfi1_devdata *);
- int pcie_speeds(struct hfi1_devdata *);
- void request_msix(struct hfi1_devdata *, u32 *, struct hfi1_msix_entry *);
- void hfi1_enable_intx(struct pci_dev *);
-void hfi1_pcie_flr(struct hfi1_devdata *dd);
+ int pcie_speeds(struct hfi1_devdata *dd);
+ void request_msix(struct hfi1_devdata *dd, u32 *nent,
+ struct hfi1_msix_entry *entry);
+ void hfi1_enable_intx(struct pci_dev *pdev);
void restore_pci_variables(struct hfi1_devdata *dd);
int do_pcie_gen3_transition(struct hfi1_devdata *dd);
int parse_platform_config(struct hfi1_devdata *dd);
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the pci tree
From: Doug Ledford @ 2017-05-05 3:35 UTC (permalink / raw)
To: Stephen Rothwell, Bjorn Helgaas
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Christoph Hellwig, Michael J. Ruhl
In-Reply-To: <20170505101910.3f1b0194@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 1367 bytes --]
On 5/4/2017 8:19 PM, Stephen Rothwell wrote:
> Hi Doug,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/hfi1/hfi.h
>
> between commit:
>
> 21c433a74b6b ("IB/hfi1: Use pcie_flr() instead of duplicating it")
>
> from the pci tree and commit:
>
> f4cd87652919 ("IB/hfi1: Name function prototype parameters")
>
> from the rdma 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.
>
This is not unexpected entirely, only unexpected in that the PCI tree
hasn't been merged yet ;-). The first commit was part of a series that
was mainly a PCI series that just touched hfi1, so it's entirely
understandable that it went through the PCI tree and something in my
tree might happen, as it were, to touch the same area. Your fix was
fine and I'm sure Linus can sort the same thing out. Thanks ;-)
--
Doug Ledford <dledford@redhat.com>
GPG Key ID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply
* linux-next: Tree for May 5
From: Stephen Rothwell @ 2017-05-05 4:22 UTC (permalink / raw)
To: Linux-Next Mailing List; +Cc: Linux Kernel Mailing List
Hi all,
Please do not add any v4.13 destined material in your linux-next
included branches until after v4.12-rc1 has been released.
Changes since 20170504:
The rdma tree gained a conflict against the pci tree.
The spi-nor tree lost its build failure.
Non-merge commits (relative to Linus' tree): 5017
5511 files changed, 511077 insertions(+), 81899 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 258 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 (4ac4d584886a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (65c02a556bc4 ARCv2: ptrace: provide regset for accumulator/r30 regs)
Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call)
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y)
Merging sparc/master (8c64415cc1f5 sparc: Remove redundant tests in boot_flags_init().)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (842be75c77cb cfg80211: make RATE_INFO_BW_20 the default)
Merging ipsec/master (9b3eb54106cf xfrm: fix stack access out of bounds with CONFIG_XFRM_SUB_POLICY)
Merging netfilter/master (f411af682218 Merge branch 'ibmvnic-Updated-reset-handler-andcode-fixes')
Merging ipvs/master (c8d6c6b496dc ipvs: SNAT packet replies only for NATed connections)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
Merging mac80211/master (842be75c77cb cfg80211: make RATE_INFO_BW_20 the default)
Merging sound-current/for-linus (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam))
Merging driver-core.current/driver-core-linus (39da7c509acf Linux 4.11-rc6)
Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7)
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 (39da7c509acf Linux 4.11-rc6)
Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4)
Merging input-current/for-linus (0337966d121e Merge branch 'next' into for-linus)
Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
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 (a351e9b9fc24 Linux 4.11)
Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline)
Merging kbuild/for-next (11d5300b0fc9 Merge branch 'kbuild' into for-next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/crypto.h
CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild
CONFLICT (modify/delete): arch/avr32/include/uapi/asm/Kbuild deleted in HEAD and modified in kbuild/for-next. Version kbuild/for-next of arch/avr32/include/uapi/asm/Kbuild left in tree.
$ git rm -f arch/avr32/include/uapi/asm/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 (c92a90a5060a Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework)
Merging arm-soc/for-next (e1cf8cbc408c arm-soc: document merges)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32746g-eval.dts
CONFLICT (content): Merge conflict in arch/arm/boot/dts/rk3188.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
Applying: tee: merge fix for dma-ops field name changes
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 (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/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 (990df0480610 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (4495c08e8472 Linux 4.11-rc2)
Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (5a0bbcf7ab0f 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 (c8906b237adf Merge branch 'fixes-for-v4.12' into next)
Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' 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 (226464bdf486 Merge branch 'fixes' 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 (29d04525797f Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (8f9cc6d655a1 arm64: Fix the DMA mmap and get_sgtable API with DMA_ATTR_FORCE_CONTIGUOUS)
CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h
Merging clk/clk-next (0119dc6132d2 clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL)
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 (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks)
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
CONFLICT (content): Merge conflict in arch/metag/include/asm/uaccess.h
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (b153c82756e9 Merge branch '4.11-fixes' into mips-for-linux-next)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
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 (4f7d029b9bf0 Linux 4.11-rc7)
Merging powerpc/next (700b7eadd562 powerpc/64s: Power9 has no LPCR[VRMASD] field so don't set it)
CONFLICT (content): Merge conflict in kernel/kprobes.c
Merging fsl/next (726bd223105c powerpc/8xx: Adding support of IRQ in MPC8xx GPIO)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (db55947dd2d0 s390/uprobes: fix compile for !KPROBES)
Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux)
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 (ce4586063f1a um: Add missing NR_CPUS include)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
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 (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425)
Merging ceph/master (eeca958dce0a ceph: fix memory leak in __ceph_setxattr())
Merging cifs/for-next (7db0a6efdc3e SMB3: Work around mount failure when using SMB3 dialect to Macs)
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 (07f7e3135e58 Merge branch 'fsnotify' into for_next)
Merging ext4/dev (17f423b51607 jbd2: cleanup write flags handling from jbd2_write_superblock())
Merging f2fs/dev (e9cdd307704b f2fs: fix a mount fail for wrong next_scan_nid)
CONFLICT (content): Merge conflict in fs/f2fs/inline.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (c296cfe26bdd pNFS: Fix NULL dereference in pnfs_generic_alloc_ds_commits)
CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt
Merging nfsd/nfsd-next (ed6473ddc704 NFSv4: Fix callback server shutdown)
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
Merging overlayfs/overlayfs-next (4a99f3c83dc4 ovl: do not set overlay.opaque on non-dir create)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (32fe905c17f0 ubifs: Fix O_TMPFILE corner case in ubifs_link())
Merging xfs/for-next (8290b7502b7b xfs: fix use-after-free in xfs_finish_page_writeback)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (ef3296e0e82f Merge branch 'for-linus' into for-next)
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 (cf39bf58afda printk: fix double printing with earlycon)
Merging pci/next (3146c8f4de9b Merge branch 'pci/remove' into next)
CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild
CONFLICT (content): Merge conflict in include/linux/pci.h
CONFLICT (content): Merge conflict in drivers/pci/msi.c
Merging pstore/for-next/pstore (3a7d2fd16c57 pstore: Solve lockdep warning by moving inode locks)
Merging hid/for-next (38c81b5434ac Merge branch 'for-4.11/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' 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 (6eaaea144dc5 hwmon: (pmbus) Add client driver for IR35221)
Merging jc_docs/docs-next (9bb0e9cb04c8 docs: Fix a couple typos)
Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_hdmi.c
Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next)
Merging fbdev/fbdev-for-next (5c9cfda13dc5 drivers/video/fbdev/omap/lcd_mipid.c: Use time comparison kernel macros)
Merging pm/linux-next (a061321a7e70 Merge branches 'acpi-pmic', 'powercap' and 'pm-cpuidle' into linux-next)
CONFLICT (content): Merge conflict in drivers/acpi/acpi_apd.c
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 (19fd1783c24e Merge branch 'work-linus' into work-next)
CONFLICT (content): Merge conflict in drivers/thermal/Makefile
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
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 (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.)
Merging netfilter-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
Merging wireless-drivers-next/master (47d272f0f988 Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
Merging bluetooth/master (2da711ac3f6d Bluetooth: Skip vendor diagnostic configuration for HCI User Channel)
Merging mac80211-next/master (e3bf4c61da80 sparc64: Fix BPF JIT wrt. branches and ldimm64 instructions.)
Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors)
CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/hfi.h
Merging gfs2/for-next (d552a2b9b33e GFS2: Non-recursive delete)
Merging mtd/master (c1ae3cfa0e89 Linux 4.11-rc1)
Merging l2-mtd/master (6a623e076944 mtd: nand: add ooblayout for old hamming layout)
Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program)
Merging spi-nor/next (fd8dbf418bda mtd: spi-nor: stm32-quadspi: allow building with COMPILE_TEST)
Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information)
Merging drm/drm-next (8b03d1ed2c43 Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
Merging drm-intel/for-linux-next (88326ef05b26 drm/i915: Confirm the request is still active before adding it to the await)
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 (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2)
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 (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo)
Merging imx-drm/imx-drm/next (1465dc794b00 gpu: ipu-v3: prg: remove counter load enable)
Merging etnaviv/etnaviv/next (78ec187f64fa drm/etnaviv: submit support for out-fences)
Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
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 (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging sound-asoc/for-next (20d5c84bef06 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next)
Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string)
Merging input/next (8a038b83e012 Input: ar1021_i2c - use BIT to check for a bit)
Merging block/for-next (4d1ee100af58 Merge branch 'for-4.12/block' into for-next)
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
Merging device-mapper/for-next (7ab84db64f11 dm integrity: improve the Kconfig help text for DM_INTEGRITY)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (a627f025eb05 mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (3d05f3aed5d7 md/raid5: make use of spin_lock_irq over local_irq_disable + spin_lock)
Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos)
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
Merging battery/for-next (35f4f99ccbc1 power: supply: cpcap-charger: Keep trickle charger bits disabled)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next)
Merging security/next (8979b02aaf1d tpm: Fix reference count to main device)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug)
Merging tpmdd/next (61e59bd2321e tpm: move endianness conversion of ordinals to tpm_input_header)
Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Merging iommu/next (2c0248d68880 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
Merging audit/next (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure)
Merging devicetree/for-next (17a70355ea57 of: fix sparse warnings in fdt, irq, reserved mem, and resolver code)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
Merging spi/for-next (282ec0ea65da Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (fbd781de3bac Merge branch 'x86/vdso')
Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
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 (f8d5549df25e EDAC, ghes: Do not enable it by default)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (8bbb767495af Merge branch 'for-next/ftrace/core' into trace/for-next)
CONFLICT (content): Merge conflict in kernel/trace/trace.h
CONFLICT (content): Merge conflict in kernel/trace/trace.c
Merging rcu/rcu/next (933dfbd7c437 rcu: Open-code the rcu_cblist_n_lazy_cbs() function)
Merging kvm/linux-next (bd17117bb2af Merge tag 'kvm-s390-next-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (35d2d5d490e2 KVM: arm/arm64: Move shared files to virt/kvm/arm)
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic.h
CONFLICT (content): Merge conflict in virt/kvm/arm/vgic/vgic-v2.c
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in Documentation/virtual/kvm/api.txt
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
Merging kvm-ppc/kvm-ppc-next (fb7dcf723dd2 Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/cpu_setup_power.S
Applying: powerpc: merge fix for powerpc_debugfs_root move.
Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8)
Merging xen-tip/linux-next (3dbd8204af48 xen: Move xen_have_vector_callback definition to enlighten.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 (6df97f85611c platform/x86: Make SILEAD_DMI depend on TOUCHSCREEN_SILEAD)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support)
Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response)
Merging driver-core/driver-core-next (523aa3586ffb Merge 4.11-rc6 into driver-core-next)
Merging usb/usb-next (c034a43e72dd staging: typec: Fairchild FUSB302 Type-c chip driver)
CONFLICT (content): Merge conflict in Documentation/media/v4l-drivers/philips.rst
Merging usb-gadget/next (48eab1f28d49 usb: gadget: udc: atmel: Update Kconfig help for fifo_mode = 0)
Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit)
Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group)
Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency)
Merging tty/tty-next (8e1c21f48694 serial: small Makefile reordering)
CONFLICT (content): Merge conflict in include/linux/serdev.h
Merging char-misc/char-misc-next (2a76f89fa58c firmware: google memconsole: Fix return value check in platform_memconsole_init())
CONFLICT (content): Merge conflict in drivers/scsi/osd/osd_uld.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Applying: firmware: google memconsole: merge fix for e820.h move
Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation)
Merging staging/staging-next (11270059e8d0 staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd)
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.
CONFLICT (content): Merge conflict in drivers/staging/media/Makefile
CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
$ git rm -f drivers/staging/media/lirc/lirc_sasem.c drivers/staging/media/lirc/lirc_sir.c
Applying: staging: merge fix for add/change_virtual-intf API change
Applying: staging: merge fix for "nl80211: allow multiple active scheduled scan requests"
Applying: staging: rtl8723bs: fix up for cfg80211_roamed() API change
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
Merging slave-dma/next (64fe6098da04 Merge branch 'for-linus' into next)
Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (e83d14310c40 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (e7731da36f10 scsi: qla4xxx: fix spelling mistake: "Tempalate" -> "Template")
Merging target-updates/for-next (47f4cce7c72d tcmu: fix module removal due to stuck thread)
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 (6b0778cd8a78 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 (d635daaa99c6 ptr_ring: batched ring producer)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break)
Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623)
Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (97512ceafaac 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 (d66bb1607e2d proc: Fix unbalanced hard link numbers)
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 (945f8f5f8633 selftests: x86: add missing executables to .gitignore)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/run_vmtests
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 (608822c0f7af Merge branch 'for-4.12/upstream' into for-next)
Merging coresight/next (8b3fa19142e8 coresight: tmc: minor fix for output log)
Merging rtc/rtc-next (332e0d13d3c7 rtc: gemini: add return value validation)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (b9193db97d30 Merge branch 'for-4.12/dax' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in fs/dax.c
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
CONFLICT (content): Merge conflict in drivers/block/brd.c
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)
Merging akpm-current/current (d9096ab96a05 sysv,ipc: cacheline align kern_ipc_perm)
$ git checkout -b akpm remotes/origin/akpm/master
Applying: imx7: fix Kconfig warning and build errors
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, vmalloc: properly track vmalloc users
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, swap: use kvzalloc to allocate some swap data structures
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
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: kprobes/x86: merge fix for set_memory.h decoupling
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
Applying: Documentation/vm/transhuge.txt: fix trivial typos
Applying: docs-vm-transhuge-fix-few-trivial-typos-fix
Applying: format-security: move static strings to const
Applying: fs: f2fs: use ktime_get_real_seconds for sit_info times
Applying: trace: make trace_hwlat timestamp y2038 safe
Applying: fs: cifs: replace CURRENT_TIME by other appropriate apis
Applying: fs: ceph: CURRENT_TIME with ktime_get_real_ts()
Applying: fs: ufs: use ktime_get_real_ts64() for birthtime
Applying: fs: ubifs: replace CURRENT_TIME_SEC with current_time
Applying: lustre: replace CURRENT_TIME macro
Applying: apparmorfs: replace CURRENT_TIME with current_time()
Applying: gfs2: replace CURRENT_TIME with current_time
Applying: time: delete CURRENT_TIME_SEC and CURRENT_TIME
Applying: time: delete current_fs_time()
Applying: mm/huge_memory.c.c: use zap_deposited_table() more
Applying: mm/huge_memory.c: deposit a pgtable for DAX PMD faults when required
Applying: mm: prevent potential recursive reclaim due to clearing PF_MEMALLOC
Applying: mm: introduce memalloc_noreclaim_{save,restore}
Applying: treewide: convert PF_MEMALLOC manipulations to new helpers
Applying: treewide-convert-pf_memalloc-manipulations-to-new-helpers-fix
Applying: mtd: nand: nandsim: convert to memalloc_noreclaim_*()
Applying: dax: add tracepoints to dax_iomap_pte_fault()
Applying: dax: add tracepoints to dax_pfn_mkwrite()
Applying: dax: add tracepoints to dax_load_hole()
Applying: dax: add tracepoints to dax_writeback_mapping_range()
Applying: dax: fix regression in dax_writeback_mapping_range()
Applying: dax: add tracepoint to dax_writeback_one()
Applying: dax-add-tracepoint-to-dax_writeback_one-fix
Applying: dax: add tracepoint to dax_insert_mapping()
Applying: selftests/vm: add a test for virtual address range mapping
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
Merging akpm/master (d51e44cdf96d lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
^ permalink raw reply
* next-20170505 build: 0 failures 1 warnings (next-20170505)
From: Build bot for Mark Brown @ 2017-05-05 10:11 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170505
Git describe: next-20170505
Commit: 9e597e815f Add linux-next specific files for 20170505
Build Time: 151 min 21 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 1
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 1
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]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
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]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
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]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: Tree for Apr 24
From: Andrew Jones @ 2017-05-05 18:55 UTC (permalink / raw)
To: paul.gortmaker; +Cc: linux-kernel, linux-next, sfr, tglx
On Mon, Apr 24, 2017 at 11:44:13AM -0400, Paul Gortmaker wrote:
> There are also some new fails around kernel/events/core.c in arm32/arm64
>
> include/linux/jump_label.h: In function
> ‘static_key_disable_cpuslocked.constprop.66’:
> include/linux/jump_label.h:260:20: error: inlining failed in call to
> always_inline ‘static_key_disable_cpuslocked.constprop.66’: recursive
> inlining
> static inline void static_key_disable_cpuslocked(struct static_key *key)
> ^
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/13011884/
> http://kisskb.ellerman.id.au/kisskb/buildresult/13011947/
> ...and others.
>
> A mindless automated bisect run came back with this:
>
> 924726b2b5e5000dfb8eb6032651baed1b1bdc6c is the first bad commit
> commit 924726b2b5e5000dfb8eb6032651baed1b1bdc6c
> Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Date: Sun Apr 23 12:13:09 2017 +0200
>
> perf: Cure hotplug lock ordering issues
>
> I gave tglx and peterz a heads up on irc.
>
Sorry if this is a repeat, but I'm not sure if this has been resolved
yet, as I'm not on any of the mailing lists where it would be posted
and google isn't revealing anything besides this mail I'm replying to
(please keep me on CC in replies, as I'm not on the lists).
I bumped into a problem which bisecting led to this same commit. And,
it turns out the problem is the same one pointed out above, i.e. the
recursive inlining report. The following patch fixes the issue.
Thanks,
drew
>From 0a8d642d17c6a93e927435ce9b6d2eaaeb19263b Mon Sep 17 00:00:00 2001
From: Andrew Jones <drjones@redhat.com>
Date: Fri, 5 May 2017 19:54:35 +0200
Subject: [PATCH] jump_label: fix stack overflow
Fix a typo that leads to static_key_disable_cpuslocked infinitely
recursing. This was found when the PMU kvm-unit-tests test for ARM
crashed the host and bisection lead to 924726b2b5e5 "perf: Cure
hotplug lock ordering issues". That commit was just the victim,
the culprit commit is identified below in 'Fixes'.
Fixes: fc932a0477d0 "jump_label: Provide static_key_[disable|/slow_dec]_cpuslocked()"
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
include/linux/jump_label.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 6e3ebf2a39ede..bedd55849c2e3 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -259,7 +259,7 @@ static inline void static_key_disable(struct static_key *key)
static inline void static_key_disable_cpuslocked(struct static_key *key)
{
- static_key_disable_cpuslocked(key);
+ static_key_disable(key);
}
#define STATIC_KEY_INIT_TRUE { .enabled = ATOMIC_INIT(1) }
--
2.7.4
^ permalink raw reply related
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