* mmotm 2016-12-14-16-01 uploaded
From: akpm @ 2016-12-15 0:02 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-12-14-16-01 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.9:
(patches marked "*" will be included in linux-next)
origin.patch
* btrfs-better-handle-btrfs_printk-defaults.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
* mm-compaction-allow-compaction-for-gfp_nofs-requests.patch
* signals-avoid-unnecessary-taking-of-sighand-siglock.patch
* coredump-clarify-unsafe-core_pattern-warning.patch
* revert-kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* kexec-change-to-export-the-value-of-phys_base-instead-of-symbol-address.patch
* kexec-add-cond_resched-into-kimage_alloc_crash_control_pages.patch
* sysctl-add-kern_cont-to-deprecated_sysctl_warning.patch
* arch-arc-add-option-to-skip-sync-on-dma-mapping.patch
* arch-arm-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-avr32-add-option-to-skip-sync-on-dma-map.patch
* arch-blackfin-add-option-to-skip-sync-on-dma-map.patch
* arch-c6x-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-frv-add-option-to-skip-sync-on-dma-map.patch
* arch-hexagon-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-m68k-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-metag-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-microblaze-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-mips-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-nios2-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-openrisc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-parisc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-powerpc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sh-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sparc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-tile-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-xtensa-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* dma-add-calls-for-dma_map_page_attrs-and-dma_unmap_page_attrs.patch
* mm-add-support-for-releasing-multiple-instances-of-a-page.patch
* igb-update-driver-to-make-use-of-dma_attr_skip_cpu_sync.patch
* igb-update-code-to-better-handle-incrementing-page-count.patch
* relay-check-array-offset-before-using-it.patch
* kconfig-lib-kconfigdebug-fix-references-to-documenation.patch
* kconfig-lib-kconfigubsan-fix-reference-to-ubsan-documentation.patch
* kcov-add-more-missing-include.patch
* debug-more-properly-delay-for-secondary-cpus.patch
* kdb-remove-unused-kdb_event-handling.patch
* kdb-properly-synchronize-vkdb_printf-calls-with-other-cpus.patch
* kdb-call-vkdb_printf-from-vprintk_default-only-when-wanted.patch
* initramfs-select-builtin-initram-compression-algorithm-on-kconfig-instead-of-makefile.patch
* initramfs-allow-again-choice-of-the-embedded-initram-compression-algorithm.patch
* ipc-msg-make-msgrcv-work-with-long_min.patch
* ipc-fixed-warnings.patch
* posix-timers-give-lazy-compilers-some-help-optimizing-code-away.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* ktestpl-fix-english.patch
* watchdog-move-shared-definitions-to-nmih.patch
* watchdog-move-hardlockup-detector-to-separate-file.patch
* sparc-implement-watchdog_nmi_enable-and-watchdog_nmi_disable.patch
* ipc-sem-do-not-call-wake_sem_queue_do-prematurely.patch
* ipc-sem-rework-task-wakeups.patch
* ipc-sem-optimize-perform_atomic_semop.patch
* ipc-sem-explicitly-inline-check_restart.patch
* ipc-sem-use-proper-list-api-for-pending_list-wakeups.patch
* ipc-sem-simplify-wait-wake-loop.patch
* ipc-sem-avoid-idr-tree-lookup-for-interrupted-semop.patch
* mm-add-locked-parameter-to-get_user_pages_remote.patch
* mm-unexport-__get_user_pages_unlocked.patch
* mm-join-struct-fault_env-and-vm_fault.patch
* mm-use-vmf-address-instead-of-of-vmf-virtual_address.patch
* mm-use-pgoff-in-struct-vm_fault-instead-of-passing-it-separately.patch
* mm-use-passed-vm_fault-structure-in-__do_fault.patch
* mm-trim-__do_fault-arguments.patch
* mm-use-passed-vm_fault-structure-for-in-wp_pfn_shared.patch
* mm-add-orig_pte-field-into-vm_fault.patch
* mm-allow-full-handling-of-cow-faults-in-fault-handlers.patch
* mm-factor-out-functionality-to-finish-page-faults.patch
* mm-move-handling-of-cow-faults-into-dax-code.patch
* mm-factor-out-common-parts-of-write-fault-handling.patch
* mm-pass-vm_fault-structure-into-do_page_mkwrite.patch
* mm-use-vmf-page-during-wp-faults.patch
* mm-move-part-of-wp_page_reuse-into-the-single-call-site.patch
* mm-provide-helper-for-finishing-mkwrite-faults.patch
* mm-change-return-values-of-finish_mkwrite_fault.patch
* mm-export-follow_pte.patch
* dax-make-cache-flushing-protected-by-entry-lock.patch
* dax-protect-pte-modification-on-wp-fault-by-radix-tree-entry-lock.patch
* dax-clear-dirty-entry-tags-on-cache-flush.patch
* tools-add-warn_on_once.patch
* radix-tree-test-suite-allow-gfp_atomic-allocations-to-fail.patch
* radix-tree-test-suite-track-preempt_count.patch
* radix-tree-test-suite-free-preallocated-nodes.patch
* radix-tree-test-suite-make-runs-more-reproducible.patch
* radix-tree-test-suite-iteration-test-misuses-rcu.patch
* radix-tree-test-suite-benchmark-for-iterator.patch
* radix-tree-test-suite-use-rcu_barrier.patch
* radix-tree-test-suite-handle-exceptional-entries.patch
* radix-tree-test-suite-record-order-in-each-item.patch
* tools-add-more-bitmap-functions.patch
* radix-tree-test-suite-use-common-find-bit-code.patch
* radix-tree-fix-typo.patch
* radix-tree-move-rcu_head-into-a-union-with-private_list.patch
* radix-tree-create-node_tag_set.patch
* radix-tree-make-radix_tree_find_next_bit-more-useful.patch
* radix-tree-improve-dump-output.patch
* btrfs-fix-race-in-btrfs_free_dummy_fs_info.patch
* radix-tree-improve-multiorder-iterators.patch
* radix-tree-delete-radix_tree_locate_item.patch
* radix-tree-delete-radix_tree_range_tag_if_tagged.patch
* radix-tree-add-radix_tree_join.patch
* radix-tree-add-radix_tree_split.patch
* radix-tree-add-radix_tree_split_preload.patch
* radix-tree-fix-replacement-for-multiorder-entries.patch
* radix-tree-test-suite-check-multiorder-iteration.patch
* idr-add-ida_is_empty.patch
* tpm-use-idr_find-not-idr_find_slowpath.patch
* rxrpc-abstract-away-knowledge-of-idr-internals.patch
* idr-reduce-the-number-of-bits-per-level-from-8-to-6.patch
* radix-tree-test-suite-add-some-more-functionality.patch
* radix-tree-test-suite-cache-recently-freed-objects.patch
* radix-tree-ensure-counts-are-initialised.patch
* radix-tree-test-suite-add-new-tag-check.patch
* radix-tree-test-suite-delete-unused-rcupdatec.patch
i-need-old-gcc.patch
* arm64-setup-introduce-kaslr_offset.patch
* kcov-make-kcov-work-properly-with-kaslr-enabled.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-fix-crash-caused-by-stale-lvb-with-fsdlm-plugin.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
mm.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* z3fold-make-pages_nr-atomic.patch
* z3fold-extend-compaction-function.patch
* z3fold-use-per-page-spinlock.patch
* z3fold-discourage-use-of-pages-that-werent-compacted.patch
* z3fold-fix-header-size-related-issues.patch
* z3fold-fix-locking-issues.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* lib-add-crc64-ecma-module.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
linux-next.patch
linux-next-git-rejects.patch
* radix-tree-test-suite-fix-compilation.patch
* powerpc-ima-get-the-kexec-buffer-passed-by-the-previous-kernel.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* powerpc-ima-send-the-kexec-buffer-to-the-next-kernel.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* reimplement-idr-and-ida-using-the-radix-tree.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* linux-next: manual merge of the btrfs-kdave tree with Linus' tree
From: Stephen Rothwell @ 2016-12-14 23:25 UTC (permalink / raw)
To: David Sterba
Cc: linux-next, linux-kernel, Christoph Hellwig, Jens Axboe,
Jeff Mahoney
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/inode.c
between commit:
70fd76140a6c ("block,fs: use REQ_* flags directly")
from Linus' tree and commit:
da17066c4047 ("btrfs: pull node/sector/stripe sizes out of root and into fs_info")
from the btrfs-kdave 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/btrfs/inode.c
index a4c879671b9d,b2a577cf001f..000000000000
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@@ -7935,8 -7941,10 +7941,8 @@@ static int dio_read_error(struct inode
if ((failed_bio->bi_vcnt > 1)
|| (failed_bio->bi_io_vec->bv_len
- > BTRFS_I(inode)->root->sectorsize))
+ > btrfs_inode_sectorsize(inode)))
- read_mode = READ_SYNC | REQ_FAILFAST_DEV;
- else
- read_mode = READ_SYNC;
+ read_mode |= REQ_FAILFAST_DEV;
isector = start - btrfs_io_bio(failed_bio)->logical;
isector >>= inode->i_sb->s_blocksize_bits;
^ permalink raw reply
* [PATCH] platform/x86: thinkpad_acpi: Initialize local in_tablet_mode
From: Darren Hart @ 2016-12-14 23:10 UTC (permalink / raw)
To: Lyude, Henrique de Moraes Holschuh
Cc: platform-driver-x86, Linux Kernel Mailing List, linux-next,
Andy Shevchenko
linux-next reported in_tablet_mode may be used uninitialized after:
b31800283868 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")
This turns out to be a false positive as the pr_info call cannot be
reached if tp_features.hotkey_tablet (global scope) is 0, and
in_tablet_mode is assigned in both places tp_features.hotkey_tablet is
assigned.
Regardless, to make it explicit and avoid further reports, initialize
in_tablet_mode to 0.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Lyude <lyude@redhat.com>
Cc: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/thinkpad_acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 69cb0da..1c5a6e2 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3143,7 +3143,7 @@ typedef tpacpi_keymap_entry_t tpacpi_keymap_t[TPACPI_HOTKEY_MAP_LEN];
static int hotkey_init_tablet_mode(void)
{
- int in_tablet_mode, res;
+ int in_tablet_mode = 0, res;
char *type;
if (acpi_evalf(hkey_handle, &res, "MHKG", "qd")) {
--
2.9.3
--
Darren Hart
Intel Open Source Technology Center
^ permalink raw reply related
* Re: linux-next: build warning after merge of the drivers-x86 tree
From: Darren Hart @ 2016-12-14 22:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Lyude, Henrique de Moraes Holschuh,
Andy Shevchenko
In-Reply-To: <20161214222138.GA116314@f23x64.localdomain>
On Wed, Dec 14, 2016 at 02:21:38PM -0800, Darren Hart wrote:
> On Wed, Dec 14, 2016 at 01:50:44PM +1100, Stephen Rothwell wrote:
> > Hi Darren,
> >
> > After merging the drivers-x86 tree, today's linux-next build (x86_64
> > allmodconfig) produced this warning:
> >
> > In file included from include/linux/kernel.h:13:0,
> > from drivers/platform/x86/thinkpad_acpi.c:52:
> > drivers/platform/x86/thinkpad_acpi.c: In function 'hotkey_init':
> > include/linux/printk.h:299:2: warning: 'type' may be used uninitialized in this function [-Wmaybe-uninitialized]
> > printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
> > ^
> > drivers/platform/x86/thinkpad_acpi.c:3147:8: note: 'type' was declared here
> > char *type;
> > ^
> > In file included from include/linux/kernel.h:13:0,
> > from drivers/platform/x86/thinkpad_acpi.c:52:
> > include/linux/printk.h:299:2: warning: 'in_tablet_mode' may be used uninitialized in this function [-Wmaybe-uninitialized]
> > printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
> > ^
> > drivers/platform/x86/thinkpad_acpi.c:3146:6: note: 'in_tablet_mode' was declared here
> > int in_tablet_mode, res;
> > ^
> >
> > Introduced by commit
> >
> > b31800283868 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")
> >
> > I can't tell if this is a false positive or not.
>
> That's an uninitialized local variable. Not sure how I missed that. I'll
> fix it up today. Thank you for the report.
OK, no, it's a false positive because tp_features.hotkey_tablet is assigned in
both places where in_tablet_mode is assigned, and if the former is 0 (global
scope), the function returns without calling pr_info.
Lyude, Henrique, please confirm.
Regardless, I'll add a patch to init in_tablet_mode to 0 so it is explicit - but
will not rebase as it isn't technically an error.
--
Darren Hart
Intel Open Source Technology Center
^ permalink raw reply
* Re: linux-next: build warning after merge of the drivers-x86 tree
From: Darren Hart @ 2016-12-14 22:21 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Lyude, Henrique de Moraes Holschuh,
Andy Shevchenko
In-Reply-To: <20161214135044.57dc96f5@canb.auug.org.au>
On Wed, Dec 14, 2016 at 01:50:44PM +1100, Stephen Rothwell wrote:
> Hi Darren,
>
> After merging the drivers-x86 tree, today's linux-next build (x86_64
> allmodconfig) produced this warning:
>
> In file included from include/linux/kernel.h:13:0,
> from drivers/platform/x86/thinkpad_acpi.c:52:
> drivers/platform/x86/thinkpad_acpi.c: In function 'hotkey_init':
> include/linux/printk.h:299:2: warning: 'type' may be used uninitialized in this function [-Wmaybe-uninitialized]
> printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
> ^
> drivers/platform/x86/thinkpad_acpi.c:3147:8: note: 'type' was declared here
> char *type;
> ^
> In file included from include/linux/kernel.h:13:0,
> from drivers/platform/x86/thinkpad_acpi.c:52:
> include/linux/printk.h:299:2: warning: 'in_tablet_mode' may be used uninitialized in this function [-Wmaybe-uninitialized]
> printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
> ^
> drivers/platform/x86/thinkpad_acpi.c:3146:6: note: 'in_tablet_mode' was declared here
> int in_tablet_mode, res;
> ^
>
> Introduced by commit
>
> b31800283868 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")
>
> I can't tell if this is a false positive or not.
That's an uninitialized local variable. Not sure how I missed that. I'll
fix it up today. Thank you for the report.
--
Darren Hart
Intel Open Source Technology Center
^ permalink raw reply
* Re: linux-next x86 build fixes
From: Stephen Rothwell @ 2016-12-14 20:41 UTC (permalink / raw)
To: Luis R. Rodriguez
Cc: Nicholas Piggin, Borislav Petkov, linux-next, X86 ML,
Steven Rostedt, Adam Borowski, linux-kernel@vger.kernel.org
In-Reply-To: <CAB=NE6XSPhQsjXNPhfuUjjHruBvxt-EF5q4N_Lu2ndz5Uo7_qQ@mail.gmail.com>
Hi Luis,
On Wed, 14 Dec 2016 11:17:25 -0600 "Luis R. Rodriguez" <mcgrof@do-not-panic.com> wrote:
>
> Curious if the x86 symbol build issues are supposed to be resolved
> already on linux-next as of today, if not, how's it looking to get
> this fixed ? I am carrying around Adam's temporary patch "kbuild:
> provide include/asm/asm-prototypes.h for x86" on top of linux-next but
> each day I move on I keep seeing this is still not fixed and keep
> having to carry it. Curious what the delays are to get this resolved,
> the last thread I saw seemed to acknowledge the issue and that Nick
> was working on a fix ?
That commit will be in linux-next today (it was added to the kbuild
tree last night (my time)).
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Dec 14
From: Heiko Carstens @ 2016-12-14 20:07 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Stephen Rothwell, Martin Schwidefsky, Peter Oberparleiter,
linux-next@vger.kernel.org, LKML
In-Reply-To: <CAP=VYLqtuDk-wyHqrp8kySo6Uz4=5QQ_P5qweW_g9W9QkYmzmg@mail.gmail.com>
On Wed, Dec 14, 2016 at 11:25:49AM -0500, Paul Gortmaker wrote:
> On Tue, Dec 13, 2016 at 11:22 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Please do not add any material for v4.11 to your linux-next included
> > branches until after v4.10-rc1 has been released.
> >
> > Changes since 20161213:
> >
> > The vfs-miklos tree gained a conflict against the ubifs tree.
> >
> > The akpm-current tree gained a conflict against the jc_docs tree.
> >
> > Non-merge commits (relative to Linus' tree): 4498
> > 4320 files changed, 189429 insertions(+), 94239 deletions(-)
>
> New s390 build failure today:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/12883922/
>
> I reproduced it locally using the older korg s390 toolchain.
>
> Reverting this and the file compiles fine:
>
> commit d543a106f96d6f15e4507cf349128912d44356d9
> Author: Heiko Carstens <heiko.carstens@de.ibm.com>
> Date: Tue Dec 6 15:52:10 2016 +0100
>
> s390: fix initrd corruptions with gcov/kcov instrumented kernels
>
> Appears old toolchains don't like this commit.
>
> Paul.
Yes, a fix is ready to be merged soon:
https://git.kernel.org/cgit/linux/kernel/git/s390/linux.git/commit/?h=features&id=75a357341e7c9d3893405ea6f9d722036012dd1f
Thanks,
Heiko
^ permalink raw reply
* linux-next x86 build fixes
From: Luis R. Rodriguez @ 2016-12-14 17:17 UTC (permalink / raw)
To: Nicholas Piggin, Borislav Petkov
Cc: linux-next, X86 ML, Steven Rostedt, Adam Borowski,
linux-kernel@vger.kernel.org
Curious if the x86 symbol build issues are supposed to be resolved
already on linux-next as of today, if not, how's it looking to get
this fixed ? I am carrying around Adam's temporary patch "kbuild:
provide include/asm/asm-prototypes.h for x86" on top of linux-next but
each day I move on I keep seeing this is still not fixed and keep
having to carry it. Curious what the delays are to get this resolved,
the last thread I saw seemed to acknowledge the issue and that Nick
was working on a fix ?
Luis
^ permalink raw reply
* Re: linux-next: Tree for Dec 14
From: Paul Gortmaker @ 2016-12-14 16:25 UTC (permalink / raw)
To: Stephen Rothwell, Heiko Carstens, Martin Schwidefsky,
Peter Oberparleiter
Cc: linux-next@vger.kernel.org, LKML
In-Reply-To: <20161214152218.3a4fda3d@canb.auug.org.au>
On Tue, Dec 13, 2016 at 11:22 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Please do not add any material for v4.11 to your linux-next included
> branches until after v4.10-rc1 has been released.
>
> Changes since 20161213:
>
> The vfs-miklos tree gained a conflict against the ubifs tree.
>
> The akpm-current tree gained a conflict against the jc_docs tree.
>
> Non-merge commits (relative to Linus' tree): 4498
> 4320 files changed, 189429 insertions(+), 94239 deletions(-)
New s390 build failure today:
http://kisskb.ellerman.id.au/kisskb/buildresult/12883922/
I reproduced it locally using the older korg s390 toolchain.
Reverting this and the file compiles fine:
commit d543a106f96d6f15e4507cf349128912d44356d9
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue Dec 6 15:52:10 2016 +0100
s390: fix initrd corruptions with gcov/kcov instrumented kernels
Appears old toolchains don't like this commit.
Paul.
--
>
> ----------------------------------------------------------------------------
>
> 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
[...]
^ permalink raw reply
* Re: linux-next: build warning after merge of the btrfs-kdave tree
From: David Sterba @ 2016-12-14 15:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wang Xiaoguang
In-Reply-To: <20161207093819.1d4358b1@canb.auug.org.au>
On Wed, Dec 07, 2016 at 09:38:19AM +1100, Stephen Rothwell wrote:
> Hi David,
>
> On Mon, 28 Nov 2016 11:02:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the btrfs-kdave tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> >
> > fs/btrfs/inode.c: In function 'run_delalloc_range':
> > fs/btrfs/inode.c:1219:9: warning: 'cur_end' may be used uninitialized in this function [-Wmaybe-uninitialized]
> > start = cur_end + 1;
> > ^
> > fs/btrfs/inode.c:1172:6: note: 'cur_end' was declared here
> > u64 cur_end;
> > ^
> >
> > Introduced by commit
> >
> > cow_file_range_async ("btrfs: Introduce COMPRESS reserve type to fix false enospc for compression")
> >
> > Presumably a false positive because ASSERT(0) panics?
>
> Actually it does not if CONFIG_BTRFS_ASSERT is not set (which it isn't
> for the above build), so this is not a false positive. I am still
> seeing this.
Sorry for late reply. I've updatd the for-next branch now, the patches
introducing the warning have been removed temporarily. Arnd Bergmann
sent a patch to fix the warning, I'll make sure to include it so the
warning does not reappear.
^ permalink raw reply
* Re: Issue with DRM and "reimplement IDR and IDA using the radix tree"
From: Alexandre Courbot @ 2016-12-14 14:08 UTC (permalink / raw)
To: Matthew Wilcox, Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org
In-Reply-To: <fd3db206-8b3e-150f-a060-e88cc2f49606@nvidia.com>
Forgot to add the most relevant list for this issue (linux-next).
Stephen, maybe you will want to temporarily revert this patch until this
is cleared? This probably affects other users than DRM.
On 12/13/2016 04:14 PM, Alexandre Courbot wrote:
> Hi Matthew,
>
> Trying the latest -next on the Jetson TK1 board (with two different DRM
> devices and display and render), I noticed that the GPU device probe
> always failed with error -ENOSPC. After investigating I figured out that
> this was due to the minor device allocation failing when a second DRM
> device is added.
>
> More precisely, when drm_minor_alloc() is called with DRM_MINOR_PRIMARY
> (0) as argument for a second time, the call to idr_alloc() (which has a
> requested range of 0..64) fails instead of returning 1 as expected. Note
> that the first call is successful.
>
> Reverting "reimplement IDR and IDA using the radix tree" on 20161213's
> next fixes the issue for me, suggesting a bug may have slipped in there.
>
> Not sure how this could be fixed, so reporting the issue for now in case
> it is not known yet.
>
> Cheers,
> Alex.
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* next-20161214 build: 0 failures 1 warnings (next-20161214)
From: Build bot for Mark Brown @ 2016-12-14 13:24 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161214
Git describe: next-20161214
Commit: 9aa17b2861 Add linux-next specific files for 20161214
Build Time: 267 min 2 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 ../fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' 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:
../fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' 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
^ permalink raw reply
* [PATCH] ubifs: Initialize fstr_real_len
From: Richard Weinberger @ 2016-12-14 10:09 UTC (permalink / raw)
To: linux-mtd
Cc: linux-kernel, adrian.hunter, dedekind1, richard, david, sfr,
linux-next
While fstr_real_len is only being used under if (encrypted),
gcc-6 still warns.
Fixes this false positive:
fs/ubifs/dir.c: In function 'ubifs_readdir':
fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' may be used
uninitialized in this function [-Wmaybe-uninitialized]
fstr.len = fstr_real_len
Initialize fstr_real_len to make gcc happy.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Richard Weinberger <richard@nod.at>
---
fs/ubifs/dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 7f01f3d2ac3b..1c5331ac9614 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -528,7 +528,7 @@ static unsigned int vfs_dent_type(uint8_t type)
*/
static int ubifs_readdir(struct file *file, struct dir_context *ctx)
{
- int fstr_real_len, err = 0;
+ int fstr_real_len = 0, err = 0;
struct fscrypt_name nm;
struct fscrypt_str fstr = {0};
union ubifs_key key;
--
2.10.2
^ permalink raw reply related
* Re: linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2016-12-14 8:26 UTC (permalink / raw)
To: Richard Weinberger
Cc: Ingo Molnar, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Artem Bityutskiy, linux-next, linux-kernel,
David Gstir
In-Reply-To: <bd5e8291-5ace-eb83-5b63-6af8957376bf@nod.at>
Hi Richard,
On Wed, 14 Dec 2016 09:05:10 +0100 Richard Weinberger <richard@nod.at> wrote:
>
> The commit comes via my UBIFS tree. But I never saw this warning, I'm testing with both gcc-4.8 and gcc-6.1.
> Let me investigate into that.
>
> Does today's tip change some compiler flags?
Linus' tree commit
a76bcf557ef4 ("Kbuild: enable -Wmaybe-uninitialized warning for "make W=1"")
was introduced between -rc4 and -rc5 so it is not in your tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Richard Weinberger @ 2016-12-14 8:05 UTC (permalink / raw)
To: Ingo Molnar, Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Artem Bityutskiy, linux-next, linux-kernel, David Gstir
In-Reply-To: <20161214072411.GA1635@gmail.com>
Stephen, Ingo,
CC'ing David.
On 14.12.2016 08:24, Ingo Molnar wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>>
>> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
>> produced this warning:
>>
>> fs/ubifs/dir.c: In function 'ubifs_readdir':
>> fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' may be used uninitialized in this function [-Wmaybe-uninitialized]
>> fstr.len = fstr_real_len;
>> ^
>>
>> Introduced by commit
>>
>> f4f61d2cc6d8 ("ubifs: Implement encrypted filenames")
>>
>> This is a false positive because assignment and use are both protected by
>> "if (encrypted)".
>>
>> I have no idea why this did not turn up earlier in my builds.
>
> FYI, f4f61d2cc6d8 is not in the -tip tree, so it cannot possibly have introduced
> this warning.
The commit comes via my UBIFS tree. But I never saw this warning, I'm testing with both gcc-4.8 and gcc-6.1.
Let me investigate into that.
Does today's tip change some compiler flags?
Thanks,
//richard
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2016-12-14 8:10 UTC (permalink / raw)
To: Ingo Molnar
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Artem Bityutskiy, linux-next, linux-kernel, Richard Weinberger
In-Reply-To: <20161214072411.GA1635@gmail.com>
Hi Ingo,
On Wed, 14 Dec 2016 08:24:11 +0100 Ingo Molnar <mingo@kernel.org> wrote:
>
> FYI, f4f61d2cc6d8 is not in the -tip tree, so it cannot possibly have introduced
> this warning.
Yeah, I know, but the warning only seemed to happen after merging the
tip tree. I would have expected it to appear much earlier like when I
merged the ubifs tree. I figured that out, but forgot to mention it,
sorry.
Actually I just checked and it did turn up then, but my heuristics did
not point it out :-(
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warning after merge of the tip tree
From: Ingo Molnar @ 2016-12-14 7:24 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Artem Bityutskiy, linux-next, linux-kernel, Richard Weinberger
In-Reply-To: <20161214132828.1d128963@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> fs/ubifs/dir.c: In function 'ubifs_readdir':
> fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' may be used uninitialized in this function [-Wmaybe-uninitialized]
> fstr.len = fstr_real_len;
> ^
>
> Introduced by commit
>
> f4f61d2cc6d8 ("ubifs: Implement encrypted filenames")
>
> This is a false positive because assignment and use are both protected by
> "if (encrypted)".
>
> I have no idea why this did not turn up earlier in my builds.
FYI, f4f61d2cc6d8 is not in the -tip tree, so it cannot possibly have introduced
this warning.
Thanks,
Ingo
^ permalink raw reply
* linux-next: Tree for Dec 14
From: Stephen Rothwell @ 2016-12-14 4:22 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any material for v4.11 to your linux-next included
branches until after v4.10-rc1 has been released.
Changes since 20161213:
The vfs-miklos tree gained a conflict against the ubifs tree.
The akpm-current tree gained a conflict against the jc_docs tree.
Non-merge commits (relative to Linus' tree): 4498
4320 files changed, 189429 insertions(+), 94239 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 245 trees (counting Linus' and 35 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (b92e09bb5bf4 Merge branch 'for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs)
Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU)
Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions")
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (dadc4a1bb9f0 powerpc/64: Fix placement of .text to be immediately following .head.text)
Merging sparc/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging net/master (3e1ed981b7a9 netlink: revert broken, broken "2-clause nla_ok()")
Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging netfilter/master (a220871be66f virtio-net: correctly enable multiqueue)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs)
Merging mac80211/master (d8da0b5d64d5 mac80211: Ensure enough headroom when forwarding mesh pkt)
Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change)
Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX))
Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (e5517c2a5a49 Linux 4.9-rc7)
Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match())
Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5)
Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5)
Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277)
Merging crypto-current/master (04b46fbdea5e crypto: testmgr - fix overlap in chunked tests again)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (69973b830859 Linux 4.9)
Merging drm-misc-fixes/for-linux-next-fixes (e94bd1736f1f drm: Don't call drm_for_each_crtc with a non-KMS driver)
Merging kbuild/for-next (106834d45bad Merge branch 'kbuild/misc' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (b4871f457978 Merge branch 'syscalls' into for-next)
Merging arm-perf/for-next/perf (f43365ee17f8 selftests: arm64: add test for unaligned/inexact watchpoint handling)
Merging arm-soc/for-next (b15ec88e89d1 arm-soc: document merges)
CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7796.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7795.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-rcar-gen2.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7794.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7793.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7792.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7791.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7779.dtsi
Merging amlogic/for-next (b21a5fc2bb8a Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (242a001e48b7 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (5cfcfe81e33b Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (4aecea63ed81 Merge branch 'omap-for-v4.10/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (bbf9c90768f9 Merge tag 'qcom-dts-for-4.10-2' into all-for-4.10-part2)
Merging renesas/next (411253aa4a68 Merge branch 'fixes-for-v4.10' into next)
CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile
Merging rockchip/for-next (7e02e53c6ecf Merge branch 'v4.10-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (4ed7dc2785f8 Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (75037120e62b arm64: Disable PAN on uaccess_enable())
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
Applying: arm64: merge fix for code movement to cpucaps.h
Merging clk/clk-next (2aab7a2055a1 clk: bcm: Fix 'maybe-uninitialized' warning in bcm2835_clock_choose_div_and_prate())
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (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 (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (07c65a665b8d m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (57b47febc193 Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (7c7808ce107d openrisc: prevent VGA console, fix builds)
Merging parisc-hd/for-next (82cbd568bc5a parisc: perf: return -EFAULT on error)
Merging powerpc/next (ff45000fcb56 powerpc/boot: Request no dynamic linker for boot wrapper)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c19805f870c1 s390/cpumf: Use configuration level indication for sampling data)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (986ee488b9fd Merge branch 'for-next-next-4.9-20161125' into for-next-20161125)
Merging ceph/master (dc24de82d61b ceph: properly set issue_seq for cap release)
Merging cifs/for-next (96a988ffeb90 CIFS: Fix a possible double locking of mutex during reconnect)
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 (5716863e0f82 fsnotify: Fix possible use-after-free in inode iteration on umount)
Merging ext4/dev (a551d7c8deef Merge branch 'fscrypt' into dev)
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in fs/dax.c
Merging f2fs/dev (c0ed4405a99e f2fs: fix a missing size change in f2fs_setattr)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (c01638f5d919 fuse: fix clearing suid, sgid for chown())
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (2549f307b599 Merge tag 'nfs-rdma-4.10-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma)
Merging nfsd/nfsd-next (3eb15f282846 sunrpc: use DEFINE_SPINLOCK())
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (1fb52aea5039 ovl: fix return value of ovl_fill_super)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (ec9160dacdb0 ubifs: Use fscrypt ioctl() helpers)
Merging xfs/for-next (9807b773dad4 Merge branch 'xfs-4.10-misc-fixes-4' into for-next)
CONFLICT (content): Merge conflict in include/linux/iomap.h
Applying: iomap: fix up for blk_poll and WRITE_ODIRECT change
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (225c4443ef3b Merge branch 'work.autofs' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_reflink.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
CONFLICT (modify/delete): fs/logfs/dev_bdev.c deleted in vfs/for-next and modified in HEAD. Version HEAD of fs/logfs/dev_bdev.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/statahead.c
$ git rm -f fs/logfs/dev_bdev.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (a2c55f286b95 Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/ubifs/file.c
CONFLICT (content): Merge conflict in fs/read_write.c
Merging pci/next (b08d2e61a6f9 Merge branch 'pci/host-vmd' into next)
Merging pstore/for-next/pstore (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe)
Merging hid/for-next (43768c4daf54 Merge branches 'for-4.10/upstream' and 'for-4.10/i2c-hid-nopower' into for-next)
Merging i2c/i2c/for-next (8641b29652af Merge branch 'i2c/for-4.10' 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 (27ec191a79ca firmware: dmi_scan: Always show system identification string)
Merging hwmon-staging/hwmon-next (4fccd4a1e894 hwmon: (g762) Fix overflows and crash seen when writing limit attributes)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merging jc_docs/docs-next (63d0977c0e85 lib/Kconfig.debug: correct documentation paths)
Merging v4l-dvb/master (bf0396ea4727 Merge branch 'patchwork' into to_next)
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg left in tree.
$ git rm -f Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
Merging pm/linux-next (fb4ad1d7e562 Merge branches 'powercap' and 'pm-sleep' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (0faf7dd5a947 MAINTAINERS: Samsung: Update maintainer for PWM FAN and SAMSUNG THERMAL)
Merging thermal-soc/next (6ee459f5f967 devfreq_cooling: pass a pointer to devfreq in the power model callbacks)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (d29fa0cb7602 swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support)
Merging net-next/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging ipsec-next/master (d4aea20d889e tun: Use netif_receive_skb instead of netif_rx)
Merging netfilter-next/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (d15697de60db adm80211: add checks for dma mapping errors)
Merging bluetooth/master (107bc0aa95ca Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging mac80211-next/master (445cd452fe51 mac80211: Use appropriate name for functions and messages)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (92363f1cfe75 Merge remote-tracking branch 'origin/topic/shared-for-4.10' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (445caaa20c4d mtd: Allocate bdi objects dynamically)
Merging nand/nand/next (8fcfba072420 mtd: nand: tango: Use nand_to_mtd() instead of directly accessing chip->mtd)
Merging crypto/master (04b46fbdea5e crypto: testmgr - fix overlap in chunked tests again)
Merging drm/drm-next (2cf026ae85c4 Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next)
Merging drm-panel/drm/panel/for-next (8c31f6034b24 drm/panel: simple: Add support for AUO G185HAN01)
Merging drm-intel/for-linux-next (7a9e10253e9e drm/i915: Move priority bumping for flips earlier)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (6449b088dd51 drm: Add fake controlD* symlinks for backwards compat)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (63e8e44adfdc Merge branch 'sunxi/dt-late-for-4.10' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3.dtsi
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (5c55e10a1934 Merge remote-tracking branch 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change)
Merging sound-asoc/for-next (a5de5b74a501 Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo)
Merging input/next (34888602eb99 Input: drv260x - use generic device properties)
Merging block/for-next (348c1dced6b1 Merge branch 'for-4.10/block' into for-next)
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (f397c8d80a5e mmc: block: Move files to core)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (2953079c692d md: separate flags for superblock changes)
CONFLICT (content): Merge conflict in drivers/md/raid5-cache.c
CONFLICT (content): Merge conflict in drivers/md/md.c
Merging mfd/for-mfd-next (93559191e71b mfd: tps65217: Support an interrupt pin as the system wakeup)
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (6480af4915d6 power_supply: wm97xx_battery: use power_supply_get_drvdata)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (d00b74613fb1 Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next)
Merging security/next (50523a29d900 Yama: allow access for the current ptrace parent)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (4a49d45dd589 selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces)
Merging tpmdd/next (9430066a15d6 tpm: adjust return value of tpm_read_log)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (1465f481460c Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next)
CONFLICT (content): Merge conflict in drivers/base/power/main.c
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (ea4b640c39d8 NTB: correct ntb_spad_count comment typo)
CONFLICT (content): Merge conflict in Documentation/admin-guide/reporting-bugs.rst
Merging audit/next (5b52b1d37a6f netns: avoid disabling irq for netns id)
CONFLICT (content): Merge conflict in net/core/net_namespace.c
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (61eb3a04f978 dt: pwm: bcm2835: fix typo in clocks property name)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (16ae16c6e561 Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc)
Merging spi/for-next (62fadc72674e Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic/ti-qspi', 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (6667e83fdc5d Merge branch 'x86/timers')
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (a2e4c787f75b EDAC: Document HW_EVENT_ERR_DEFERRED type)
Merging edac-amd/for-next (0de2788447b6 EDAC, amd64: Fix improper return value)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (3dbb16b87b57 selftests: ftrace: Shift down default message verbosity)
Merging rcu/rcu/next (6190aaafd06c Merge branches 'doc.2016.11.14a', 'fixes.2016.11.14a', 'list.2016.10.31a' and 'torture.2016.11.14a' into HEAD)
Merging kvm/linux-next (36da91bdf568 KVM: x86: Handle the kthread worker using the new API)
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
Merging kvms390/next (e1788bb995be KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load)
Merging xen-tip/linux-next (709613ad2b3c xen/balloon: Only mark a page as managed when it is released)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (1d161d4cd719 platform/x86: dell-laptop: Use brightness_set_blocking for kbd_led_level_set)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (44b3e31d540e leds: pca955x: Add ACPI support)
Merging ipmi/for-next (070cbd1d42aa ipmi: create hardware-independent softdep for ipmi_devintf)
Merging driver-core/driver-core-next (5d47ec02c37e firmware: Correct handling of fw_state_wait() return value)
Merging tty/tty-next (a9b01b5823f7 serial: 8250_mid fix calltrace when hotplug 8250 serial controller)
Merging usb/usb-next (d8a12b7117b4 USB: serial: option: add dlink dwm-158)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (3c3dd1e058cb USB: serial: kl5kusb105: abort on open exception path)
Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API)
Merging phy-next/next (5e253dfbdbea phy: rockchip-inno-usb2: select USB_COMMON)
Merging staging/staging-next (3e0f9b2ca8e4 staging: comedi: comedidev.h: Document usage of 'detach' handler)
Merging char-misc/char-misc-next (190cc65e912d uio-hv-generic: store physical addresses instead of virtual)
Merging extcon/extcon-next (669ae5dabe7a extcon: palmas: Check the parent instance to prevent the NULL)
Merging slave-dma/next (6fa8619369e3 Merge branch 'for-linus' into next)
Merging cgroup/for-next (89bb3eed858e cgroup: cgroup_sk_alloc() is allowed to increase reference on a dead cgroup)
Merging scsi/for-next (02cf5abb4d9e Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (ae2aae242198 scsi: aacraid: remove wildcard for series 9 controllers)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (7ddf6a387c68 Merge branch 'for-4.10' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging rpmsg/for-next (d85a9aa0a775 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (acf1fcf77247 Merge branch 'thread-irq-simpler' into devel)
Merging pinctrl/for-next (f82144450874 pinctrl: sx150x: use new nested IRQ infrastructure)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (fdd3ff4db177 Merge branch 'for-4.10/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (19339c251607 Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC")
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (22f6592b23ef selftest/gpio: add gpio test case)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (59024954a1e7 Documentation/livepatch: Fix stale link to gmame)
Merging coresight/next (e615a9a8e481 coresight: perf: Add a missing call to etm_free_aux)
Merging rtc/rtc-next (05d226088a6b rtc: mcp795: Fix whitespace and indentation.)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (abca2d5b305b Merge branch 'for-4.10/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (31201b24f555 ipc/shm.c: coding style fixes)
CONFLICT (content): Merge conflict in lib/Kconfig.debug
$ git checkout -b akpm remotes/origin/akpm/master
Applying: posix-timers: give lazy compilers some help optimizing code away
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: radix tree test suite: fix compilation
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Applying: ipc/sem: do not call wake_sem_queue_do() prematurely
Applying: ipc/sem: rework task wakeups
Applying: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Applying: ipc-sem-rework-task-wakeups-checkpatch-fixes
Applying: ipc/sem: optimize perform_atomic_semop()
Applying: ipc/sem: ensure we left shift a ULL rather than a 32 bit integer
Applying: ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes
Applying: ipc/sem: explicitly inline check_restart
Applying: ipc/sem: use proper list api for pending_list wakeups
Applying: ipc/sem: simplify wait-wake loop
Applying: ipc-sem-simplify-wait-wake-loop-checkpatch-fixes
Applying: ipc/sem: avoid idr tree lookup for interrupted semop
Applying: mm: add locked parameter to get_user_pages_remote()
Applying: vfio iommu type1: merge fix for get_user_pages_remote API change
Applying: mm: unexport __get_user_pages_unlocked()
Applying: mm-unexport-__get_user_pages_unlocked-checkpatch-fixes
Applying: mm: join struct fault_env and vm_fault
Applying: mm: use vmf->address instead of of vmf->virtual_address
Applying: mm: use pgoff in struct vm_fault instead of passing it separately
Applying: mm: use passed vm_fault structure in __do_fault()
Applying: mm: trim __do_fault() arguments
Applying: mm: use passed vm_fault structure for in wp_pfn_shared()
Applying: mm: add orig_pte field into vm_fault
Applying: mm: allow full handling of COW faults in ->fault handlers
Applying: mm: factor out functionality to finish page faults
Applying: mm: move handling of COW faults into DAX code
Applying: mm: factor out common parts of write fault handling
Applying: mm: pass vm_fault structure into do_page_mkwrite()
Applying: mm: use vmf->page during WP faults
Applying: mm: move part of wp_page_reuse() into the single call site
Applying: mm: provide helper for finishing mkwrite faults
Applying: mm: change return values of finish_mkwrite_fault()
Applying: mm: export follow_pte()
Applying: dax: make cache flushing protected by entry lock
Applying: dax: protect PTE modification on WP fault by radix tree entry lock
Applying: dax: clear dirty entry tags on cache flush
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Applying: tools: add WARN_ON_ONCE
Applying: radix tree test suite: allow GFP_ATOMIC allocations to fail
Applying: radix tree test suite: track preempt_count
Applying: radix tree test suite: free preallocated nodes
Applying: radix tree test suite: make runs more reproducible
Applying: radix tree test suite: iteration test misuses RCU
Applying: radix tree test suite: benchmark for iterator
Applying: radix tree test suite: use rcu_barrier
Applying: radix tree test suite: handle exceptional entries
Applying: radix tree test suite: record order in each item
Applying: tools: add more bitmap functions
Applying: radix tree test suite: use common find-bit code
Applying: radix-tree: fix typo
Applying: radix-tree: move rcu_head into a union with private_list
Applying: radix-tree: create node_tag_set()
Applying: radix-tree: make radix_tree_find_next_bit more useful
Applying: radix-tree: improve dump output
Applying: btrfs: fix race in btrfs_free_dummy_fs_info()
Applying: radix-tree: improve multiorder iterators
Applying: radix-tree: delete radix_tree_locate_item()
Applying: radix-tree: delete radix_tree_range_tag_if_tagged()
Applying: radix-tree: add radix_tree_join
Applying: radix-tree: add radix_tree_split
Applying: radix-tree: add radix_tree_split_preload()
Applying: radix-tree: fix replacement for multiorder entries
Applying: radix tree test suite: check multiorder iteration
Applying: idr: add ida_is_empty
Applying: tpm: use idr_find(), not idr_find_slowpath()
Applying: rxrpc: abstract away knowledge of IDR internals
Applying: idr: reduce the number of bits per level from 8 to 6
Applying: radix tree test suite: add some more functionality
Applying: reimplement IDR and IDA using the radix tree
Merging akpm/master (79e00abc68d9 reimplement IDR and IDA using the radix tree)
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the jc_docs tree
From: Stephen Rothwell @ 2016-12-14 3:42 UTC (permalink / raw)
To: Andrew Morton, Jonathan Corbet
Cc: linux-next, linux-kernel, Hans Holmberg, Andreas Platschek
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
lib/Kconfig.debug
between commit:
63d0977c0e85 ("lib/Kconfig.debug: correct documentation paths")
from the jc_docs tree and commit:
2c81218d9f29 ("Kconfig: lib/Kconfig.debug: fix references to Documenation")
from the akpm-current tree.
I fixed it up (I just used the version from the jc_docs tree) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the drivers-x86 tree
From: Stephen Rothwell @ 2016-12-14 2:50 UTC (permalink / raw)
To: Darren Hart; +Cc: linux-next, linux-kernel, Lyude, Henrique de Moraes Holschuh
Hi Darren,
After merging the drivers-x86 tree, today's linux-next build (x86_64
allmodconfig) produced this warning:
In file included from include/linux/kernel.h:13:0,
from drivers/platform/x86/thinkpad_acpi.c:52:
drivers/platform/x86/thinkpad_acpi.c: In function 'hotkey_init':
include/linux/printk.h:299:2: warning: 'type' may be used uninitialized in this function [-Wmaybe-uninitialized]
printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
^
drivers/platform/x86/thinkpad_acpi.c:3147:8: note: 'type' was declared here
char *type;
^
In file included from include/linux/kernel.h:13:0,
from drivers/platform/x86/thinkpad_acpi.c:52:
include/linux/printk.h:299:2: warning: 'in_tablet_mode' may be used uninitialized in this function [-Wmaybe-uninitialized]
printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
^
drivers/platform/x86/thinkpad_acpi.c:3146:6: note: 'in_tablet_mode' was declared here
int in_tablet_mode, res;
^
Introduced by commit
b31800283868 ("platform/x86: thinkpad_acpi: Move tablet detection into separate function")
I can't tell if this is a false positive or not.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the tip tree
From: Stephen Rothwell @ 2016-12-14 2:28 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Artem Bityutskiy
Cc: linux-next, linux-kernel, Richard Weinberger
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
fs/ubifs/dir.c: In function 'ubifs_readdir':
fs/ubifs/dir.c:629:13: warning: 'fstr_real_len' may be used uninitialized in this function [-Wmaybe-uninitialized]
fstr.len = fstr_real_len;
^
Introduced by commit
f4f61d2cc6d8 ("ubifs: Implement encrypted filenames")
This is a false positive because assignment and use are both protected by
"if (encrypted)".
I have no idea why this did not turn up earlier in my builds.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* mmotm git tree since-4.9 branch created (was: mmotm 2016-12-12-17-02 uploaded)
From: Michal Hocko @ 2016-12-13 13:52 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, broonie
In-Reply-To: <584f48d9.dfBrttZ3CZ8rJ1M2%akpm@linux-foundation.org>
I have just created since-4.9 branch in mm git tree
(http://git.kernel.org/?p=linux/kernel/git/mhocko/mm.git;a=summary). It
is based on v4.9 tag in Linus tree and mmotm-2016-12-12-17-02.
Tracking all the dax related changes was quite challenging but I hope I
have it all. I have pulled from
- Dave's tree: dax-4.10-iomap-pmd, xfs-4.10-misc-fixes-2,
iomap-4.10-directio
- Ted's tree: dev
- Dan's tree: libnvdimm-for-next
Let me know if I am missing anything, please.
As usual mmotm trees are tagged with signed tag
(finger print BB43 1E25 7FB8 660F F2F1 D22D 48E2 09A2 B310 E347)
The shortlog says:
Alexey Dobriyan (8):
proc: make struct pid_entry::len unsigned
proc: make struct struct map_files_info::len unsigned int
proc: just list_del() struct pde_opener
proc: fix type of struct pde_opener::closing field
proc: kmalloc struct pde_opener
proc: tweak comments about 2 stage open and everything
fs/proc/base.c: save decrement during lookup/readdir in /proc/$PID
fs/proc: calculate /proc/* and /proc/*/task/* nlink at init time
Andi Kleen (1):
mm/mprotect.c: don't touch single threaded PTEs which are on the right node
Andreas Platschek (1):
kmemleak: fix reference to Documentation
Andrew Morton (7):
include/linux/backing-dev-defs.h: shrink struct backing_dev_info
scripts/checkpatch.pl: fix spelling
mm-compaction-allow-compaction-for-gfp_nofs-requests-fix
ipc-sem-rework-task-wakeups-checkpatch-fixes
ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes
ipc-sem-simplify-wait-wake-loop-checkpatch-fixes
mm-unexport-__get_user_pages_unlocked-checkpatch-fixes
Andrey Ryabinin (4):
mm: add vfree_atomic()
kernel/fork: use vfree_atomic() to free thread stack
x86/ldt: use vfree_atomic() to free ldt entries
kasan: turn on -fsanitize-address-use-after-scope
Aneesh Kumar K.V (9):
mm/hugetlb.c: use the right pte val for compare in hugetlb_cow
mm/hugetlb.c: use huge_pte_lock instead of opencoding the lock
mm: use the correct page size when removing the page
mm: update mmu_gather range correctly
mm/hugetlb: add tlb_remove_hugetlb_entry for handling hugetlb pages
mm: add tlb_remove_check_page_size_change to track page size change
mm: remove the page size change check in tlb_remove_page
mm: move vma_is_anonymous check within pmd_move_must_withdraw
mm: THP page cache support for ppc64
Arnd Bergmann (2):
slub: avoid false-postive warning
shmem: avoid maybe-uninitialized warning
Babu Moger (3):
kernel/watchdog.c: move shared definitions to nmi.h
kernel/watchdog.c: move hardlockup detector to separate file
sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Benjamin Peterson (1):
compiler-gcc.h: use "proved" instead of "proofed"
Bhumika Goyal (2):
fs: xfs: xfs_icreate_item: constify xfs_item_ops structure
fs: xfs: libxfs: constify xfs_nameops structures
Brian Foster (6):
xfs: don't skip cow forks w/ delalloc blocks in cowblocks scan
xfs: don't BUG() on mixed direct and mapped I/O
xfs: fix unbalanced inode reclaim flush locking
xfs: track preallocation separately in xfs_bmapi_reserve_delalloc()
xfs: clean up cow fork reservation and tag inodes correctly
xfs: pass post-eof speculative prealloc blocks to bmapi
Chandan Rajendra (2):
ext4: fix mballoc breakage with 64k block size
ext4: fix stack memory corruption with 64k block size
Christoph Hellwig (23):
xfs: new inode extent list lookup helpers
xfs: cleanup xfs_bmap_last_before
xfs: use new extent lookup helpers in xfs_bmapi_read
xfs: use new extent lookup helpers in xfs_bmapi_write
xfs: use new extent lookup helpers in __xfs_bunmapi
xfs: remove prev argument to xfs_bmapi_reserve_delalloc
xfs: use new extent lookup helpers xfs_file_iomap_begin_delay
xfs: use new extent lookup helpers in __xfs_reflink_reserve_cow
xfs: cleanup xfs_reflink_find_cow_mapping
xfs: use new extent lookup helpers in xfs_reflink_trim_irec_to_next_cow
xfs: use new extent lookup helpers in xfs_reflink_cancel_cow_blocks
xfs: use new extent lookup helpers in xfs_reflink_end_cow
xfs: remove xfs_bmap_search_extents
xfs: remove NULLEXTNUM
xfs: remove i_iolock and use i_rwsem in the VFS inode instead
fs: make sb_init_dio_done_wq available outside of direct-io.c
iomap: implement direct I/O
xfs: use iomap_dio_rw
mm: remove free_unmap_vmap_area_noflush()
mm: remove free_unmap_vmap_area_addr()
mm: refactor __purge_vmap_area_lazy()
mm: mark all calls into the vmalloc subsystem as potentially sleeping
mm: turn vmap_purge_lock into a mutex
Colin Ian King (1):
ipc/sem: ensure we left shift a ULL rather than a 32 bit integer
Daeho Jeong (1):
ext4: fix inode checksum calculation problem if i_extra_size is small
Dan Carpenter (2):
ext4: remove another test in ext4_alloc_file_blocks()
ext4: return -ENOMEM instead of success
Dan Williams (15):
libnvdimm: allow a platform to force enable label support
tools/testing/nvdimm: dynamic label support
libnvdimm: use consistent naming for request_mem_region()
dax: add region-available-size attribute
dax: add region 'id', 'size', and 'align' attributes
dax: register seed device
dax: use multi-order radix for resource lookup
dax: refactor locking out of size calculation routines
dax: sub-division support
dax: add / remove dax devices after provisioning
dax: add debug for region available_size
libnvdimm, pfn: fix align attribute
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
Merge branch 'for-4.10/dax' into libnvdimm-for-next
mm: disable numa migration faults for dax vmas
Daniel Vetter (1):
lib/ida: document locking requirements a bit better
Darrick J. Wong (3):
xfs: factor rmap btree size into the indlen calculations
xfs: always succeed when deduping zero bytes
ext4: reject inodes with negative size
Dave Chinner (1):
Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
Dave Jiang (1):
libnvdimm: check and clear poison before writing to pmem
Dave Young (1):
lib/Kconfig.debug: make CONFIG_STRICT_DEVMEM depend on CONFIG_DEVMEM
David Gstir (11):
fscrypt: Add in-place encryption mode
fscrypt: Allow fscrypt_decrypt_page() to function with non-writeback pages
fscrypt: Enable partial page encryption
fscrypt: Constify struct inode pointer
fscrypt: Let fs select encryption index/tweak
fscrypt: Use correct index in decrypt path.
fscrypt: Never allocate fscrypt_ctx on in-place encryption
fscrypt: Cleanup fscrypt_{decrypt,encrypt}_page()
fscrypt: Cleanup page locking requirements for fscrypt_{decrypt,encrypt}_page()
fscrypt: Delay bounce page pool allocation until needed
fscrypt: Rename FS_WRITE_PATH_FL to FS_CTX_HAS_BOUNCE_BUFFER_FL
David Rientjes (2):
mm, slab: maintain total slab count instead of active count
mm, thp: avoid unlikely branches for split_huge_pmd
Davidlohr Bueso (7):
ipc/sem: do not call wake_sem_queue_do() prematurely
ipc/sem: rework task wakeups
ipc/sem: optimize perform_atomic_semop()
ipc/sem: explicitly inline check_restart
ipc/sem: use proper list api for pending_list wakeups
ipc/sem: simplify wait-wake loop
ipc/sem: avoid idr tree lookup for interrupted semop
Deepa Dinamani (1):
ext4: use current_time() for inode timestamps
Dmitry Vyukov (2):
kasan: support panic_on_warn
kasan: eliminate long stalls during quarantine reduction
Eric Biggers (16):
fscrypto: don't use on-stack buffer for filename encryption
fscrypto: don't use on-stack buffer for key derivation
ext4: avoid lockdep warning when inheriting encryption context
ext4: get rid of ext4_sb_has_crypto()
ext4: disable pwsalt ioctl when encryption disabled by config
ext4: forbid i_extra_isize not divisible by 4
ext4: don't read out of bounds when checking for in-inode xattrs
ext4: correctly detect when an xattr value has an invalid size
mbcache: correctly handle 'e_referenced' bit
mbcache: don't BUG() if entry cache cannot be allocated
mbcache: remove unnecessary module_get/module_put
mbcache: use consistent type for entry count
mbcache: document that "find" functions only return reusable entries
MAINTAINERS: fscrypto: recommend linux-fsdevel for fscrypto patches
fscrypto: remove unneeded Kconfig dependencies
fscrypto: move ioctl processing more fully into common code
Eric Sandeen (4):
xfs: fix up xfs_swap_extent_forks inline extent handling
xfs: provide helper for counting extents from if_bytes
ext4: fix mmp use after free during unmount
xfs: add XBF_XBF_NO_IOACCT to buf trace output
Eric Whitney (2):
ext4: allow inode expansion for nojournal file systems
ext4: remove parameter from ext4_xattr_ibody_set()
Eryu Guan (1):
ext4: validate s_first_meta_bg at mount time
Fabian Frederick (4):
Documentation: fix description of ext4's block_validity mount option
libnvdimm: remove else after return in nsio_rw_bytes()
libnvdimm, namespace: avoid multiple sector calculations
libnvdimm, namespace: use octal for permissions
Greg Thelen (1):
mm, slab: faster active and free stats
Heiko Carstens (1):
mm/pkeys: generate pkey system call code only if ARCH_HAS_PKEYS is selected
Hugh Dickins (3):
mm: add three more cond_resched() in swapoff
mm: add cond_resched() in gather_pte_stats()
mm: make transparent hugepage size public
Jan Kara (37):
dax: Introduce IOMAP_FAULT flag
ext4: factor out checks from ext4_file_write_iter()
ext4: only set S_DAX if DAX is really supported
ext4: convert DAX reads to iomap infrastructure
ext4: use iomap for zeroing blocks in DAX mode
ext4: DAX iomap write support
ext4: avoid split extents for DAX writes
ext4: convert DAX faults to iomap infrastructure
ext4: rip out DAX handling from direct IO path
ext2: use iomap_zero_range() for zeroing truncated page in DAX path
dax: rip out get_block based IO support
ext4: Add select for CONFIG_FS_IOMAP
ext4: add EXT4_JOURNAL_DATA_FL and EXT4_EXTENTS_FL to modifiable mask
ext4: be more strict when verifying flags set via SETFLAGS ioctls
ext4: warn when page is dirtied without buffers
ext4: fix checks for data=ordered and journal_async_commit options
dax: Fix sleep in atomic contex in grab_mapping_entry()
mm: join struct fault_env and vm_fault
mm: use vmf->address instead of of vmf->virtual_address
mm: use pgoff in struct vm_fault instead of passing it separately
mm: use passed vm_fault structure in __do_fault()
mm: trim __do_fault() arguments
mm: use passed vm_fault structure for in wp_pfn_shared()
mm: add orig_pte field into vm_fault
mm: allow full handling of COW faults in ->fault handlers
mm: factor out functionality to finish page faults
mm: move handling of COW faults into DAX code
mm: factor out common parts of write fault handling
mm: pass vm_fault structure into do_page_mkwrite()
mm: use vmf->page during WP faults
mm: move part of wp_page_reuse() into the single call site
mm: provide helper for finishing mkwrite faults
mm: change return values of finish_mkwrite_fault()
mm: export follow_pte()
dax: make cache flushing protected by entry lock
dax: protect PTE modification on WP fault by radix tree entry lock
dax: clear dirty entry tags on cache flush
Jason Baron (1):
binfmt_elf: use vmalloc() for allocation of vma_filesz
Jens Axboe (1):
mm: don't cap request size based on read-ahead setting
Jie Chen (1):
lib/rbtree.c: fix typo in comment of ____rb_erase_color
Joe Perches (1):
get_maintainer: look for arbitrary letter prefixes in sections
Joel Fernandes (1):
mm: add preempt points into __purge_vmap_area_lazy()
Johannes Thumshirn (1):
libnvdimm, e820: use module_platform_driver
Johannes Weiner (10):
mm: khugepaged: close use-after-free race during shmem collapsing
mm: khugepaged: fix radix tree node leak in shmem collapse error path
mm: workingset: turn shadow node shrinker bugs into warnings
lib: radix-tree: native accounting of exceptional entries
lib: radix-tree: check accounting of existing slot replacement users
lib: radix-tree: add entry deletion support to __radix_tree_replace()
lib: radix-tree: update callback for changing leaf nodes
mm: workingset: move shadow entry tracking to radix tree exceptional tracking
mm: workingset: restore refault tracking for single-page files
mm: workingset: update shadow limit to reflect bigger active list
Jungseung Lee (1):
init: reduce rootwait polling interval time to 5ms
Jérémy Lefaure (1):
shmem: fix compilation warnings on unused functions
Kees Cook (1):
proc: report no_new_privs state
Kent Overstreet (1):
block: add bio_iov_iter_get_pages()
Kirill A. Shutemov (1):
mm/filemap.c: add comment for confusing logic in page_cache_tree_insert()
Konstantin Khlebnikov (2):
kernel/watchdog: use nmi registers snapshot in hardlockup handler
radix tree test suite: benchmark for iterator
Lorenzo Stoakes (3):
mm: fix up get_user_pages* comments
mm: add locked parameter to get_user_pages_remote()
mm: unexport __get_user_pages_unlocked()
Matthew Wilcox (31):
tools: add WARN_ON_ONCE
radix tree test suite: allow GFP_ATOMIC allocations to fail
radix tree test suite: track preempt_count
radix tree test suite: free preallocated nodes
radix tree test suite: make runs more reproducible
radix tree test suite: iteration test misuses RCU
radix tree test suite: use rcu_barrier
radix tree test suite: handle exceptional entries
radix tree test suite: record order in each item
tools: add more bitmap functions
radix tree test suite: use common find-bit code
radix-tree: fix typo
radix-tree: move rcu_head into a union with private_list
radix-tree: create node_tag_set()
radix-tree: make radix_tree_find_next_bit more useful
radix-tree: improve dump output
btrfs: fix race in btrfs_free_dummy_fs_info()
radix-tree: improve multiorder iterators
radix-tree: delete radix_tree_locate_item()
radix-tree: delete radix_tree_range_tag_if_tagged()
radix-tree: add radix_tree_join
radix-tree: add radix_tree_split
radix-tree: add radix_tree_split_preload()
radix-tree: fix replacement for multiorder entries
radix tree test suite: check multiorder iteration
idr: add ida_is_empty
tpm: use idr_find(), not idr_find_slowpath()
rxrpc: abstract away knowledge of IDR internals
idr: reduce the number of bits per level from 8 to 6
radix tree test suite: add some more functionality
reimplement IDR and IDA using the radix tree
Mel Gorman (1):
mm, page_alloc: keep pcp count and list contents in sync if struct page is corrupted
Michal Hocko (7):
mm, mempolicy: clean up __GFP_THISNODE confusion in policy_zonelist
mm, compaction: allow compaction for GFP_NOFS requests
Merge remote-tracking branch 'nvdim/libnvdimm-for-next' into mmotm-base
Merge remote-tracking branch 'xfs-tree/dax-4.10-iomap-pmd' into mmotm-base
Merge remote-tracking branch 'ext-tree/dev' into mmotm-next
Merge remote-tracking branch 'xfs-tree/xfs-4.10-misc-fixes-2' into mmotm-next
Merge remote-tracking branch 'xfs-tree/iomap-4.10-directio' into mmotm-next
Minchan Kim (4):
mm: don't steal highatomic pageblock
mm: prevent double decrease of nr_reserved_highatomic
mm: try to exhaust highatomic reserve before the OOM
mm: make unreserve highatomic functions reliable
Ming Ling (1):
mm, compaction: fix NR_ISOLATED_* stats for pfn based migration
Nicolas Iooss (3):
nvdimm: use the right length of "pmem"
libnvdimm, namespace: fix the type of name variable
kthread: add __printf attributes
Pavel Machek (1):
ktest.pl: fix english
Peter Zijlstra (1):
locking/lockdep: Provide a type check for lock_is_held
Piotr Kwapulinski (1):
mm/mempolicy.c: forbid static or relative flags for local NUMA mode
Rasmus Villemoes (1):
fs/proc/array.c: slightly improve render_sigset_t
Reza Arbab (3):
powerpc/mm: allow memory hotplug into a memoryless node
mm: remove x86-only restriction of movable_node
mm: enable CONFIG_MOVABLE_NODE on non-x86 arches
Ross Zwisler (17):
ext4: tell DAX the size of allocation holes
dax: remove buffer_size_valid()
ext2: remove support for DAX PMD faults
dax: make 'wait_table' global variable static
dax: remove the last BUG_ON() from fs/dax.c
dax: consistent variable naming for DAX entries
dax: coordinate locking for offsets in PMD range
dax: remove dax_pmd_fault()
dax: correct dax iomap code namespace
dax: add dax_iomap_sector() helper function
dax: dax_iomap_fault() needs to call iomap_end()
dax: move RADIX_DAX_* defines to dax.h
dax: move put_(un)locked_mapping_entry() in dax.c
dax: add struct iomap based DAX PMD support
xfs: use struct iomap based DAX PMD fault path
dax: remove "depends on BROKEN" from FS_DAX_PMD
ext4: remove unused function ext4_aligned_io()
Sergey Karamov (1):
ext4: do not perform data journaling when data is encrypted
Shaohua Li (1):
mm/vmscan.c: set correct defer count for shrinker
Stanislav Kinsburskiy (1):
prctl: remove one-shot limitation for changing exe link
Stephen Rothwell (1):
ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Sudip Mukherjee (2):
m32r: add simple dma
m32r: fix build warning
Tahsin Erdogan (1):
fs/fs-writeback.c: remove redundant if check
Theodore Ts'o (15):
Merge branch 'dax-4.10-iomap-pmd' into origin
Merge branch 'fscrypt' into origin
ext4: allow ext4_truncate() to return an error
ext4: allow ext4_ext_truncate() to return an error
ext4: don't lock buffer in ext4_commit_super if holding spinlock
ext4: sanity check the block and cluster size at mount time
ext4: fix in-superblock mount options processing
ext4: use more strict checks for inodes_per_block on mount
ext4: add sanity checking to count_overhead()
ext4: fix reading new encrypted symlinks on no-journal file systems
fscrypt: rename get_crypt_info() to fscrypt_get_crypt_info()
fscrypt: unexport fscrypt_initialize()
fscrypt: move non-public structures and constants to fscrypt_private.h
fscrypt: move the policy flags and encryption mode definitions to uapi header
Merge branch 'fscrypt' into dev
Thierry Reding (1):
mm: cma: make linux/cma.h standalone includible
Thomas Garnier (1):
mm/slab_common.c: check kmem_create_cache flags are common
Tobias Klauser (1):
mm/gup.c: make unnecessarily global vma_permits_fault() static
Toshi Kani (1):
libnvdimm: use generic iostat interfaces
Vitaly Wool (6):
mm/z3fold.c: make pages_nr atomic
mm/z3fold.c: extend compaction function
z3fold: use per-page spinlock
z3fold: discourage use of pages that weren't compacted
z3fold: fix header size related issues
z3fold: fix locking issues
Vladimir Davydov (2):
mm: memcontrol: use special workqueue for creating per-memcg caches
slub: move synchronize_sched out of slab_mutex on shrink
Vlastimil Babka (2):
mm, debug: print raw struct page data in __dump_page()
mm, rmap: handle anon_vma_prepare() common case inline
Waiman Long (1):
sched/wake_q: Rename WAKE_Q to DEFINE_WAKE_Q
zhong jiang (3):
mm/z3fold.c: limit first_num to the actual range of possible buddy indexes
mm/page_owner: align with pageblock_nr pages
mm/vmstat.c: walk the zone in pageblock_nr_pages steps
zijun_hu (2):
mm/vmalloc.c: simplify /proc/vmallocinfo implementation
mm/percpu.c: fix panic triggered by BUG_ON() falsely
--
Michal Hocko
SUSE Labs
^ permalink raw reply
* next-20161213 build: 0 failures 0 warnings (next-20161213)
From: Build bot for Mark Brown @ 2016-12-13 12:18 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20161213
Git describe: next-20161213
Commit: c791961310 Add linux-next specific files for 20161213
Build Time: 174 min 17 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
* linux-next: Tree for Dec 13
From: Stephen Rothwell @ 2016-12-13 6:04 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any material for v4.11 to your linux-next included
branches until after v4.10-rc1 has been released.
Changes since 20161212:
The hid tree lost its build failure.
The spi tree lost its build failure.
Non-merge commits (relative to Linus' tree): 8829
7664 files changed, 471419 insertions(+), 200537 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 245 trees (counting Linus' and 35 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (df5f0f0a028c Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs)
Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU)
Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions")
Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (dadc4a1bb9f0 powerpc/64: Fix placement of .text to be immediately following .head.text)
Merging sparc/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging net/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging netfilter/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs)
Merging mac80211/master (9590112241ba tipc: fix link statistics counter errors)
Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change)
Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX))
Merging driver-core.current/driver-core-linus (a25f0944ba9b Linux 4.9-rc5)
Merging tty.current/tty-linus (a909d3e63699 Linux 4.9-rc3)
Merging usb.current/usb-linus (e5517c2a5a49 Linux 4.9-rc7)
Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match())
Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu)
Merging staging.current/staging-linus (a25f0944ba9b Linux 4.9-rc5)
Merging char-misc.current/char-misc-linus (a25f0944ba9b Linux 4.9-rc5)
Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277)
Merging crypto-current/master (678b5c6b22fe crypto: algif_aead - fix uninitialized variable warning)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging vfio-fixes/for-linus (05692d7005a3 vfio/pci: Fix integer overflows, bitmask check)
Merging kselftest-fixes/fixes (1001354ca341 Linux 4.9-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (69973b830859 Linux 4.9)
Merging drm-misc-fixes/for-linux-next-fixes (e94bd1736f1f drm: Don't call drm_for_each_crtc with a non-KMS driver)
Merging kbuild/for-next (106834d45bad Merge branch 'kbuild/misc' into kbuild/for-next)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (b4871f457978 Merge branch 'syscalls' into for-next)
Merging arm-perf/for-next/perf (f43365ee17f8 selftests: arm64: add test for unaligned/inexact watchpoint handling)
Merging arm-soc/for-next (b15ec88e89d1 arm-soc: document merges)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
Merging amlogic/for-next (b21a5fc2bb8a Merge branch 'v4.10/defconfig' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (242a001e48b7 Merge branch 'zte/dt64' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (5cfcfe81e33b Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (4aecea63ed81 Merge branch 'omap-for-v4.10/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (bbf9c90768f9 Merge tag 'qcom-dts-for-4.10-2' into all-for-4.10-part2)
Merging renesas/next (411253aa4a68 Merge branch 'fixes-for-v4.10' into next)
Merging rockchip/for-next (7e02e53c6ecf Merge branch 'v4.10-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (4ed7dc2785f8 Merge branch 'next/dt64' into for-next)
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
Merging arm64/for-next/core (75037120e62b arm64: Disable PAN on uaccess_enable())
CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h
Applying: arm64: merge fix for code movement to cpucaps.h
Merging clk/clk-next (2aab7a2055a1 clk: bcm: Fix 'maybe-uninitialized' warning in bcm2835_clock_choose_div_and_prate())
CONFLICT (content): Merge conflict in drivers/soc/renesas/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7796.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r8a7795.dtsi
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-rcar-gen2.c
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7794.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7793.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7792.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7791.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7790.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r8a7779.dtsi
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (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 (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (07c65a665b8d m68knommu: AMCORE board, add iMX i2c support)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (57b47febc193 Merge branch '4.9-fixes' into mips-for-linux-next)
Merging nios2/for-next (94b0f3d623a0 nios2: add screen_info)
Merging openrisc/for-next (7c7808ce107d openrisc: prevent VGA console, fix builds)
Merging parisc-hd/for-next (82cbd568bc5a parisc: perf: return -EFAULT on error)
Merging powerpc/next (ff45000fcb56 powerpc/boot: Request no dynamic linker for boot wrapper)
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/asm-prototypes.h
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c19805f870c1 s390/cpumf: Use configuration level indication for sampling data)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (03eae3aca94c xtensa: fix screen_info, clean up unused declarations in setup.c)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (986ee488b9fd Merge branch 'for-next-next-4.9-20161125' into for-next-20161125)
Merging ceph/master (dc24de82d61b ceph: properly set issue_seq for cap release)
Merging cifs/for-next (96a988ffeb90 CIFS: Fix a possible double locking of mutex during reconnect)
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 (b46dc033818d ext2: reject inodes with negative size)
Merging ext4/dev (728a7627cab7 Merge branch 'fscrypt' into dev)
Merging f2fs/dev (c0ed4405a99e f2fs: fix a missing size change in f2fs_setattr)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (c01638f5d919 fuse: fix clearing suid, sgid for chown())
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (2549f307b599 Merge tag 'nfs-rdma-4.10-1' of git://git.linux-nfs.org/projects/anna/nfs-rdma)
Merging nfsd/nfsd-next (3eb15f282846 sunrpc: use DEFINE_SPINLOCK())
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (1fb52aea5039 ovl: fix return value of ovl_fill_super)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (a00052a296e5 ubifs: Fix regression in ubifs_readdir())
Merging xfs/for-next (9807b773dad4 Merge branch 'xfs-4.10-misc-fixes-4' into for-next)
CONFLICT (content): Merge conflict in include/linux/iomap.h
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (225c4443ef3b Merge branch 'work.autofs' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_reflink.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (a2c55f286b95 Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
Merging pci/next (b08d2e61a6f9 Merge branch 'pci/host-vmd' into next)
Merging pstore/for-next/pstore (fc46d4e453f5 ramoops: add pdata NULL check to ramoops_probe)
Merging hid/for-next (43768c4daf54 Merge branches 'for-4.10/upstream' and 'for-4.10/i2c-hid-nopower' into for-next)
Merging i2c/i2c/for-next (8641b29652af Merge branch 'i2c/for-4.10' 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 (27ec191a79ca firmware: dmi_scan: Always show system identification string)
Merging hwmon-staging/hwmon-next (4fccd4a1e894 hwmon: (g762) Fix overflows and crash seen when writing limit attributes)
Merging jc_docs/docs-next (868c97a846a7 dma-buf: Extract dma-buf.rst)
Merging v4l-dvb/master (bf0396ea4727 Merge branch 'patchwork' into to_next)
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg left in tree.
CONFLICT (modify/delete): Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg deleted in HEAD and modified in v4l-dvb/master. Version v4l-dvb/master of Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg left in tree.
$ git rm -f Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg
Merging pm/linux-next (fb4ad1d7e562 Merge branches 'powercap' and 'pm-sleep' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (9245ac20d829 Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next)
Merging thermal-soc/next (6ee459f5f967 devfreq_cooling: pass a pointer to devfreq in the power model callbacks)
Merging ieee1394/for-next (e9300a4b7bba firewire: net: fix fragmented datagram_size off-by-one)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (d29fa0cb7602 swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support)
Merging net-next/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris)
Merging ipsec-next/master (d4aea20d889e tun: Use netif_receive_skb instead of netif_rx)
Merging netfilter-next/master (d84701ecbcd6 netfilter: nft_counter: rework atomic dump and reset)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (d15697de60db adm80211: add checks for dma mapping errors)
Merging bluetooth/master (107bc0aa95ca Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging mac80211-next/master (e6f462df9acd cfg80211/mac80211: fix BSS leaks when abandoning assoc attempts)
Merging rdma/for-next (e37a79e5d4ca net/mlx5e: Add tc support for FWD rule with counter)
Merging rdma-leon/rdma-next (92363f1cfe75 Merge remote-tracking branch 'origin/topic/shared-for-4.10' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (0e2ce9d3fcba Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (445caaa20c4d mtd: Allocate bdi objects dynamically)
Merging nand/nand/next (8fcfba072420 mtd: nand: tango: Use nand_to_mtd() instead of directly accessing chip->mtd)
Merging crypto/master (04b46fbdea5e crypto: testmgr - fix overlap in chunked tests again)
Merging drm/drm-next (acc5ddd97279 Merge tag 'drm-misc-next-2016-12-08' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
CONFLICT (content): Merge conflict in Documentation/driver-api/infrastructure.rst
Merging drm-panel/drm/panel/for-next (8c31f6034b24 drm/panel: simple: Add support for AUO G185HAN01)
Merging drm-intel/for-linux-next (7a9e10253e9e drm/i915: Move priority bumping for flips earlier)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (6449b088dd51 drm: Add fake controlD* symlinks for backwards compat)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
Merging sunxi/sunxi/for-next (63e8e44adfdc Merge branch 'sunxi/dt-late-for-4.10' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun8i-h3.dtsi
Merging kspp/for-next/kspp (68fdc678df46 MAINTAINERS: add GCC plugins Makefile)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (5c55e10a1934 Merge remote-tracking branch 'regmap/topic/lzo' into regmap-next)
Merging sound/for-next (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change)
Merging sound-asoc/for-next (a5de5b74a501 Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (4d217a5adccf module: fix DEBUG_SET_MODULE_RONX typo)
Merging input/next (34888602eb99 Input: drv260x - use generic device properties)
Merging block/for-next (348c1dced6b1 Merge branch 'for-4.10/block' into for-next)
CONFLICT (modify/delete): fs/logfs/dev_bdev.c deleted in HEAD and modified in block/for-next. Version block/for-next of fs/logfs/dev_bdev.c left in tree.
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
$ git rm -f fs/logfs/dev_bdev.c
Applying: iomap: fix up for blk_poll and WRITE_ODIRECT change
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
Merging device-mapper/for-next (e99dda8fc456 dm cache policy smq: use hash_32() instead of hash_32_generic())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (f397c8d80a5e mmc: block: Move files to core)
CONFLICT (content): Merge conflict in drivers/mmc/core/block.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (2953079c692d md: separate flags for superblock changes)
CONFLICT (content): Merge conflict in drivers/md/raid5-cache.c
CONFLICT (content): Merge conflict in drivers/md/md.c
Merging mfd/for-mfd-next (93559191e71b mfd: tps65217: Support an interrupt pin as the system wakeup)
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (6480af4915d6 power_supply: wm97xx_battery: use power_supply_get_drvdata)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (d00b74613fb1 Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next)
Merging security/next (50523a29d900 Yama: allow access for the current ptrace parent)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (4a49d45dd589 selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces)
Merging tpmdd/next (9430066a15d6 tpm: adjust return value of tpm_read_log)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
Merging iommu/next (1465f481460c Merge branches 'arm/mediatek', 'arm/smmu', 'x86/amd', 's390', 'core' and 'arm/exynos' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (ea4b640c39d8 NTB: correct ntb_spad_count comment typo)
CONFLICT (content): Merge conflict in Documentation/admin-guide/reporting-bugs.rst
Merging audit/next (5b52b1d37a6f netns: avoid disabling irq for netns id)
CONFLICT (content): Merge conflict in net/core/net_namespace.c
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (61eb3a04f978 dt: pwm: bcm2835: fix typo in clocks property name)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (16ae16c6e561 Merge tag 'mmc-v4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc)
Merging spi/for-next (62fadc72674e Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sunxi', 'spi/topic/ti-qspi', 'spi/topic/topcliff-pch' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (4a466177b126 Merge branch 'x86/timers')
CONFLICT (content): Merge conflict in drivers/net/ethernet/ti/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/amd/Kconfig
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (a2e4c787f75b EDAC: Document HW_EVENT_ERR_DEFERRED type)
Merging edac-amd/for-next (0de2788447b6 EDAC, amd64: Fix improper return value)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (1a41442864e3 tracing/fgraph: Have wakeup and irqsoff tracers ignore graph functions too)
Merging rcu/rcu/next (155ba1adb969 rcu: Use leaf_node_for_each_mask_*() for leaf node online CPU iteration)
Merging kvm/linux-next (36da91bdf568 KVM: x86: Handle the kthread worker using the new API)
CONFLICT (content): Merge conflict in arch/x86/kvm/cpuid.c
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
Merging kvms390/next (e1788bb995be KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load)
Merging xen-tip/linux-next (709613ad2b3c xen/balloon: Only mark a page as managed when it is released)
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (9935561d1b0e platform/x86/asus-nb-wmi.c: Add X45U quirk)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (44b3e31d540e leds: pca955x: Add ACPI support)
Merging ipmi/for-next (070cbd1d42aa ipmi: create hardware-independent softdep for ipmi_devintf)
Merging driver-core/driver-core-next (5d47ec02c37e firmware: Correct handling of fw_state_wait() return value)
Merging tty/tty-next (a9b01b5823f7 serial: 8250_mid fix calltrace when hotplug 8250 serial controller)
CONFLICT (modify/delete): Documentation/VGA-softcursor.txt deleted in HEAD and modified in tty/tty-next. Version tty/tty-next of Documentation/VGA-softcursor.txt left in tree.
$ git rm -f Documentation/VGA-softcursor.txt
Merging usb/usb-next (d8a12b7117b4 USB: serial: option: add dlink dwm-158)
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
Merging usb-serial/usb-next (3c3dd1e058cb USB: serial: kl5kusb105: abort on open exception path)
Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API)
Merging phy-next/next (5e253dfbdbea phy: rockchip-inno-usb2: select USB_COMMON)
Merging staging/staging-next (3e0f9b2ca8e4 staging: comedi: comedidev.h: Document usage of 'detach' handler)
CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211netdev.c
CONFLICT (content): Merge conflict in drivers/staging/unisys/include/iochannel.h
CONFLICT (modify/delete): drivers/staging/slicoss/slicoss.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/slicoss/slicoss.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/statahead.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
$ git rm -f drivers/staging/slicoss/slicoss.c
Merging char-misc/char-misc-next (190cc65e912d uio-hv-generic: store physical addresses instead of virtual)
CONFLICT (content): Merge conflict in drivers/lightnvm/core.c
Merging extcon/extcon-next (669ae5dabe7a extcon: palmas: Check the parent instance to prevent the NULL)
Merging slave-dma/next (6fa8619369e3 Merge branch 'for-linus' into next)
Merging cgroup/for-next (89bb3eed858e cgroup: cgroup_sk_alloc() is allowed to increase reference on a dead cgroup)
Merging scsi/for-next (a47b7c1ee0ff Merge branch 'misc' into for-next)
CONFLICT (content): Merge conflict in drivers/scsi/ufs/ufshcd.c
Merging scsi-mkp/for-next (ae2aae242198 scsi: aacraid: remove wildcard for series 9 controllers)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (81cdffc2a408 Merge branch 'for-4.9-fixes' into for-next)
CONFLICT (content): Merge conflict in block/blk-core.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (75bfa81bf089 virtio_ring: mark vring_dma_dev inline)
Merging rpmsg/for-next (d85a9aa0a775 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (acf1fcf77247 Merge branch 'thread-irq-simpler' into devel)
Merging pinctrl/for-next (f82144450874 pinctrl: sx150x: use new nested IRQ infrastructure)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (fdd3ff4db177 Merge branch 'for-4.10/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (19339c251607 Revert "evm: Translate user/group ids relative to s_user_ns when computing HMAC")
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (c461265679ce kselftests: Exercise hw-independent mock tests for i915.ko)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (59024954a1e7 Documentation/livepatch: Fix stale link to gmame)
Merging coresight/next (e615a9a8e481 coresight: perf: Add a missing call to etm_free_aux)
Merging rtc/rtc-next (05d226088a6b rtc: mcp795: Fix whitespace and indentation.)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (325896ffdf90 device-dax: fix private mapping restriction, permit read-only)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (3c72fe2f5503 ipc/shm.c: coding style fixes)
CONFLICT (content): Merge conflict in mm/memcontrol.c
CONFLICT (content): Merge conflict in mm/filemap.c
CONFLICT (content): Merge conflict in fs/dax.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: posix-timers: give lazy compilers some help optimizing code away
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: radix tree test suite: fix compilation
Applying: ktest.pl: fix english
Applying: kernel/watchdog.c: move shared definitions to nmi.h
Applying: kernel/watchdog.c: move hardlockup detector to separate file
Applying: sparc: implement watchdog_nmi_enable and watchdog_nmi_disable
Applying: ipc/sem: do not call wake_sem_queue_do() prematurely
Applying: ipc/sem: rework task wakeups
Applying: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Applying: ipc-sem-rework-task-wakeups-checkpatch-fixes
Applying: ipc/sem: optimize perform_atomic_semop()
Applying: ipc/sem: ensure we left shift a ULL rather than a 32 bit integer
Applying: ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes
Applying: ipc/sem: explicitly inline check_restart
Applying: ipc/sem: use proper list api for pending_list wakeups
Applying: ipc/sem: simplify wait-wake loop
Applying: ipc-sem-simplify-wait-wake-loop-checkpatch-fixes
Applying: ipc/sem: avoid idr tree lookup for interrupted semop
Applying: mm: add locked parameter to get_user_pages_remote()
Applying: vfio iommu type1: merge fix for get_user_pages_remote API change
Applying: mm: unexport __get_user_pages_unlocked()
Applying: mm-unexport-__get_user_pages_unlocked-checkpatch-fixes
Applying: mm: join struct fault_env and vm_fault
Applying: mm: use vmf->address instead of of vmf->virtual_address
Applying: mm: use pgoff in struct vm_fault instead of passing it separately
Applying: mm: use passed vm_fault structure in __do_fault()
Applying: mm: trim __do_fault() arguments
Applying: mm: use passed vm_fault structure for in wp_pfn_shared()
Applying: mm: add orig_pte field into vm_fault
Applying: mm: allow full handling of COW faults in ->fault handlers
Applying: mm: factor out functionality to finish page faults
Applying: mm: move handling of COW faults into DAX code
Applying: mm: factor out common parts of write fault handling
Applying: mm: pass vm_fault structure into do_page_mkwrite()
Applying: mm: use vmf->page during WP faults
Applying: mm: move part of wp_page_reuse() into the single call site
Applying: mm: provide helper for finishing mkwrite faults
Applying: mm: change return values of finish_mkwrite_fault()
Applying: mm: export follow_pte()
Applying: dax: make cache flushing protected by entry lock
Applying: dax: protect PTE modification on WP fault by radix tree entry lock
Applying: dax: clear dirty entry tags on cache flush
Applying: powerpc: ima: get the kexec buffer passed by the previous kernel
Applying: ima: on soft reboot, restore the measurement list
Applying: ima: permit duplicate measurement list entries
Applying: ima: maintain memory size needed for serializing the measurement list
Applying: powerpc: ima: send the kexec buffer to the next kernel
Applying: ima: on soft reboot, save the measurement list
Applying: ima: store the builtin/custom template definitions in a list
Applying: ima: support restoring multiple template formats
Applying: ima: define a canonical binary_runtime_measurements list format
Applying: ima: platform-independent hash value
Applying: tools: add WARN_ON_ONCE
Applying: radix tree test suite: allow GFP_ATOMIC allocations to fail
Applying: radix tree test suite: track preempt_count
Applying: radix tree test suite: free preallocated nodes
Applying: radix tree test suite: make runs more reproducible
Applying: radix tree test suite: iteration test misuses RCU
Applying: radix tree test suite: benchmark for iterator
Applying: radix tree test suite: use rcu_barrier
Applying: radix tree test suite: handle exceptional entries
Applying: radix tree test suite: record order in each item
Applying: tools: add more bitmap functions
Applying: radix tree test suite: use common find-bit code
Applying: radix-tree: fix typo
Applying: radix-tree: move rcu_head into a union with private_list
Applying: radix-tree: create node_tag_set()
Applying: radix-tree: make radix_tree_find_next_bit more useful
Applying: radix-tree: improve dump output
Applying: btrfs: fix race in btrfs_free_dummy_fs_info()
Applying: radix-tree: improve multiorder iterators
Applying: radix-tree: delete radix_tree_locate_item()
Applying: radix-tree: delete radix_tree_range_tag_if_tagged()
Applying: radix-tree: add radix_tree_join
Applying: radix-tree: add radix_tree_split
Applying: radix-tree: add radix_tree_split_preload()
Applying: radix-tree: fix replacement for multiorder entries
Applying: radix tree test suite: check multiorder iteration
Applying: idr: add ida_is_empty
Applying: tpm: use idr_find(), not idr_find_slowpath()
Applying: rxrpc: abstract away knowledge of IDR internals
Applying: idr: reduce the number of bits per level from 8 to 6
Applying: radix tree test suite: add some more functionality
Applying: reimplement IDR and IDA using the radix tree
Merging akpm/master (87b3d1510ddc reimplement IDR and IDA using the radix tree)
^ permalink raw reply
* mmotm 2016-12-12-17-02 uploaded
From: akpm @ 2016-12-13 1:03 UTC (permalink / raw)
To: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
sfr, mhocko, broonie
The mm-of-the-moment snapshot 2016-12-12-17-02 has been uploaded to
http://www.ozlabs.org/~akpm/mmotm/
mmotm-readme.txt says
README for mm-of-the-moment:
http://www.ozlabs.org/~akpm/mmotm/
This is a snapshot of my -mm patch queue. Uploaded at random hopefully
more than once a week.
You will need quilt to apply these patches to the latest Linus release (4.x
or 4.x-rcY). The series file is in broken-out.tar.gz and is duplicated in
http://ozlabs.org/~akpm/mmotm/series
The file broken-out.tar.gz contains two datestamp files: .DATE and
.DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss,
followed by the base kernel version against which this patch series is to
be applied.
This tree is partially included in linux-next. To see which patches are
included in linux-next, consult the `series' file. Only the patches
within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
linux-next.
A git tree which contains the memory management portion of this tree is
maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
by Michal Hocko. It contains the patches which are between the
"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series
file, http://www.ozlabs.org/~akpm/mmotm/series.
A full copy of the full kernel tree with the linux-next and mmotm patches
already applied is available through git within an hour of the mmotm
release. Individual mmotm releases are tagged. The master branch always
points to the latest release, so it's constantly rebasing.
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/
To develop on top of mmotm git:
$ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git
$ git remote update mmotm
$ git checkout -b topic mmotm/master
<make changes, commit>
$ git send-email mmotm/master.. [...]
To rebase a branch with older patches to a new mmotm release:
$ git remote update mmotm
$ git rebase --onto mmotm/master <topic base> topic
The directory http://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
contains daily snapshots of the -mm tree. It is updated more frequently
than mmotm, and is untested.
A git copy of this tree is available at
http://git.cmpxchg.org/cgit.cgi/linux-mmots.git/
and use of this tree is similar to
http://git.cmpxchg.org/cgit.cgi/linux-mmotm.git/, described above.
This mmotm tree contains the following patches against 4.9:
(patches marked "*" will be included in linux-next)
origin.patch
* kthread-add-__printf-attributes.patch
* prctl-remove-one-shot-limitation-for-changing-exe-link.patch
* scripts-bloat-o-meter-dont-use-readlines.patch
* scripts-bloat-o-meter-compile-number-regex.patch
* scripts-tagssh-handle-omap-platforms-properly.patch
* m32r-add-simple-dma.patch
* m32r-fix-build-warning.patch
* pcmcia-m32r_pcc-check-return-from-request_irq.patch
* pcmcia-m32r_pcc-use-common-error-path.patch
* pcmcia-m32r_pcc-check-return-from-add_pcc_socket.patch
* ocfs2-dlm-clean-up-useless-bug_on-default-case-in-dlm_finalize_reco_handler.patch
* ocfs2-delete-redundant-code-and-set-the-node-bit-into-maybe_map-directly.patch
* ocfs2-dlm-clean-up-deadcode-in-dlm_master_request_handler.patch
* ocfs2-clean-up-unused-page-parameter-in-ocfs2_write_end_nolock.patch
* ocfs2-fix-double-put-of-recount-tree-in-ocfs2_lock_refcount_tree.patch
* fs-ocfs2-use-time64_t-to-represent-orphan-scan-times.patch
* fs-ocfs2-replace-current_time-macro.patch
* mm-memcontrol-use-special-workqueue-for-creating-per-memcg-caches.patch
* slub-move-synchronize_sched-out-of-slab_mutex-on-shrink.patch
* slub-avoid-false-postive-warning.patch
* mm-check-kmem_create_cache-flags-are-commons.patch
* mm-slab-faster-active-and-free-stats.patch
* mm-slab-maintain-total-slab-count-instead-of-active-count.patch
* dont-touch-single-threaded-ptes-which-are-on-the-right-node.patch
* vmscan-set-correct-defer-count-for-shrinker.patch
* mm-gup-make-unnecessarily-global-vma_permits_fault-static.patch
* mm-hugetlb-use-the-right-pte-val-for-compare-in-hugetlb_cow.patch
* mm-hugetlb-use-huge_pte_lock-instead-of-opencoding-the-lock.patch
* kmemleak-fix-reference-to-documentation.patch
* mm-dont-steal-highatomic-pageblock.patch
* mm-prevent-double-decrease-of-nr_reserved_highatomic.patch
* mm-try-to-exhaust-highatomic-reserve-before-the-oom.patch
* mm-make-unreserve-highatomic-functions-reliable.patch
* mm-vmallocc-simplify-proc-vmallocinfo-implementation.patch
* mm-thp-avoid-unlikely-branches-for-split_huge_pmd.patch
* mm-mempolicy-clean-up-__gfp_thisnode-confusion-in-policy_zonelist.patch
* mm-compaction-fix-nr_isolated_-stats-for-pfn-based-migration.patch
* shmem-avoid-maybe-uninitialized-warning.patch
* mm-use-the-correct-page-size-when-removing-the-page.patch
* mm-update-mmu_gather-range-correctly.patch
* mm-hugetlb-add-tlb_remove_hugetlb_entry-for-handling-hugetlb-pages.patch
* mm-add-tlb_remove_check_page_size_change-to-track-page-size-change.patch
* mm-remove-the-page-size-change-check-in-tlb_remove_page.patch
* mm-fixup-get_user_pages-comments.patch
* mm-mempolicyc-forbid-static-or-relative-flags-for-local-numa-mode.patch
* powerpc-mm-allow-memory-hotplug-into-a-memoryless-node.patch
* mm-remove-x86-only-restriction-of-movable_node.patch
* mm-enable-config_movable_node-on-non-x86-arches.patch
* of-fdt-mark-hotpluggable-memory.patch
* dt-add-documentation-of-hotpluggable-memory-property.patch
* mm-pkeys-generate-pkey-system-call-code-only-if-arch_has_pkeys-is-selected.patch
* mm-disable-numa-migration-faults-for-dax-vmas.patch
* mm-cma-make-linux-cmah-standalone-includible.patch
* filemap-add-comment-for-confusing-logic-in-page_cache_tree_insert.patch
* writeback-remove-redundant-if-check.patch
* shmem-fix-compilation-warnings-on-unused-functions.patch
* mm-dont-cap-request-size-based-on-read-ahead-setting.patch
* include-linux-backing-dev-defsh-shrink-struct-backing_dev_info.patch
* mm-khugepaged-close-use-after-free-race-during-shmem-collapsing.patch
* mm-khugepaged-fix-radix-tree-node-leak-in-shmem-collapse-error-path.patch
* mm-workingset-turn-shadow-node-shrinker-bugs-into-warnings.patch
* lib-radix-tree-native-accounting-of-exceptional-entries.patch
* lib-radix-tree-check-accounting-of-existing-slot-replacement-users.patch
* lib-radix-tree-add-entry-deletion-support-to-__radix_tree_replace.patch
* lib-radix-tree-update-callback-for-changing-leaf-nodes.patch
* mm-workingset-move-shadow-entry-tracking-to-radix-tree-exceptional-tracking.patch
* mm-workingset-restore-refault-tracking-for-single-page-files.patch
* mm-workingset-update-shadow-limit-to-reflect-bigger-active-list.patch
* mm-remove-free_unmap_vmap_area_noflush.patch
* mm-remove-free_unmap_vmap_area_addr.patch
* mm-refactor-__purge_vmap_area_lazy.patch
* mm-add-vfree_atomic.patch
* kernel-fork-use-vfree_atomic-to-free-thread-stack.patch
* x86-ldt-use-vfree_atomic-to-free-ldt-entries.patch
* mm-mark-all-calls-into-the-vmalloc-subsystem-as-potentially-sleeping.patch
* mm-turn-vmap_purge_lock-into-a-mutex.patch
* mm-add-preempt-points-into-__purge_vmap_area_lazy.patch
* mm-move-vma_is_anonymous-check-within-pmd_move_must_withdraw.patch
* mm-thp-page-cache-support-for-ppc64.patch
* mm-debug-print-raw-struct-page-data-in-__dump_page.patch
* mm-rmap-handle-anon_vma_prepare-common-case-inline.patch
* mm-page_alloc-keep-pcp-count-and-list-contents-in-sync-if-struct-page-is-corrupted.patch
* mm-add-three-more-cond_resched-in-swapoff.patch
* mm-add-cond_resched-in-gather_pte_stats.patch
* mm-make-transparent-hugepage-size-public.patch
* kasan-support-panic_on_warn.patch
* kasan-eliminate-long-stalls-during-quarantine-reduction.patch
* kasan-turn-on-fsanitize-address-use-after-scope.patch
* mm-percpuc-fix-panic-triggered-by-bug_on-falsely.patch
* proc-report-no_new_privs-state.patch
* proc-make-struct-pid_entry-len-unsigned.patch
* proc-make-struct-struct-map_files_info-len-unsigned-int.patch
* proc-just-list_del-struct-pde_opener.patch
* proc-fix-type-of-struct-pde_opener-closing-field.patch
* proc-kmalloc-struct-pde_opener.patch
* proc-tweak-comments-about-2-stage-open-and-everything.patch
* fs-proc-arrayc-slightly-improve-render_sigset_t.patch
* proc-save-decrement-during-lookup-readdir-in-proc-pid.patch
* proc-calculate-proc-and-proc-task-nlink-at-init-time.patch
* hung_task-decrement-sysctl_hung_task_warnings-only-if-it-is-positive.patch
* compiler-gcch-use-proved-instead-of-proofed.patch
* printk-nmi-fix-up-handling-of-the-full-nmi-log-buffer.patch
* printk-nmi-handle-continuous-lines-and-missing-newline.patch
* printk-kdb-handle-more-message-headers.patch
* printk-btrfs-handle-more-message-headers.patch
* printk-sound-handle-more-message-headers.patch
* printk-add-kconfig-option-to-set-default-console-loglevel.patch
* get_maintainer-look-for-arbitrary-letter-prefixes-in-sections.patch
* maintainers-add-b-for-uri-where-to-file-bugs.patch
* maintainers-add-drm-and-drm-i915-bug-filing-info.patch
* maintainers-add-c-for-uri-for-chat-where-developers-hang-out.patch
* maintainers-add-drm-and-drm-i915-irc-channels.patch
* let-config_strict_devmem-depends-on-config_devmem.patch
* lib-rbtreec-fix-typo-in-comment-of-____rb_erase_color.patch
* lib-ida-document-locking-requirements-a-bit-better-v2.patch
* checkpatch-dont-try-to-get-maintained-status-when-no-tree-is-given.patch
* scripts-checkpatchpl-fix-spelling.patch
* checkpatch-dont-check-pl-files-improve-absolute-path-commit-log-test.patch
* checkpatch-avoid-multiple-line-dereferences.patch
* checkpatch-dont-check-c99-types-like-uint8_t-under-tools.patch
* checkpatch-dont-emit-unified-diff-error-for-rename-only-patches.patch
* binfmt_elf-use-vmalloc-for-allocation-of-vma_filesz.patch
* init-reduce-rootwait-polling-interval-time-to-5ms.patch
i-need-old-gcc.patch
* arm-arch-arm-include-asm-pageh-needs-personalityh.patch
* kbuild-simpler-generation-of-assembly-constants.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-fix-crash-caused-by-stale-lvb-with-fsdlm-plugin.patch
* block-restore-proc-partitions-to-not-display-non-partitionable-removable-devices.patch
* kernel-watchdog-use-nmi-registers-snapshot-in-hardlockup-handler.patch
mm.patch
* mm-compaction-allow-compaction-for-gfp_nofs-requests.patch
* mm-compaction-allow-compaction-for-gfp_nofs-requests-fix.patch
* z3fold-limit-first_num-to-the-actual-range-of-possible-buddy-indexes.patch
* z3fold-make-pages_nr-atomic.patch
* z3fold-extend-compaction-function.patch
* z3fold-use-per-page-spinlock.patch
* z3fold-discourage-use-of-pages-that-werent-compacted.patch
* z3fold-fix-header-size-related-issues.patch
* z3fold-fix-locking-issues.patch
* mm-page_owner-align-with-pageblock_nr-pages.patch
* mm-walk-the-zone-in-pageblock_nr_pages-steps.patch
* lib-add-crc64-ecma-module.patch
* signals-avoid-unnecessary-taking-of-sighand-siglock.patch
* coredump-clarify-unsafe-core_pattern-warning.patch
* revert-kdump-vmcoreinfo-report-memory-sections-virtual-addresses.patch
* kexec-change-to-export-the-value-of-phys_base-instead-of-symbol-address.patch
* kexec-add-cond_resched-into-kimage_alloc_crash_control_pages.patch
* kdump-vmcoreinfo-report-actual-value-of-phys_base.patch
* sysctl-add-kern_cont-to-deprecated_sysctl_warning.patch
* arch-arc-add-option-to-skip-sync-on-dma-mapping.patch
* arch-arm-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-avr32-add-option-to-skip-sync-on-dma-map.patch
* arch-blackfin-add-option-to-skip-sync-on-dma-map.patch
* arch-c6x-add-option-to-skip-sync-on-dma-map-and-unmap.patch
* arch-frv-add-option-to-skip-sync-on-dma-map.patch
* arch-hexagon-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-m68k-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-metag-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-microblaze-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-mips-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-nios2-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-openrisc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-parisc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-powerpc-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sh-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* arch-sparc-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-tile-add-option-to-skip-dma-sync-as-a-part-of-map-and-unmap.patch
* arch-xtensa-add-option-to-skip-dma-sync-as-a-part-of-mapping.patch
* dma-add-calls-for-dma_map_page_attrs-and-dma_unmap_page_attrs.patch
* mm-add-support-for-releasing-multiple-instances-of-a-page.patch
* igb-update-driver-to-make-use-of-dma_attr_skip_cpu_sync.patch
* igb-update-code-to-better-handle-incrementing-page-count.patch
* relay-check-array-offset-before-using-it.patch
* kconfig-lib-kconfigdebug-fix-references-to-documenation.patch
* kconfig-lib-kconfigubsan-fix-reference-to-ubsan-documentation.patch
* kcov-add-more-missing-include.patch
* debug-more-properly-delay-for-secondary-cpus.patch
* debug-more-properly-delay-for-secondary-cpus-fix.patch
* kdb-remove-unused-kdb_event-handling.patch
* kdb-properly-synchronize-vkdb_printf-calls-with-other-cpus.patch
* kdb-call-vkdb_printf-from-vprintk_default-only-when-wanted.patch
* initramfs-select-builtin-initram-compression-algorithm-on-kconfig-instead-of-makefile.patch
* initramfs-allow-again-choice-of-the-embedded-initram-compression-algorithm.patch
* ipc-semc-avoid-using-spin_unlock_wait.patch
* ipc-sem-add-hysteresis.patch
* ipc-msg-make-msgrcv-work-with-long_min.patch
* ipc-fixed-warnings.patch
linux-next.patch
linux-next-rejects.patch
* posix-timers-give-lazy-compilers-some-help-optimizing-code-away.patch
* drivers-net-wireless-intel-iwlwifi-dvm-calibc-fix-min-warning.patch
* radix-tree-test-suite-fix-compilation.patch
* ktestpl-fix-english.patch
* watchdog-move-shared-definitions-to-nmih.patch
* watchdog-move-hardlockup-detector-to-separate-file.patch
* sparc-implement-watchdog_nmi_enable-and-watchdog_nmi_disable.patch
* ipc-sem-do-not-call-wake_sem_queue_do-prematurely.patch
* ipc-sem-rework-task-wakeups.patch
* ipc-sem-rework-task-wakeups-fix.patch
* ipc-sem-rework-task-wakeups-checkpatch-fixes.patch
* ipc-sem-optimize-perform_atomic_semop.patch
* ipc-sem-optimize-perform_atomic_semop-fix.patch
* ipc-sem-optimize-perform_atomic_semop-checkpatch-fixes.patch
* ipc-sem-explicitly-inline-check_restart.patch
* ipc-sem-use-proper-list-api-for-pending_list-wakeups.patch
* ipc-sem-simplify-wait-wake-loop.patch
* ipc-sem-simplify-wait-wake-loop-checkpatch-fixes.patch
* ipc-sem-avoid-idr-tree-lookup-for-interrupted-semop.patch
* mm-add-locked-parameter-to-get_user_pages_remote.patch
* mm-add-locked-parameter-to-get_user_pages_remote-fix.patch
* mm-unexport-__get_user_pages_unlocked.patch
* mm-unexport-__get_user_pages_unlocked-checkpatch-fixes.patch
* mm-join-struct-fault_env-and-vm_fault.patch
* mm-use-vmf-address-instead-of-of-vmf-virtual_address.patch
* mm-use-pgoff-in-struct-vm_fault-instead-of-passing-it-separately.patch
* mm-use-passed-vm_fault-structure-in-__do_fault.patch
* mm-trim-__do_fault-arguments.patch
* mm-use-passed-vm_fault-structure-for-in-wp_pfn_shared.patch
* mm-add-orig_pte-field-into-vm_fault.patch
* mm-allow-full-handling-of-cow-faults-in-fault-handlers.patch
* mm-factor-out-functionality-to-finish-page-faults.patch
* mm-move-handling-of-cow-faults-into-dax-code.patch
* mm-factor-out-common-parts-of-write-fault-handling.patch
* mm-pass-vm_fault-structure-into-do_page_mkwrite.patch
* mm-use-vmf-page-during-wp-faults.patch
* mm-move-part-of-wp_page_reuse-into-the-single-call-site.patch
* mm-provide-helper-for-finishing-mkwrite-faults.patch
* mm-change-return-values-of-finish_mkwrite_fault.patch
* mm-export-follow_pte.patch
* dax-make-cache-flushing-protected-by-entry-lock.patch
* dax-protect-pte-modification-on-wp-fault-by-radix-tree-entry-lock.patch
* dax-clear-dirty-entry-tags-on-cache-flush.patch
* powerpc-ima-get-the-kexec-buffer-passed-by-the-previous-kernel.patch
* ima-on-soft-reboot-restore-the-measurement-list.patch
* ima-permit-duplicate-measurement-list-entries.patch
* ima-maintain-memory-size-needed-for-serializing-the-measurement-list.patch
* powerpc-ima-send-the-kexec-buffer-to-the-next-kernel.patch
* ima-on-soft-reboot-save-the-measurement-list.patch
* ima-store-the-builtin-custom-template-definitions-in-a-list.patch
* ima-support-restoring-multiple-template-formats.patch
* ima-define-a-canonical-binary_runtime_measurements-list-format.patch
* ima-platform-independent-hash-value.patch
* tools-add-warn_on_once.patch
* radix-tree-test-suite-allow-gfp_atomic-allocations-to-fail.patch
* radix-tree-test-suite-track-preempt_count.patch
* radix-tree-test-suite-free-preallocated-nodes.patch
* radix-tree-test-suite-make-runs-more-reproducible.patch
* radix-tree-test-suite-iteration-test-misuses-rcu.patch
* radix-tree-test-suite-benchmark-for-iterator.patch
* radix-tree-test-suite-use-rcu_barrier.patch
* radix-tree-test-suite-handle-exceptional-entries.patch
* radix-tree-test-suite-record-order-in-each-item.patch
* tools-add-more-bitmap-functions.patch
* radix-tree-test-suite-use-common-find-bit-code.patch
* radix-tree-fix-typo.patch
* radix-tree-move-rcu_head-into-a-union-with-private_list.patch
* radix-tree-create-node_tag_set.patch
* radix-tree-make-radix_tree_find_next_bit-more-useful.patch
* radix-tree-improve-dump-output.patch
* btrfs-fix-race-in-btrfs_free_dummy_fs_info.patch
* radix-tree-improve-multiorder-iterators.patch
* radix-tree-delete-radix_tree_locate_item.patch
* radix-tree-delete-radix_tree_range_tag_if_tagged.patch
* radix-tree-add-radix_tree_join.patch
* radix-tree-add-radix_tree_split.patch
* radix-tree-add-radix_tree_split_preload.patch
* radix-tree-fix-replacement-for-multiorder-entries.patch
* radix-tree-test-suite-check-multiorder-iteration.patch
* idr-add-ida_is_empty.patch
* tpm-use-idr_find-not-idr_find_slowpath.patch
* rxrpc-abstract-away-knowledge-of-idr-internals.patch
* idr-reduce-the-number-of-bits-per-level-from-8-to-6.patch
* radix-tree-test-suite-add-some-more-functionality.patch
* reimplement-idr-and-ida-using-the-radix-tree.patch
mm-add-strictlimit-knob-v2.patch
make-sure-nobodys-leaking-resources.patch
releasing-resources-with-children.patch
make-frame_pointer-default=y.patch
kernel-forkc-export-kernel_thread-to-modules.patch
mutex-subsystem-synchro-test-module.patch
slab-leaks3-default-y.patch
add-debugging-aid-for-memory-initialisation-problems.patch
workaround-for-a-pci-restoring-bug.patch
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox