* Re: mmotm 2016-05-19-18-01 uploaded
From: Stephen Rothwell @ 2016-05-20 2:37 UTC (permalink / raw)
To: akpm
Cc: mm-commits, linux-kernel, linux-mm, linux-fsdevel, linux-next,
mhocko, broonie
In-Reply-To: <573e6218.YQH2A+YBUHmPqyvU%akpm@linux-foundation.org>
Hi Andrew,
On Thu, 19 May 2016 18:02:16 -0700 akpm@linux-foundation.org wrote:
>
> The mm-of-the-moment snapshot 2016-05-19-18-01 has been uploaded to
>
> http://www.ozlabs.org/~akpm/mmotm/
.
.
> mm-page_alloc-defer-debugging-checks-of-pages-allocated-from-the-pcp.patch
> mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
> mm-page_alloc-uninline-the-bad-page-part-of-check_new_page.patch
> mm-page_alloc-restore-the-original-nodemask-if-the-fast-path-allocation-failed.patch
Is that all there is? No linux-next patch?
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the tty tree with Linus' tree
From: Stephen Rothwell @ 2016-05-20 2:31 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Andrei Pistirica, Ralf Baechle,
Vladimir Murzin, Linus Torvalds
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
include/uapi/linux/serial_core.h
between commits:
157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
07b75260ebc2 ("Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus")
from Linus' tree and commit:
041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
from the tty tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/uapi/linux/serial_core.h
index 24da334af7f1,9aef04c5f7bc..000000000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -264,7 -264,7 +264,10 @@@
/* MVEBU UART */
#define PORT_MVEBU 114
+/* Microchip PIC32 UART */
+#define PORT_PIC32 115
+
+ /* MPS2 UART */
-#define PORT_MPS2UART 115
++#define PORT_MPS2UART 116
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
^ permalink raw reply
* mmotm 2016-05-19-18-01 uploaded
From: akpm @ 2016-05-20 1: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-05-19-18-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.6:
(patches marked "*" will be included in linux-next)
origin.patch
fsnotify-avoid-spurious-emfile-errors-from-inotify_init.patch
time-add-missing-implementation-for-timespec64_add_safe.patch
fs-poll-select-recvmmsg-use-timespec64-for-timeout-events.patch
time-remove-timespec_add_safe.patch
scripts-decode_stacktracesh-handle-symbols-in-modules.patch
scripts-spellingtxt-add-fimware-misspelling.patch
scripts-bloat-o-meter-print-percent-change.patch
debugobjects-make-fixup-functions-return-bool-instead-of-int.patch
debugobjects-correct-the-usage-of-fixup-call-results.patch
workqueue-update-debugobjects-fixup-callbacks-return-type.patch
timer-update-debugobjects-fixup-callbacks-return-type.patch
rcu-update-debugobjects-fixup-callbacks-return-type.patch
percpu_counter-update-debugobjects-fixup-callbacks-return-type.patch
documentation-update-debugobjects-doc.patch
debugobjects-insulate-non-fixup-logic-related-to-static-obj-from-fixup-callbacks.patch
ocfs2-error-code-comments-and-amendments-the-comment-of-ocfs2_extended_slot-should-be-0x08.patch
ocfs2-clean-up-an-unused-variable-wants_rotate-in-ocfs2_truncate_rec.patch
ocfs2-clean-up-unused-parameter-count-in-o2hb_read_block_input.patch
ocfs2-clean-up-an-unuseful-goto-in-ocfs2_put_slot-function.patch
padata-removed-unused-code.patch
kernel-padata-hide-unused-functions.patch
mm-slab-fix-the-theoretical-race-by-holding-proper-lock.patch
mm-slab-remove-bad_alien_magic-again.patch
mm-slab-drain-the-free-slab-as-much-as-possible.patch
mm-slab-factor-out-kmem_cache_node-initialization-code.patch
mm-slab-clean-up-kmem_cache_node-setup.patch
mm-slab-dont-keep-free-slabs-if-free_objects-exceeds-free_limit.patch
mm-slab-racy-access-modify-the-slab-color.patch
mm-slab-make-cache_grow-handle-the-page-allocated-on-arbitrary-node.patch
mm-slab-separate-cache_grow-to-two-parts.patch
mm-slab-refill-cpu-cache-through-a-new-slab-without-holding-a-node-lock.patch
mm-slab-lockless-decision-to-grow-cache.patch
mm-slub-replace-kick_all_cpus_sync-with-synchronize_sched-in-kmem_cache_shrink.patch
mm-slab-freelist-randomization-v4.patch
mm-slab-remove-zone_dma_flag.patch
mm-slubc-fix-sysfs-filename-in-comment.patch
mm-page_ref-use-page_ref-helper-instead-of-direct-modification-of-_count.patch
mm-rename-_count-field-of-the-struct-page-to-_refcount.patch
compilerh-add-support-for-malloc-attribute.patch
include-linux-apply-__malloc-attribute.patch
include-linux-nodemaskh-create-next_node_in-helper.patch
mm-hugetlb-optimize-minimum-size-min_size-accounting.patch
mm-hugetlb-introduce-hugetlb_bad_size.patch
arm64-mm-use-hugetlb_bad_size.patch
metag-mm-use-hugetlb_bad_size.patch
powerpc-mm-use-hugetlb_bad_size.patch
tile-mm-use-hugetlb_bad_size.patch
x86-mm-use-hugetlb_bad_size.patch
mm-hugetlb-is_vm_hugetlb_page-can-be-boolean.patch
mm-memory_hotplug-is_mem_section_removable-can-be-boolean.patch
mm-vmalloc-is_vmalloc_addr-can-be-boolean.patch
mm-mempolicy-vma_migratable-can-be-boolean.patch
mm-memcontrolc-mem_cgroup_select_victim_node-clarify-comment.patch
mm-page_alloc-remove-useless-parameter-of-__free_pages_boot_core.patch
mm-hugetlbc-use-first_memory_node.patch
mm-mempolicyc-offset_il_node-document-and-clarify.patch
mm-rmap-replace-bug_onanon_vma-degree-with-vm_warn_on.patch
mm-compaction-wrap-calculating-first-and-last-pfn-of-pageblock.patch
mm-compaction-reduce-spurious-pcplist-drains.patch
mm-compaction-skip-blocks-where-isolation-fails-in-async-direct-compaction.patch
mm-highmem-simplify-is_highmem.patch
mm-uninline-page_mapped.patch
mm-hugetlb-add-same-zone-check-in-pfn_range_valid_gigantic.patch
mm-memory_hotplug-add-comment-to-some-functions-related-to-memory-hotplug.patch
mm-vmstat-add-zone-range-overlapping-check.patch
mm-page_owner-add-zone-range-overlapping-check.patch
power-add-zone-range-overlapping-check.patch
mm-writeback-correct-dirty-page-calculation-for-highmem.patch
mm-page_alloc-correct-highmem-memory-statistics.patch
mm-highmem-make-nr_free_highpages-handles-all-highmem-zones-by-itself.patch
mm-vmstat-make-node_page_state-handles-all-zones-by-itself.patch
mm-mmap-kill-hook-arch_rebalance_pgtables.patch
mm-update_lru_size-warn-and-reset-bad-lru_size.patch
mm-update_lru_size-do-the-__mod_zone_page_state.patch
mm-use-__setpageswapbacked-and-dont-clearpageswapbacked.patch
tmpfs-preliminary-minor-tidyups.patch
tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
mm-proc-sys-vm-stat_refresh-to-force-vmstat-update.patch
huge-mm-move_huge_pmd-does-not-need-new_vma.patch
huge-pagecache-extend-mremap-pmd-rmap-lockout-to-files.patch
arch-fix-has_transparent_hugepage.patch
memory_hotplug-introduce-config_memory_hotplug_default_online.patch
memory_hotplug-introduce-memhp_default_state=-command-line-parameter.patch
mm-oom-move-gfp_nofs-check-to-out_of_memory.patch
oom-oom_reaper-try-to-reap-tasks-which-skip-regular-oom-killer-path.patch
mm-oom_reaper-clear-tif_memdie-for-all-tasks-queued-for-oom_reaper.patch
mm-page_alloc-only-check-pagecompound-for-high-order-pages.patch
mm-page_alloc-use-new-pageanonhead-helper-in-the-free-page-fast-path.patch
mm-page_alloc-reduce-branches-in-zone_statistics.patch
mm-page_alloc-inline-zone_statistics.patch
mm-page_alloc-inline-the-fast-path-of-the-zonelist-iterator.patch
mm-page_alloc-use-__dec_zone_state-for-order-0-page-allocation.patch
mm-page_alloc-avoid-unnecessary-zone-lookups-during-pageblock-operations.patch
mm-page_alloc-convert-alloc_flags-to-unsigned.patch
mm-page_alloc-convert-nr_fair_skipped-to-bool.patch
mm-page_alloc-remove-unnecessary-local-variable-in-get_page_from_freelist.patch
mm-page_alloc-remove-unnecessary-initialisation-in-get_page_from_freelist.patch
mm-page_alloc-remove-unnecessary-initialisation-from-__alloc_pages_nodemask.patch
mm-page_alloc-simplify-last-cpupid-reset.patch
mm-page_alloc-move-__gfp_hardwall-modifications-out-of-the-fastpath.patch
mm-page_alloc-check-once-if-a-zone-has-isolated-pageblocks.patch
mm-page_alloc-shorten-the-page-allocator-fast-path.patch
mm-page_alloc-reduce-cost-of-fair-zone-allocation-policy-retry.patch
mm-page_alloc-shortcut-watermark-checks-for-order-0-pages.patch
mm-page_alloc-avoid-looking-up-the-first-zone-in-a-zonelist-twice.patch
mm-page_alloc-remove-field-from-alloc_context.patch
mm-page_alloc-check-multiple-page-fields-with-a-single-branch.patch
mm-page_alloc-un-inline-the-bad-part-of-free_pages_check.patch
mm-page_alloc-pull-out-side-effects-from-free_pages_check.patch
mm-page_alloc-remove-unnecessary-variable-from-free_pcppages_bulk.patch
mm-page_alloc-inline-pageblock-lookup-in-page-free-fast-paths.patch
cpuset-use-static-key-better-and-convert-to-new-api.patch
mm-page_alloc-defer-debugging-checks-of-freed-pages-until-a-pcp-drain.patch
mm-page_alloc-defer-debugging-checks-of-pages-allocated-from-the-pcp.patch
mm-page_alloc-dont-duplicate-code-in-free_pcp_prepare.patch
mm-page_alloc-uninline-the-bad-page-part-of-check_new_page.patch
mm-page_alloc-restore-the-original-nodemask-if-the-fast-path-allocation-failed.patch
^ permalink raw reply
* linux-next: manual merge of the vfs tree with the cifs tree
From: Stephen Rothwell @ 2016-05-19 23:41 UTC (permalink / raw)
To: Al Viro, Steve French, linux-cifs; +Cc: linux-next, linux-kernel
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/cifs/cifsfs.c
between commit:
56c1d814aadf ("CIFS: Remove some obsolete comments")
from the cifs tree and commit:
51085a1f913a ("cifs: use C99 syntax for inode_operations initializer")
from the vfs tree.
This was entirely expected. Al, if its easy, you could just drop that
patch from the vfs tree.
I fixed it up (I just used the version from the cifs 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
* Re: linux-next: build failure after merge of the security tree
From: Stephen Rothwell @ 2016-05-19 23:14 UTC (permalink / raw)
To: James Morris, Steve French, linux-cifs-u79uwXL29TY76Z2rM5mHXA
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Sachin Prabhu, David Howells
In-Reply-To: <20160519140120.23b345a1-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Hi Steve,
On Thu, 19 May 2016 14:01:20 +1000 Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
>
> After merging the security tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/cifs/cifs_spnego.c: In function 'init_cifs_spnego':
> fs/cifs/cifs_spnego.c:206:12: error: too few arguments to function 'keyring_alloc'
> keyring = keyring_alloc(".cifs_spnego",
> ^
> In file included from include/linux/cred.h:17:0,
> from include/linux/sched.h:56,
> from include/linux/kasan.h:4,
> from include/linux/slab.h:118,
> from fs/cifs/cifs_spnego.c:23:
> include/linux/key.h:302:20: note: declared here
> extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid,
> ^
>
> Caused by commit
>
> 5b82c5cbcfe4 ("cifs: Create dedicated keyring for spnego operations")
>
> from the cifs tree interacting with commit
>
> 5ac7eace2d00 ("KEYS: Add a facility to restrict new links into a keyring")
>
> from the security tree.
>
> I added the following merge fix patch (and someone will have to let
> Linus know):
>
> From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
> Date: Thu, 19 May 2016 13:45:10 +1000
> Subject: [PATCH] cifs: fix for keyringalloc() API change
>
> Signed-off-by: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
> ---
> fs/cifs/cifs_spnego.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
> index 248ab431930c..9ef0dfcb2f95 100644
> --- a/fs/cifs/cifs_spnego.c
> +++ b/fs/cifs/cifs_spnego.c
> @@ -207,7 +207,7 @@ init_cifs_spnego(void)
> GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
> (KEY_POS_ALL & ~KEY_POS_SETATTR) |
> KEY_USR_VIEW | KEY_USR_READ,
> - KEY_ALLOC_NOT_IN_QUOTA, NULL);
> + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
> if (IS_ERR(keyring)) {
> ret = PTR_ERR(keyring);
> goto failed_put_cred;
> --
> 2.7.0
The security tree has now been merged into Linus' tree, so this build
breakage occurs when I merge the cifs tree. So you will need to tell
Linus about this needed fixup when he merges the cifs tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [PATCH] scsi: ultrastor.c depends on ISA_DMA_API
From: William Breathitt Gray @ 2016-05-19 19:14 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, James E.J. Bottomley, Martin K. Petersen,
Stephen Rothwell, linux-next, linux-scsi
In-Reply-To: <20160519185335.GA18253@sophia>
On Thu, May 19, 2016 at 02:53:35PM -0400, William Breathitt Gray wrote:
>Although request_dma and free_dma are conditionally dependent on
>CONFIG_ISA_DMA_API inside the arch/x86/include/asm/dma.h file, they are
>defined inside the kernel/dma.c file which depends on
>CONFIG_GENERIC_ISA_DMA in order to build on X86. Therefore,
>GENERIC_ISA_DMA should be in the depends line for SCSI_ULTRASTOR instead
>of ISA_DMA_API.
>
>William Breathitt Gray
My apologies, I was too quick to send and didn't realize
CONFIG_GENERIC_ISA_DMA is "def_bool y" in X86. In that case, ISA_DMA_API
should suffice; thus the line becomes:
depends X86 && SCSI && ISA_DMA_API
William Breathitt Gray
^ permalink raw reply
* Re: [PATCH] scsi: ultrastor.c depends on ISA_DMA_API
From: William Breathitt Gray @ 2016-05-19 18:53 UTC (permalink / raw)
To: Randy Dunlap
Cc: linux-kernel, James E.J. Bottomley, Martin K. Petersen,
Stephen Rothwell, linux-next, linux-scsi
In-Reply-To: <573DFE8B.2070808@infradead.org>
On Thu, May 19, 2016 at 10:57:31AM -0700, Randy Dunlap wrote:
>From: Randy Dunlap <rdunlap@infradead.org>
>
>Fix build when CONFIG_ISA_DMA_API is not enabled. Fixes these
>build errors (on x86_64):
>
>../drivers/scsi/ultrastor.c: In function 'ultrastor_14f_detect':
>../drivers/scsi/ultrastor.c:519:5: error: implicit declaration of function 'request_dma' [-Werror=implicit-function-declaration]
> if (config.dma_channel && request_dma(config.dma_channel,"Ultrastor")) {
> ^
>../drivers/scsi/ultrastor.c: In function 'ultrastor_release':
>../drivers/scsi/ultrastor.c:658:3: error: implicit declaration of function 'free_dma' [-Werror=implicit-function-declaration]
> free_dma(shost->dma_channel);
> ^
>
>Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>---
> drivers/scsi/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>Found in linux-next but also applies to mainline.
>
>--- linux-next-20160519.orig/drivers/scsi/Kconfig
>+++ linux-next-20160519/drivers/scsi/Kconfig
>@@ -1433,7 +1433,7 @@ config SCSI_U14_34F_MAX_TAGS
>
> config SCSI_ULTRASTOR
> tristate "UltraStor SCSI support"
>- depends on X86 && ISA && SCSI
>+ depends on X86 && ISA && SCSI && ISA_DMA_API
> ---help---
> This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
> adapter family. This driver is explained in section 3.12 of the
The CONFIG_ISA dependency may be removed from the CONFIG_SCSI_ULTRASTOR
Kconfig depends line; the drivers/scsi/ultrastor.c file does not appear
to use the ISA bus driver symbols at all.
Although request_dma and free_dma are conditionally dependent on
CONFIG_ISA_DMA_API inside the arch/x86/include/asm/dma.h file, they are
defined inside the kernel/dma.c file which depends on
CONFIG_GENERIC_ISA_DMA in order to build on X86. Therefore,
GENERIC_ISA_DMA should be in the depends line for SCSI_ULTRASTOR instead
of ISA_DMA_API.
William Breathitt Gray
^ permalink raw reply
* [PATCH] scsi: ultrastor.c depends on ISA_DMA_API
From: Randy Dunlap @ 2016-05-19 17:57 UTC (permalink / raw)
To: linux-kernel, James E.J. Bottomley, Martin K. Petersen
Cc: Stephen Rothwell, linux-next, linux-scsi, vilhelm.gray
In-Reply-To: <20160519164501.4cc8bc4f@canb.auug.org.au>
From: Randy Dunlap <rdunlap@infradead.org>
Fix build when CONFIG_ISA_DMA_API is not enabled. Fixes these
build errors (on x86_64):
../drivers/scsi/ultrastor.c: In function 'ultrastor_14f_detect':
../drivers/scsi/ultrastor.c:519:5: error: implicit declaration of function 'request_dma' [-Werror=implicit-function-declaration]
if (config.dma_channel && request_dma(config.dma_channel,"Ultrastor")) {
^
../drivers/scsi/ultrastor.c: In function 'ultrastor_release':
../drivers/scsi/ultrastor.c:658:3: error: implicit declaration of function 'free_dma' [-Werror=implicit-function-declaration]
free_dma(shost->dma_channel);
^
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
---
drivers/scsi/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Found in linux-next but also applies to mainline.
--- linux-next-20160519.orig/drivers/scsi/Kconfig
+++ linux-next-20160519/drivers/scsi/Kconfig
@@ -1433,7 +1433,7 @@ config SCSI_U14_34F_MAX_TAGS
config SCSI_ULTRASTOR
tristate "UltraStor SCSI support"
- depends on X86 && ISA && SCSI
+ depends on X86 && ISA && SCSI && ISA_DMA_API
---help---
This is support for the UltraStor 14F, 24F and 34F SCSI-2 host
adapter family. This driver is explained in section 3.12 of the
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs tree
From: Anna Schumaker @ 2016-05-19 17:30 UTC (permalink / raw)
To: Trond Myklebust, Stephen Rothwell
Cc: linux-next, linux-kernel, Al Viro, Linus
In-Reply-To: <CAABAsM4xcQzxzjW8mDw=uQ14yZRhLmt92CSkCwSMSqJXX1iLSw@mail.gmail.com>
On 05/19/2016 08:06 AM, Trond Myklebust wrote:
> Thanks Stephen!
>
> Anna will be managing pushing the NFS client changes to Linus during
> this merge window, so I'm assuming she will include this and your
> other fixup in her pull request.
Yep! I'll make sure it's in there.
Anna
>
> Cheers
> Trond
>
> On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi Trond,
>>
>> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
>> failed like this:
>>
>> In file included from include/linux/fs.h:19:0,
>> from fs/nfs/nfs42proc.c:4:
>> fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy':
>> fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named 'i_mutex'
>> mutex_lock(&file_inode(dst)->i_mutex);
>> ^
>> include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock'
>> #define mutex_lock(lock) mutex_lock_nested(lock, 0)
>> ^
>> fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named 'i_mutex'
>> mutex_unlock(&file_inode(dst)->i_mutex);
>> ^
>>
>> Caused by commit
>>
>> 2e72448b07dc ("NFS: Add COPY nfs operation")
>>
>> interacting with commit
>>
>> 9902af79c01a ("parallel lookups: actual switch to rwsem")
>>
>> from Linus' tree.
>>
>> I applied the following merge fix patch - you will need to send this to
>> Linus when you ask him to merge your tree.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Thu, 19 May 2016 10:50:26 +1000
>> Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> fs/nfs/nfs42proc.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
>> index 20c44d1209dc..aa03ed09ba06 100644
>> --- a/fs/nfs/nfs42proc.c
>> +++ b/fs/nfs/nfs42proc.c
>> @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
>> dst_exception.state = dst_lock->open_context->state;
>>
>> do {
>> - mutex_lock(&file_inode(dst)->i_mutex);
>> + inode_lock(file_inode(dst));
>> err = _nfs42_proc_copy(src, pos_src, src_lock,
>> dst, pos_dst, dst_lock, count);
>> - mutex_unlock(&file_inode(dst)->i_mutex);
>> + inode_unlock(file_inode(dst));
>>
>> if (err == -ENOTSUPP) {
>> err = -EOPNOTSUPP;
>> --
>> 2.7.0
>>
>> --
>> Cheers,
>> Stephen Rothwell
^ permalink raw reply
* Re: Crash in -next due to 'drivers/of: Fix depth when unflattening devicetree'
From: Rob Herring @ 2016-05-19 14:47 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Rhyland Klein, linux-next, linux-kernel@vger.kernel.org
In-Reply-To: <20160519031112.GA12007@roeck-us.net>
On Wed, May 18, 2016 at 10:11 PM, Guenter Roeck <linux@roeck-us.net> wrote:
> Hi,
>
> some of my ppc qemu tests crash with the following log message.
>
> VFS: Cannot open root device "hda" or unknown-block(0,0): error -6
> Please append a correct "root=" boot option; here are the available partitions:
> 0100 4096 ram0 (driver?)
> 0101 4096 ram1 (driver?)
> 0102 4096 ram2 (driver?)
> 0103 4096 ram3 (driver?)
> 0104 4096 ram4 (driver?)
> 0105 4096 ram5 (driver?)
> 0106 4096 ram6 (driver?)
> 0107 4096 ram7 (driver?)
> 0108 4096 ram8 (driver?)
> 0109 4096 ram9 (driver?)
> 010a 4096 ram10 (driver?)
> 010b 4096 ram11 (driver?)
> 010c 4096 ram12 (driver?)
> 010d 4096 ram13 (driver?)
> 010e 4096 ram14 (driver?)
> 010f 4096 ram15 (driver?)
> 1600 8383 hdc driver: ide-gd
> Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
>
> A complete boot log is available at
> http://kerneltests.org/builders/qemu-ppc-next/builds/408/steps/qemubuildcommand/logs/stdio
>
> Bisect points to commit 'drivers/of: Fix depth when unflattening devicetree'.
> Reverting this commit fixes the problem. Bisect log is attached.
I've pushed out a fix this morning with an updated version of that
patch [1]. Please test.
Rob
^ permalink raw reply
* next-20160519 build: 0 failures 12 warnings (next-20160519)
From: Build bot for Mark Brown @ 2016-05-19 13:55 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160519
Git describe: next-20160519
Commit: 3c60f7e28e Add linux-next specific files for 20160519
Build Time: 172 min 22 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 12
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allnoconfig
11 warnings 0 mismatches : arm64-allmodconfig
1 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 12
3 ../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
2 ../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
2 ../drivers/pinctrl/stm32/pinctrl-stm32.c:797:17: warning: too many arguments for format [-Wformat-extra-args]
1 ../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1086:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1074:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/soc/mediatek/mtk-pmic-wrap.c:1062:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
../fs/gfs2/dir.c:802:9: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/gfs2/dir.c:1021:8: warning: 'leaf_no' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/reiserfs/ibalance.c:1156:2: warning: 'new_insert_key' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/soc/nps/common.h:148:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../include/soc/nps/common.h:162:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/pinctrl/stm32/pinctrl-stm32.c:797:17: warning: too many arguments for format [-Wformat-extra-args]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1062:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1074:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/soc/mediatek/mtk-pmic-wrap.c:1086:16: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/staging/iio/adc/ad7606_spi.c:24:18: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/pinctrl/stm32/pinctrl-stm32.c:797:17: warning: too many arguments for format [-Wformat-extra-args]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:3658:5: warning: 'compact_result' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/xen/balloon.c:154:13: warning: 'release_memory_resource' declared 'static' but never defined [-Wunused-function]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm-multi_v7_defconfig
arm-multi_v5_defconfig
x86_64-defconfig
close failed in file object destructor:
sys.excepthook is missing
lost sys.stderr
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs tree
From: Trond Myklebust @ 2016-05-19 12:06 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Anna Schumaker, Al Viro, Linus
In-Reply-To: <20160519105847.2b05c81f@canb.auug.org.au>
Thanks Stephen!
Anna will be managing pushing the NFS client changes to Linus during
this merge window, so I'm assuming she will include this and your
other fixup in her pull request.
Cheers
Trond
On Wed, May 18, 2016 at 8:58 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from include/linux/fs.h:19:0,
> from fs/nfs/nfs42proc.c:4:
> fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy':
> fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named 'i_mutex'
> mutex_lock(&file_inode(dst)->i_mutex);
> ^
> include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock'
> #define mutex_lock(lock) mutex_lock_nested(lock, 0)
> ^
> fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named 'i_mutex'
> mutex_unlock(&file_inode(dst)->i_mutex);
> ^
>
> Caused by commit
>
> 2e72448b07dc ("NFS: Add COPY nfs operation")
>
> interacting with commit
>
> 9902af79c01a ("parallel lookups: actual switch to rwsem")
>
> from Linus' tree.
>
> I applied the following merge fix patch - you will need to send this to
> Linus when you ask him to merge your tree.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 19 May 2016 10:50:26 +1000
> Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/nfs/nfs42proc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
> index 20c44d1209dc..aa03ed09ba06 100644
> --- a/fs/nfs/nfs42proc.c
> +++ b/fs/nfs/nfs42proc.c
> @@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
> dst_exception.state = dst_lock->open_context->state;
>
> do {
> - mutex_lock(&file_inode(dst)->i_mutex);
> + inode_lock(file_inode(dst));
> err = _nfs42_proc_copy(src, pos_src, src_lock,
> dst, pos_dst, dst_lock, count);
> - mutex_unlock(&file_inode(dst)->i_mutex);
> + inode_unlock(file_inode(dst));
>
> if (err == -ENOTSUPP) {
> err = -EOPNOTSUPP;
> --
> 2.7.0
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the security tree
From: David Howells @ 2016-05-19 10:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA, James Morris, Steve French,
linux-cifs-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Sachin Prabhu
In-Reply-To: <20160519140120.23b345a1-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
> From: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
> Date: Thu, 19 May 2016 13:45:10 +1000
> Subject: [PATCH] cifs: fix for keyringalloc() API change
>
> Signed-off-by: Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
> ---
> fs/cifs/cifs_spnego.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
> index 248ab431930c..9ef0dfcb2f95 100644
> --- a/fs/cifs/cifs_spnego.c
> +++ b/fs/cifs/cifs_spnego.c
> @@ -207,7 +207,7 @@ init_cifs_spnego(void)
> GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
> (KEY_POS_ALL & ~KEY_POS_SETATTR) |
> KEY_USR_VIEW | KEY_USR_READ,
> - KEY_ALLOC_NOT_IN_QUOTA, NULL);
> + KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
> if (IS_ERR(keyring)) {
> ret = PTR_ERR(keyring);
> goto failed_put_cred;
This looks correct.
David
^ permalink raw reply
* linux-next: Tree for May 19
From: Stephen Rothwell @ 2016-05-19 6:45 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Please do not add any v4.8 destined material to your linux-next included
branches until after v4.7-rc1 has been released.
Changes since 20160518:
The nfs tree gained a conflict against Linus' tree and a build failure
for which I applied a merge fix patch.
The vfs tree gained a conflict against Linus' tree.
The rdma tree gained conflicts against Linus' and the nfs trees.
The security tree gained a build failure for which I applied a merge
fix patch.
Non-merge commits (relative to Linus' tree): 6082
5050 files changed, 271582 insertions(+), 113615 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 236 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (4a5219edcdae Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7)
Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard)
Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask())
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs)
Merging net/master (0b7962a6c4a3 Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails)
Merging sound-current/for-linus (17e1717c11a3 ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type)
Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure)
Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4)
Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7)
Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free)
Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7)
Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7)
Merging input-current/for-linus (23ea5967d6bd Merge branch 'next' into for-linus)
Merging crypto-current/master (4a6b27b79da5 crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (776d7f1694a7 arc: axs103_smp: Fix CPU frequency to 100MHz for dual-core)
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig
Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next)
Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs)
Merging arm-soc/for-next (83e0a1672eb5 Merge branch 'next/defconfig' into for-next)
Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (2dd0d1733417 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next)
Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (35e691cf5165 Merge branch 'fixes-v4.7' into for-next)
Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next)
Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable)
Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>)
Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address)
Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (2c93cd0d5d69 MIPS: Clear Status IPL field when using EIC)
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Merging nios2/for-next (1a0f29e06356 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation)
Merging powerpc/next (1d4e89cf0a4e powerpc/powernv/npu: Add PE to PHB's list)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c53db5222b92 s390/vmem: remove unused function parameter)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7)
Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
CONFLICT (content): Merge conflict in fs/btrfs/dev-replace.c
Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog)
Merging cifs/for-next (5b82c5cbcfe4 cifs: Create dedicated keyring for spnego operations)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (2a28900be206 udf: Export superblock magic to userspace)
Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO)
CONFLICT (content): Merge conflict in fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/indirect.c
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Merging f2fs/dev (1a9c023bd584 f2fs: make exit_f2fs_fs more clear)
CONFLICT (content): Merge conflict in fs/f2fs/data.c
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS)
Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (1b3c6d07e295 pnfs: make pnfs_layout_process more robust)
CONFLICT (content): Merge conflict in fs/nfs/direct.c
Applying: nfs: fix for i_mutex to i_rwsem change
Merging nfsd/nfsd-next (d9e4084f6c97 svcrdma: Generalize svc_rdma_xdr_decode_req())
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (41523ff335f4 ovl: override creds with the ones from the superblock mounter)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (51085a1f913a cifs: use C99 syntax for inode_operations initializer)
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
Applying: ext4: fix linux-next mismerge
Merging pci/next (e257ef55ce51 Merge branches 'pci/arm64' and 'pci/host-hv' into next)
Applying: iommu/amd: fix up for aliases API change
Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d3e47ff44331 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision)
Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (16490980e396 Merge tag 'device-properties-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification)
Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next)
Merging net-next/master (0b7962a6c4a3 Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe)
Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git)
Merging bluetooth/master (27896c83fe94 r8169: default to 64-bit DMA on recent PCIe chips)
Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces)
Merging rdma/for-next (c16d2750a08c IB/mlx5: Fire the CQ completion handler from tasklet)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h
Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6)
Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c)
Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem)
Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void)
Merging drm/drm-next (7c10ddf87472 Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next)
Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels)
Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425)
Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer)
Merging drm-misc/topic/drm-misc (c6740c9c9e91 drm: remove unused dev variables)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.)
Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next)
Merging kbuild/for-next (9ef4c6a22724 Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (17e1717c11a3 ALSA: firewire-lib: change a member of event structure to suppress sparse wanings to bool type)
Merging sound-asoc/for-next (349982487e26 Merge remote-tracking branches 'asoc/fix/ak4642' and 'asoc/fix/twl6040' into asoc-linus)
Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled)
Merging input/next (b06d43f7a3db Input: add Atmel Captouch Button driver)
Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next)
Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect)
Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (57da0c042f4a mmc: block: Pause re-tuning while switched to the RPMB partition)
Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg)
Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c)
Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus)
Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Applying: cifs: fix for keyringalloc() API change
Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall)
Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record)
Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG)
Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression)
Merging watchdog/master (ae67643edc6e Documentation: Add ebc-c384_wdt watchdog-parameters.txt entry)
Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next)
Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching)
Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata)
Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details)
CONFLICT (content): Merge conflict in samples/Makefile
Merging trivial/for-next (52bbe141f37f gitignore: fix wording)
Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (4da8d6f6abe7 devicetree: Add Creative Technology vendor id)
CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt
Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code)
Merging spi/for-next (2dcd0af568b0 Linux 4.6)
Merging tip/auto-latest (139f278f8e96 Merge branch 'core/urgent')
Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events)
Merging rcu/rcu/next (0e7e2457e4e4 Merge commit 'dcd36d01fb3f99d1d5df01714f6ccbe3fbbaf81f' into HEAD)
Merging kvm/linux-next (9842df62004f KVM: MTRR: remove MSR 0x2f8)
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c
CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic-v3.c
Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts)
Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits)
Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16)
CONFLICT (content): Merge conflict in drivers/xen/efi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c
Applying: xen: efi: merge fix patch
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next)
Merging drivers-x86/for-next (f831153ac9d3 asus-wmi: provide access to ALS control)
Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf)
Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk)
Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property)
Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately)
Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case")
Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference)
CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next (60d5794fe5a5 Merge tag 'usb-serial-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP)
Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support)
Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM)
Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
Applying: staging: lustre: o2iblnd: fix for ib_map_mr_sg() API changes
Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing)
Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface)
Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next)
Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next)
Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next)
Merging pinctrl/for-next (58d73d264a02 Merge branch 'devel' into for-next)
Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (0259cd1b6496 Merge remote-tracking branches 'remoteproc/rpmsg-next' and 'remoteproc/rproc-next' into for-next)
Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (18c588786c08 Merge branch 'for-4.7/pwm-atomic' into for-next)
Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (9ffee1c4be7c clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM)
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (f85f84cd36af coresight: Handle build path error)
Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (e897b3cc7a5a Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next)
Merging dax-misc/dax-misc (40543f62cbdc dax: fix a comment in dax_zero_page_range and dax_truncate_page)
CONFLICT (content): Merge conflict in fs/block_dev.c
Merging akpm-current/current (a758ba862244 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in include/linux/radix-tree.h
CONFLICT (content): Merge conflict in include/linux/efi.h
CONFLICT (content): Merge conflict in include/linux/dax.h
CONFLICT (content): Merge conflict in arch/tile/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/cris/Kconfig
Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: make optimistic check for swapin readahead fix
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: mm: make mmap_sem for write waits killable for mm syscalls
Applying: mm: make vm_mmap killable
Applying: mm: make vm_munmap killable
Applying: mm, aout: handle vm_brk failures
Applying: mm, elf: handle vm_brk error
Applying: mm: make vm_brk killable
Applying: mm, proc: make clear_refs killable
Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable
Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable
Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable
Applying: coredump: make coredump_wait wait for mmap_sem for write killable
Applying: aio: make aio_setup_ring killable
Applying: exec: make exec path waiting for mmap_sem killable
Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable
Applying: uprobes: wait for mmap_sem for write killable
Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable
Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable
Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get
Applying: kgdb: depends on VT
Merging akpm/master (84b1f9d91666 kgdb: depends on VT)
^ permalink raw reply
* Re: Linux-next parallel cp workload hang
From: Xiong Zhou @ 2016-05-19 6:22 UTC (permalink / raw)
To: Dave Chinner; +Cc: Xiong Zhou, linux-next, viro, linux-kernel, linux-fsdevel
In-Reply-To: <20160518230231.GA26977@dastard>
On Thu, May 19, 2016 at 09:02:31AM +1000, Dave Chinner wrote:
> On Thu, May 19, 2016 at 12:17:26AM +1000, Dave Chinner wrote:
> > Patch below should fix the deadlock.
>
> The test has been running for several hours without failure using
> this patch, so I'd say this fixes the problem...
Yes, the same for me.
Thanks.
Xiong
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
^ permalink raw reply
* linux-next: build failure after merge of the security tree
From: Stephen Rothwell @ 2016-05-19 4:01 UTC (permalink / raw)
To: James Morris, Steve French, linux-cifs
Cc: linux-next, linux-kernel, Sachin Prabhu, David Howells
Hi James,
After merging the security tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/cifs/cifs_spnego.c: In function 'init_cifs_spnego':
fs/cifs/cifs_spnego.c:206:12: error: too few arguments to function 'keyring_alloc'
keyring = keyring_alloc(".cifs_spnego",
^
In file included from include/linux/cred.h:17:0,
from include/linux/sched.h:56,
from include/linux/kasan.h:4,
from include/linux/slab.h:118,
from fs/cifs/cifs_spnego.c:23:
include/linux/key.h:302:20: note: declared here
extern struct key *keyring_alloc(const char *description, kuid_t uid, kgid_t gid,
^
Caused by commit
5b82c5cbcfe4 ("cifs: Create dedicated keyring for spnego operations")
from the cifs tree interacting with commit
5ac7eace2d00 ("KEYS: Add a facility to restrict new links into a keyring")
from the security tree.
I added the following merge fix patch (and someone will have to let
Linus know):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 May 2016 13:45:10 +1000
Subject: [PATCH] cifs: fix for keyringalloc() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/cifs/cifs_spnego.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index 248ab431930c..9ef0dfcb2f95 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -207,7 +207,7 @@ init_cifs_spnego(void)
GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
(KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ,
- KEY_ALLOC_NOT_IN_QUOTA, NULL);
+ KEY_ALLOC_NOT_IN_QUOTA, NULL, NULL);
if (IS_ERR(keyring)) {
ret = PTR_ERR(keyring);
goto failed_put_cred;
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: Crash in -next due to 'drivers/of: Fix depth when unflattening devicetree'
From: Guenter Roeck @ 2016-05-19 4:00 UTC (permalink / raw)
To: Rhyland Klein; +Cc: linux-next, linux-kernel, Rob Herring
In-Reply-To: <20160519031112.GA12007@roeck-us.net>
On Wed, May 18, 2016 at 08:11:12PM -0700, Guenter Roeck wrote:
> Hi,
>
> some of my ppc qemu tests crash with the following log message.
>
> VFS: Cannot open root device "hda" or unknown-block(0,0): error -6
> Please append a correct "root=" boot option; here are the available partitions:
> 0100 4096 ram0 (driver?)
> 0101 4096 ram1 (driver?)
> 0102 4096 ram2 (driver?)
> 0103 4096 ram3 (driver?)
> 0104 4096 ram4 (driver?)
> 0105 4096 ram5 (driver?)
> 0106 4096 ram6 (driver?)
> 0107 4096 ram7 (driver?)
> 0108 4096 ram8 (driver?)
> 0109 4096 ram9 (driver?)
> 010a 4096 ram10 (driver?)
> 010b 4096 ram11 (driver?)
> 010c 4096 ram12 (driver?)
> 010d 4096 ram13 (driver?)
> 010e 4096 ram14 (driver?)
> 010f 4096 ram15 (driver?)
> 1600 8383 hdc driver: ide-gd
> Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
>
> A complete boot log is available at
> http://kerneltests.org/builders/qemu-ppc-next/builds/408/steps/qemubuildcommand/logs/stdio
>
> Bisect points to commit 'drivers/of: Fix depth when unflattening devicetree'.
> Reverting this commit fixes the problem. Bisect log is attached.
>
> The scripts and root file system used for the test are available at
> https://github.com/groeck/linux-build-test/tree/master/rootfs/ppc
>
> Failing tests are
>
> powerpc:mac99:nosmp:ppc_book3s_defconfig
> powerpc:g3beige:nosmp:ppc_book3s_defconfig
> powerpc:mac99:smp:ppc_book3s_defconfig
>
Turns out this list of failed tests is incomplete. Also failing due to
the same commit, and passing after the commit was reverted:
arm:versatilepb-scsi:versatile_defconfig:versatile-pb
arm:versatilepb:versatile_defconfig:versatile-pb
arm:overo:multi_v7_defconfig:omap3-overo-tobi
arm:overo:omap2plus_defconfig:omap3-overo-tobi
arm:integratorcp:integrator_defconfig:integratorcp
Log with failures is at
http://kerneltests.org/builders/qemu-arm-next/builds/444/steps/qemubuildcommand/logs/stdio
Guenter
> Guenter
>
> ---
> # bad: [1af872fb6cfb3c701d8819466a4672f85c3f17a3] dcssblk: fix the direct_access prototype to add 'size'
> # good: [2dcd0af568b0cf583645c8a317dd12e344b1c72a] Linux 4.6
> git bisect start 'HEAD' 'v4.6'
> # good: [586cf328ff7e7c0c32f89d6f2063c81143802c01] Merge remote-tracking branch 'net-next/master'
> git bisect good 586cf328ff7e7c0c32f89d6f2063c81143802c01
> # bad: [69bf2b19c358d937a3f40c07a08bc73476d43c02] Merge remote-tracking branch 'tty/tty-next'
> git bisect bad 69bf2b19c358d937a3f40c07a08bc73476d43c02
> # good: [c81e18989b12bdb70a056b05b94620eefd2aed7b] Merge remote-tracking branch 'drm/drm-next'
> git bisect good c81e18989b12bdb70a056b05b94620eefd2aed7b
> # good: [4668e9adc5722b6fdf887d0bc70e9f5998507689] Merge remote-tracking branch 'vfio/next'
> git bisect good 4668e9adc5722b6fdf887d0bc70e9f5998507689
> # bad: [8ab5e17d29971673f08ce9cabfa6170e2f56fe07] Merge remote-tracking branch 'ftrace/for-next'
> git bisect bad 8ab5e17d29971673f08ce9cabfa6170e2f56fe07
> # bad: [a792d9ada26755882a5ea1e958bc582fe6f2d7bc] Merge remote-tracking branch 'dt-rh/for-next'
> git bisect bad a792d9ada26755882a5ea1e958bc582fe6f2d7bc
> # good: [03da37387a3aa07e45d077043f48e7dc29206b62] Merge remote-tracking branch 'trivial/for-next'
> git bisect good 03da37387a3aa07e45d077043f48e7dc29206b62
> # good: [8f97c2814b5448d91a3c67081f7d978c097feabe] Documentation: dt: interrupt-controller: fix spelling mistakes
> git bisect good 8f97c2814b5448d91a3c67081f7d978c097feabe
> # good: [947c82cbf01c9c6012cb96e385b5f6d6d1e1decb] drivers/of: Rename unflatten_dt_node()
> git bisect good 947c82cbf01c9c6012cb96e385b5f6d6d1e1decb
> # bad: [047eb65024c00807ff8f0407580f088b23cf908e] of/unittest: Remove unnecessary module.h header inclusion
> git bisect bad 047eb65024c00807ff8f0407580f088b23cf908e
> # good: [bb91f923d176578257aed682047653cc33148413] drivers/of: Export of_detach_node()
> git bisect good bb91f923d176578257aed682047653cc33148413
> # bad: [ac78f9bdcf3836cafcd114a76a9473380a3faef5] drivers/of: Fix depth when unflattening devicetree
> git bisect bad ac78f9bdcf3836cafcd114a76a9473380a3faef5
> # good: [b9c43856f21d97ffdfdd642acf2eb0b52d3b1555] of: dynamic: changeset prop-update revert fix
> git bisect good b9c43856f21d97ffdfdd642acf2eb0b52d3b1555
> # first bad commit: [ac78f9bdcf3836cafcd114a76a9473380a3faef5] drivers/of: Fix depth when unflattening devicetree
^ permalink raw reply
* Crash in -next due to 'drivers/of: Fix depth when unflattening devicetree'
From: Guenter Roeck @ 2016-05-19 3:11 UTC (permalink / raw)
To: Rhyland Klein; +Cc: linux-next, linux-kernel, Rob Herring
Hi,
some of my ppc qemu tests crash with the following log message.
VFS: Cannot open root device "hda" or unknown-block(0,0): error -6
Please append a correct "root=" boot option; here are the available partitions:
0100 4096 ram0 (driver?)
0101 4096 ram1 (driver?)
0102 4096 ram2 (driver?)
0103 4096 ram3 (driver?)
0104 4096 ram4 (driver?)
0105 4096 ram5 (driver?)
0106 4096 ram6 (driver?)
0107 4096 ram7 (driver?)
0108 4096 ram8 (driver?)
0109 4096 ram9 (driver?)
010a 4096 ram10 (driver?)
010b 4096 ram11 (driver?)
010c 4096 ram12 (driver?)
010d 4096 ram13 (driver?)
010e 4096 ram14 (driver?)
010f 4096 ram15 (driver?)
1600 8383 hdc driver: ide-gd
Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
A complete boot log is available at
http://kerneltests.org/builders/qemu-ppc-next/builds/408/steps/qemubuildcommand/logs/stdio
Bisect points to commit 'drivers/of: Fix depth when unflattening devicetree'.
Reverting this commit fixes the problem. Bisect log is attached.
The scripts and root file system used for the test are available at
https://github.com/groeck/linux-build-test/tree/master/rootfs/ppc
Failing tests are
powerpc:mac99:nosmp:ppc_book3s_defconfig
powerpc:g3beige:nosmp:ppc_book3s_defconfig
powerpc:mac99:smp:ppc_book3s_defconfig
Guenter
---
# bad: [1af872fb6cfb3c701d8819466a4672f85c3f17a3] dcssblk: fix the direct_access prototype to add 'size'
# good: [2dcd0af568b0cf583645c8a317dd12e344b1c72a] Linux 4.6
git bisect start 'HEAD' 'v4.6'
# good: [586cf328ff7e7c0c32f89d6f2063c81143802c01] Merge remote-tracking branch 'net-next/master'
git bisect good 586cf328ff7e7c0c32f89d6f2063c81143802c01
# bad: [69bf2b19c358d937a3f40c07a08bc73476d43c02] Merge remote-tracking branch 'tty/tty-next'
git bisect bad 69bf2b19c358d937a3f40c07a08bc73476d43c02
# good: [c81e18989b12bdb70a056b05b94620eefd2aed7b] Merge remote-tracking branch 'drm/drm-next'
git bisect good c81e18989b12bdb70a056b05b94620eefd2aed7b
# good: [4668e9adc5722b6fdf887d0bc70e9f5998507689] Merge remote-tracking branch 'vfio/next'
git bisect good 4668e9adc5722b6fdf887d0bc70e9f5998507689
# bad: [8ab5e17d29971673f08ce9cabfa6170e2f56fe07] Merge remote-tracking branch 'ftrace/for-next'
git bisect bad 8ab5e17d29971673f08ce9cabfa6170e2f56fe07
# bad: [a792d9ada26755882a5ea1e958bc582fe6f2d7bc] Merge remote-tracking branch 'dt-rh/for-next'
git bisect bad a792d9ada26755882a5ea1e958bc582fe6f2d7bc
# good: [03da37387a3aa07e45d077043f48e7dc29206b62] Merge remote-tracking branch 'trivial/for-next'
git bisect good 03da37387a3aa07e45d077043f48e7dc29206b62
# good: [8f97c2814b5448d91a3c67081f7d978c097feabe] Documentation: dt: interrupt-controller: fix spelling mistakes
git bisect good 8f97c2814b5448d91a3c67081f7d978c097feabe
# good: [947c82cbf01c9c6012cb96e385b5f6d6d1e1decb] drivers/of: Rename unflatten_dt_node()
git bisect good 947c82cbf01c9c6012cb96e385b5f6d6d1e1decb
# bad: [047eb65024c00807ff8f0407580f088b23cf908e] of/unittest: Remove unnecessary module.h header inclusion
git bisect bad 047eb65024c00807ff8f0407580f088b23cf908e
# good: [bb91f923d176578257aed682047653cc33148413] drivers/of: Export of_detach_node()
git bisect good bb91f923d176578257aed682047653cc33148413
# bad: [ac78f9bdcf3836cafcd114a76a9473380a3faef5] drivers/of: Fix depth when unflattening devicetree
git bisect bad ac78f9bdcf3836cafcd114a76a9473380a3faef5
# good: [b9c43856f21d97ffdfdd642acf2eb0b52d3b1555] of: dynamic: changeset prop-update revert fix
git bisect good b9c43856f21d97ffdfdd642acf2eb0b52d3b1555
# first bad commit: [ac78f9bdcf3836cafcd114a76a9473380a3faef5] drivers/of: Fix depth when unflattening devicetree
^ permalink raw reply
* Re: linux-next: manual merge of the vfs tree with Linus' tree
From: Steve French @ 2016-05-19 2:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Al Viro, linux-next, LKML, Andreas Gruenbacher,
linux-cifs@vger.kernel.org
In-Reply-To: <20160519111702.752921f8@canb.auug.org.au>
As noted below, it is easier to remove the obsolete comments and I
just pushed the following trivial patch to cifs-2.6.git for-next to do
that.
https://git.samba.org/?p=sfrench/cifs-2.6.git;a=commit;h=fea17ae8ac1c8c44b2fd1c02ae2e15b847d327d1
On Wed, May 18, 2016 at 8:17 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Al,
>
> Today's linux-next merge of the vfs tree got a conflict in:
>
> fs/cifs/cifsfs.c
>
> between commit:
>
> a9ae008f407b ("cifs: Switch to generic xattr handlers")
>
> from Linus' tree and commit:
>
> 51085a1f913a ("cifs: use C99 syntax for inode_operations initializer")
>
> from the vfs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> Al: the c99 fixup is not really necessary as the line is commented out
> and you didn't fix the one in the line above ... a better fix might be
> to delete both those lines?
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/cifs/cifsfs.c
> index 67f622df0858,586d4eadd49e..000000000000
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@@ -917,11 -919,13 +917,11 @@@ const struct inode_operations cifs_syml
> .permission = cifs_permission,
> /* BB add the following two eventually */
> /* revalidate: cifs_revalidate,
> - setattr: cifs_notify_change, *//* BB do we need notify change */
> + .setattr = cifs_notify_change, *//* BB do we need notify change */
> -#ifdef CONFIG_CIFS_XATTR
> - .setxattr = cifs_setxattr,
> - .getxattr = cifs_getxattr,
> + .setxattr = generic_setxattr,
> + .getxattr = generic_getxattr,
> .listxattr = cifs_listxattr,
> - .removexattr = cifs_removexattr,
> -#endif
> + .removexattr = generic_removexattr,
> };
>
> static int cifs_clone_file_range(struct file *src_file, loff_t off,
--
Thanks,
Steve
^ permalink raw reply
* linux-next: manual merge of the rdma tree with the nfs tree
From: Stephen Rothwell @ 2016-05-19 1:53 UTC (permalink / raw)
To: Doug Ledford, Trond Myklebust
Cc: linux-next, linux-kernel, Christoph Hellwig, Bart Van Assche,
Chuck Lever, Anna Schumaker
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
net/sunrpc/xprtrdma/frwr_ops.c
between commit:
55fdfce101a0 ("xprtrdma: Rename rpcrdma_frwr::sg and sg_nents")
from the nfs tree and commits:
ff2ba9936591 ("IB/core: Add passing an offset into the SG to ib_map_mr_sg")
9aa8b3217ed3 ("IB/core: Enhance ib_map_mr_sg()")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/sunrpc/xprtrdma/frwr_ops.c
index a192b91ad67e,94c3fa910b85..000000000000
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -450,10 -421,10 +450,10 @@@ frwr_op_map(struct rpcrdma_xprt *r_xprt
return -ENOMEM;
}
- n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, PAGE_SIZE);
- n = ib_map_mr_sg(mr, frmr->sg, frmr->sg_nents, NULL, PAGE_SIZE);
- if (unlikely(n != frmr->sg_nents)) {
++ n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, NULL, PAGE_SIZE);
+ if (unlikely(n != frmr->fr_nents)) {
pr_err("RPC: %s: failed to map mr %p (%u/%u)\n",
- __func__, frmr->fr_mr, n, frmr->sg_nents);
+ __func__, frmr->fr_mr, n, frmr->fr_nents);
rc = n < 0 ? n : -EINVAL;
goto out_senderr;
}
^ permalink raw reply
* linux-next: manual merge of the rdma tree with Linus' tree
From: Stephen Rothwell @ 2016-05-19 1:45 UTC (permalink / raw)
To: Doug Ledford
Cc: linux-next, linux-kernel, Matan Barak, Amir Vadai,
David S. Miller
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
include/linux/mlx5/driver.h
between commit:
43a335e055bb ("net/mlx5_core: Flow counters infrastructure")
from Linus' tree and commit:
94c6825e0ff7 ("net/mlx5_core: Use tasklet for user-space CQ completion events")
from the rdma tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/mlx5/driver.h
index 07b504f7eb84,5a41f9003941..000000000000
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@@ -41,7 -41,7 +41,8 @@@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/radix-tree.h>
+#include <linux/workqueue.h>
+ #include <linux/interrupt.h>
#include <linux/mlx5/device.h>
#include <linux/mlx5/doorbell.h>
^ permalink raw reply
* Re: linux-next: manual merge of the nfs tree with Linus' tree
From: Weston Andros Adamson @ 2016-05-19 1:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Trond Myklebust, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, hch, Al Viro, Anna Schumaker
In-Reply-To: <20160519104036.3f1ac7cf@canb.auug.org.au>
> On May 18, 2016, at 8:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Trond,
>
> Today's linux-next merge of the nfs tree got a conflict in:
>
> fs/nfs/direct.c
>
> between commit:
>
> c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
>
> from Linus' tree and commit:
>
> ed3743a6d4f3 ("nfs: add debug to directio "good_bytes" counting")
>
> from the nfs tree.
The merge of the nfs tree’s commit looks good to me.
-dros
>
> 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/nfs/direct.c
> index 741a92c470bb,7f03163b5364..000000000000
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@@ -591,8 -596,8 +594,8 @@@ ssize_t nfs_file_direct_read(struct kio
> goto out_unlock;
>
> dreq->inode = inode;
> - dreq->bytes_left = count;
> + dreq->bytes_left = dreq->max_count = count;
> - dreq->io_start = pos;
> + dreq->io_start = iocb->ki_pos;
> dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));
> l_ctx = nfs_get_lock_context(dreq->ctx);
> if (IS_ERR(l_ctx)) {
>
^ permalink raw reply
* Re: linux-next: manual merge of the vfs tree with the ext4 tree
From: Stephen Rothwell @ 2016-05-19 1:26 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Al Viro, Theodore Ts'o, linux-next, linux-kernel,
Christoph Hellwig, Jan Kara
In-Reply-To: <3539720.FHqN9VOtTL@wuerfel>
Hi Arnd,
On Wed, 18 May 2016 16:25:39 +0200 Arnd Bergmann <arnd@arndb.de> wrote:
>
> I'm getting a warning here because the 'offset' variable is no longer
> used, I've fixed it up on my test box like this:
Thanks. I have applied that to linux-next today and fixed up the merge
fix patch from tomorrow.
> commit 21fffc41b151a6146981487a3fee974e33c7005e
> Author: Arnd Bergmann <arnd@arndb.de>
> Date: Tue May 17 13:23:39 2016 +0200
>
> ext4: fix linux-next mismerge
>
> fs/ext4/inode.c: In function 'ext4_direct_IO_read':
> fs/ext4/inode.c:3502:9: error: unused variable 'offset' [-Werror=unused-variable]
> loff_t offset = iocb->ki_pos;
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index cd72f208c405..f7140ca66e3b 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -3499,7 +3499,6 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter)
> {
> int unlocked = 0;
> struct inode *inode = iocb->ki_filp->f_mapping->host;
> - loff_t offset = iocb->ki_pos;
> ssize_t ret;
>
> if (ext4_should_dioread_nolock(inode)) {
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the vfs tree with Linus' tree
From: Stephen Rothwell @ 2016-05-19 1:17 UTC (permalink / raw)
To: Al Viro
Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Andreas Gruenbacher,
Steve French, linux-cifs-u79uwXL29TY76Z2rM5mHXA
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/cifs/cifsfs.c
between commit:
a9ae008f407b ("cifs: Switch to generic xattr handlers")
from Linus' tree and commit:
51085a1f913a ("cifs: use C99 syntax for inode_operations initializer")
from the vfs tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
Al: the c99 fixup is not really necessary as the line is commented out
and you didn't fix the one in the line above ... a better fix might be
to delete both those lines?
--
Cheers,
Stephen Rothwell
diff --cc fs/cifs/cifsfs.c
index 67f622df0858,586d4eadd49e..000000000000
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@@ -917,11 -919,13 +917,11 @@@ const struct inode_operations cifs_syml
.permission = cifs_permission,
/* BB add the following two eventually */
/* revalidate: cifs_revalidate,
- setattr: cifs_notify_change, *//* BB do we need notify change */
+ .setattr = cifs_notify_change, *//* BB do we need notify change */
-#ifdef CONFIG_CIFS_XATTR
- .setxattr = cifs_setxattr,
- .getxattr = cifs_getxattr,
+ .setxattr = generic_setxattr,
+ .getxattr = generic_getxattr,
.listxattr = cifs_listxattr,
- .removexattr = cifs_removexattr,
-#endif
+ .removexattr = generic_removexattr,
};
static int cifs_clone_file_range(struct file *src_file, loff_t off,
^ permalink raw reply
* linux-next: build failure after merge of the nfs tree
From: Stephen Rothwell @ 2016-05-19 0:58 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-next, linux-kernel, Anna Schumaker, Al Viro, Linus
Hi Trond,
After merging the nfs tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
In file included from include/linux/fs.h:19:0,
from fs/nfs/nfs42proc.c:4:
fs/nfs/nfs42proc.c: In function 'nfs42_proc_copy':
fs/nfs/nfs42proc.c:212:30: error: 'struct inode' has no member named 'i_mutex'
mutex_lock(&file_inode(dst)->i_mutex);
^
include/linux/mutex.h:146:44: note: in definition of macro 'mutex_lock'
#define mutex_lock(lock) mutex_lock_nested(lock, 0)
^
fs/nfs/nfs42proc.c:215:32: error: 'struct inode' has no member named 'i_mutex'
mutex_unlock(&file_inode(dst)->i_mutex);
^
Caused by commit
2e72448b07dc ("NFS: Add COPY nfs operation")
interacting with commit
9902af79c01a ("parallel lookups: actual switch to rwsem")
from Linus' tree.
I applied the following merge fix patch - you will need to send this to
Linus when you ask him to merge your tree.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 May 2016 10:50:26 +1000
Subject: [PATCH] nfs: fix for i_mutex to i_rwsem change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/nfs/nfs42proc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c
index 20c44d1209dc..aa03ed09ba06 100644
--- a/fs/nfs/nfs42proc.c
+++ b/fs/nfs/nfs42proc.c
@@ -209,10 +209,10 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src,
dst_exception.state = dst_lock->open_context->state;
do {
- mutex_lock(&file_inode(dst)->i_mutex);
+ inode_lock(file_inode(dst));
err = _nfs42_proc_copy(src, pos_src, src_lock,
dst, pos_dst, dst_lock, count);
- mutex_unlock(&file_inode(dst)->i_mutex);
+ inode_unlock(file_inode(dst));
if (err == -ENOTSUPP) {
err = -EOPNOTSUPP;
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox