* Re: linux-next: manual merge of the akpm tree with the tip tree
From: Peter Zijlstra @ 2017-03-24 8:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next, linux-kernel
In-Reply-To: <20170324164026.4f305846@canb.auug.org.au>
On Fri, Mar 24, 2017 at 04:40:26PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm tree got a conflict in:
>
> arch/x86/include/asm/atomic.h
>
> between commit:
>
> e6790e4b5d5e ("locking/atomic/x86: Use atomic_try_cmpxchg()")
>
> from the tip tree and patch:
>
> "x86/atomic: move __arch_atomic_add_unless out of line"
>
> from the akpm tree.
Urgh, that patch shouldn't be in mm in any case. Also with the
try_cmpxchg() change, the text gain is reduced (about half).
Furthermore, micro-benchmarks show that turning cmpxchg loops like this
into a function makes them more expensive; see:
https://lkml.kernel.org/r/20170322165144.dtidvvbxey7w5pbd@hirez.programming.kicks-ass.net
^ permalink raw reply
* next-20170324 build: 0 failures 3 warnings (next-20170324)
From: Build bot for Mark Brown @ 2017-03-24 9:31 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170324
Git describe: next-20170324
Commit: 65b2dc3829 Add linux-next specific files for 20170324
Build Time: 100 min 15 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 3
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
5 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
2 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm-multi_v4t_defconfig
4 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 3
13 <stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
5 <stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
1 ../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
<stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
<stdin>:1325:2: warning: #warning syscall statx not implemented [-Wcpp]
<stdin>:1328:2: warning: #warning syscall arch_prctl not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the audit tree with Linus' tree
From: Paul Moore @ 2017-03-24 16:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Pablo Neira Ayuso, Richard Guy Briggs
In-Reply-To: <20170324131810.0b70ebbf@canb.auug.org.au>
On Thu, Mar 23, 2017 at 10:18 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Paul,
>
> Today's linux-next merge of the audit tree got a conflict in:
>
> net/netfilter/xt_AUDIT.c
>
> between commit:
>
> 613dbd95723a ("netfilter: x_tables: move hook state into xt_action_param structure")
>
> from Linus' tree and commit:
>
> 36fe46d172e5 ("audit: normalize NETFILTER_PKT")
>
> from the audit 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.
>
> P.S. You may want to consider a newer base for your tree ...
FWIW, the audit/next tree's base is old-ish for a reason; it is that
way out of awkwardness and not neglect. Depending on how things go
today/this-weekend there are some audit patches in the queue which
will require a rebase to a much more current point in time (likely a
4.11-rcX tag, which presents its own challenges, but oh well).
--
paul moore
www.paul-moore.com
^ permalink raw reply
* 0324 tree BUG at kernel/auditsc.c:1513!
From: Xiong Zhou @ 2017-03-25 4:47 UTC (permalink / raw)
To: linux-next; +Cc: linux-audit, linux-kernel
[11230.930568] ------------[ cut here ]------------
[11230.953828] kernel BUG at kernel/auditsc.c:1513!
[11230.976157] invalid opcode: 0000 [#1] SMP
[11230.995917] Modules linked in: btrfs xor raid6_pq ext2 dm_thin_pool dm_persistent_data dm_bio_prison dm_bufio loop ext4 jbd2 mbcache xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter dm_mirror dm_region_hash dm_log dm_mod intel_rapl sb_edac edac_core x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc ipmi_ssif aesni_intel crypto_simd ipmi_si glue_helper iTCO_wdt ipmi_devintf iTCO_vendor_support cryptd dax_pmem sg hpilo ipmi_msghandler hpwdt lpc_ich pcc_cpufreq pcspkr dax ioatdma i2c_i801 wmi acpi_powe
r_meter acpi_cpufreq
[11231.318010] dca shpchp nfsd auth_rpcgss nfs_acl lockd grace sunrpc binfmt_misc ip_tables xfs libcrc32c sd_mod mgag200 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm drm tg3 ptp hpsa crc32c_intel nd_pmem serio_raw i2c_core pps_core scsi_transport_sas [last unloaded: scsi_debug]
[11231.440342] CPU: 24 PID: 15334 Comm: dio_truncate Not tainted 4.11.0-rc3-linux-next-65b2dc3-next-20170324 #336
[11231.488861] Hardware name: HP ProLiant DL360 Gen9, BIOS P89 05/06/2015
[11231.521003] task: ffff9eb578bc5a00 task.stack: ffffc277665d8000
[11231.547477] RIP: 0010:__audit_syscall_entry+0xf0/0x100
[11231.570495] RSP: 0018:ffffc277665dbe90 EFLAGS: 00010206
[11231.594551] RAX: 0000000000000000 RBX: ffff9ebf2896a800 RCX: 0000000000000000
[11231.626815] RDX: 0000000000004000 RSI: 00007ffe7a853c60 RDI: 0000000000000002
[11231.658965] RBP: ffffc277665dbea0 R08: 00007ffe7a853940 R09: ffff9eb578bc5a00
[11231.691211] R10: 00007ffe7a853940 R11: 00000000770b5a00 R12: 0000000000000000
[11231.723119] R13: 0000000000000002 R14: 0000000000000000 R15: 0000000000000000
[11231.755258] FS: 00007fdbdb18b740(0000) GS:ffff9ebf3fc00000(0000) knlGS:0000000000000000
[11231.791482] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[11231.817433] CR2: 00007fff02451000 CR3: 0000000760820000 CR4: 00000000001406e0
[11231.849728] Call Trace:
[11231.860748] syscall_trace_enter+0x1d0/0x2b0
[11231.880034] ? __audit_syscall_exit+0x209/0x290
[11231.900057] do_syscall_64+0x155/0x180
[11231.916776] entry_SYSCALL64_slow_path+0x25/0x25
[11231.937440] RIP: 0033:0x7fdbdad70c20
[11231.953513] RSP: 002b:00007ffe7a853c28 EFLAGS: 00000246 ORIG_RAX: 0000000000000002
[11231.989037] RAX: ffffffffffffffda RBX: 00007fdbdb18b6c0 RCX: 00007fdbdad70c20
[11232.023770] RDX: 0000000000000000 RSI: 0000000000004000 RDI: 00007ffe7a853c60
[11232.059308] RBP: 00007ffe7a853c60 R08: 0000000000000000 R09: 0000000001a68010
[11232.091419] R10: 00007ffe7a853940 R11: 0000000000000246 R12: 00000000ffffffff
[11232.123493] R13: 00007ffe7a854d50 R14: 0000000000000000 R15: 0000000000000000
[11232.155457] Code: 02 00 00 00 00 00 00 5b 41 5c 5d c3 48 c7 43 50 00 00 00 00 48 c7 c2 a0 f8 6f a6 48 89 de 4c 89 cf e8 05 f5 ff ff 41 89 c4 eb a9 <0f> 0b 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00
[11232.240315] RIP: __audit_syscall_entry+0xf0/0x100 RSP: ffffc277665dbe90
[11232.272441] BUG: unable to handle kernel paging request at ffff9ebf29362000
[11232.272451] ---[ end trace 7e25ab22dc4e0f7a ]---
[11232.273486] Kernel panic - not syncing: Fatal exception
[11232.347746] IP: __memmove+0x24/0x1a0
[11232.363684] PGD 7362e1067
[11232.363684] P4D 7362e1067
[11232.375799] PUD 107243f063
[11232.387851] PMD 1069361063
[11232.400372] BAD
[11232.422587] Oops: 0002 [#2] SMP
[11232.436808] Modules linked in: btrfs xor raid6_pq ext2 dm_thin_pool dm_persistent_data dm_bio_prison dm_bufio loop ext4 jbd2 mbcache xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter dm_mirror dm_region_hash dm_log dm_mod intel_rapl sb_edac edac_core x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc ipmi_ssif aesni_intel crypto_simd ipmi_si glue_helper iTCO_wdt ipmi_devintf iTCO_vendor_support cryptd dax_pmem sg hpilo ipmi_msghandler hpwdt lpc_ich pcc_cpufreq pcspkr dax ioatdma i2c_i801 wmi acpi_powe
r_meter acpi_cpufreq
[11232.793787] dca shpchp nfsd auth_rpcgss nfs_acl lockd grace sunrpc binfmt_misc ip_tables xfs libcrc32c sd_mod mgag200 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm drm tg3 ptp hpsa crc32c_intel nd_pmem serio_raw i2c_core pps_core scsi_transport_sas [last unloaded: scsi_debug]
[11232.920032] CPU: 19 PID: 15333 Comm: dio_truncate Tainted: G D 4.11.0-rc3-linux-next-65b2dc3-next-20170324 #336
[11232.972689] Hardware name: HP ProLiant DL360 Gen9, BIOS P89 05/06/2015
[11233.002856] task: ffff9ebf34519680 task.stack: ffffc2776d3f4000
[11233.030440] RIP: 0010:__memmove+0x24/0x1a0
[11233.050212] RSP: 0018:ffffc2776d3f78a8 EFLAGS: 00010287
[11233.075431] RAX: ffff9ebf28944920 RBX: 0000000000000000 RCX: ffffffffff5e2040
[11233.109644] RDX: fffffffffffff720 RSI: ffff9ebf29361ff8 RDI: ffff9ebf29362000
[11233.144389] RBP: ffffc2776d3f78b0 R08: ffff9ebf28944038 R09: 0000000000000000
[11233.178504] R10: 00000001166159f0 R11: 0000000000000000 R12: ffffc2776d3f79ac
[11233.211975] R13: ffff9ebf28944000 R14: 0000000000000000 R15: ffff9ebf298733f0
[11233.245237] FS: 00007fdbdb18b740(0000) GS:ffff9eb623cc0000(0000) knlGS:0000000000000000
[11233.282453] CS: 0010 DS: 0000 ES: 000[11233.304930] Shutting down cpus with NMI
[11233.304940] Kernel Offset: 0x24a00000 from 0xffffffff81000000 (relocation range: 0xffffffff80000000-0xffffffffbfffffff)
[11233.378481] ---[ end Kernel panic - not syncing: Fatal exception
^ permalink raw reply
* Funding
From: Garber Home @ 2017-03-25 21:22 UTC (permalink / raw)
To: Recipients
Do you require funding? For Business or Personal loan without stress and Quick approval, email us for more Info.
Thanks
Gaber Financial
^ permalink raw reply
* linux-next: unsigned commit in the rcu tree
From: Stephen Rothwell @ 2017-03-26 13:33 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next
Hi Paul,
Commit 08b35b89141a ("fixup! srcu: Create a tiny SRCU") has not
Signed-off-by tag at all :-(
Please do not put commits in your linux-next included branch that are
not signed.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: unsigned commits in the gfs2 tree
From: Stephen Rothwell @ 2017-03-26 13:22 UTC (permalink / raw)
To: Steven Whitehouse, Bob Peterson; +Cc: linux-next
Hi all,
I noticed that a few of the commits in the gfs2 tree
(git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next)
have no Signed-off-by from their committer.
Also commit e8325475d61e ("Merge commit 'f9fe1c1' into for-next") seems
to merge part of Dave Miller's net-next tree. You really should have
an explanation of why this is being done.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: unsigned commits in the gfs2 tree
From: Bob Peterson @ 2017-03-26 13:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Steven Whitehouse, linux-next, Andreas Gruenbacher
In-Reply-To: <20170327002220.0b800d75@canb.auug.org.au>
----- Original Message -----
| Hi all,
|
| I noticed that a few of the commits in the gfs2 tree
| (git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next)
| have no Signed-off-by from their committer.
|
| Also commit e8325475d61e ("Merge commit 'f9fe1c1' into for-next") seems
| to merge part of Dave Miller's net-next tree. You really should have
| an explanation of why this is being done.
| --
| Cheers,
| Stephen Rothwell
|
Hi Stephen,
Thanks. I'll check and fix the commits in the gfs2 tree, and I'll see
if Andreas can straighten it out with Dave Miller.
Regards,
Bob Peterson
Red Hat File Systems
^ permalink raw reply
* Re: linux-next: unsigned commits in the gfs2 tree
From: Bob Peterson @ 2017-03-26 14:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Steven Whitehouse, linux-next, Andreas Gruenbacher
In-Reply-To: <20170327002220.0b800d75@canb.auug.org.au>
----- Original Message -----
| Hi all,
|
| I noticed that a few of the commits in the gfs2 tree
| (git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next)
| have no Signed-off-by from their committer.
|
| Also commit e8325475d61e ("Merge commit 'f9fe1c1' into for-next") seems
| to merge part of Dave Miller's net-next tree. You really should have
| an explanation of why this is being done.
| --
| Cheers,
| Stephen Rothwell
|
FYI--I fixed the commits in the gfs2 tree. Sorry about that.
Regards,
Bob Peterson
^ permalink raw reply
* Re: 0324 tree BUG at kernel/auditsc.c:1513!
From: Paul Moore @ 2017-03-26 14:51 UTC (permalink / raw)
To: Xiong Zhou; +Cc: linux-next, linux-audit, linux-kernel
In-Reply-To: <20170325044746.xwani5wodyhdgdp5@XZHOUW.usersys.redhat.com>
On Sat, Mar 25, 2017 at 12:47 AM, Xiong Zhou <xzhou@redhat.com> wrote:
> [11230.930568] ------------[ cut here ]------------
> [11230.953828] kernel BUG at kernel/auditsc.c:1513!
> [11230.976157] invalid opcode: 0000 [#1] SMP
> [11230.995917] Modules linked in: btrfs xor raid6_pq ext2 dm_thin_pool dm_persistent_data dm_bio_prison dm_bufio loop ext4 jbd2 mbcache xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_nat_ipv4 nf_nat nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ipt_REJECT nf_reject_ipv4 tun bridge stp llc ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter dm_mirror dm_region_hash dm_log dm_mod intel_rapl sb_edac edac_core x86_pkg_temp_thermal intel_powerclamp coretemp kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel pcbc ipmi_ssif aesni_intel crypto_simd ipmi_si glue_helper iTCO_wdt ipmi_devintf iTCO_vendor_support cryptd dax_pmem sg hpilo ipmi_msghandler hpwdt lpc_ich pcc_cpufreq pcspkr dax ioatdma i2c_i801 wmi acpi_power_meter acpi_cpufreq
> [11231.318010] dca shpchp nfsd auth_rpcgss nfs_acl lockd grace sunrpc binfmt_misc ip_tables xfs libcrc32c sd_mod mgag200 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm drm tg3 ptp hpsa crc32c_intel nd_pmem serio_raw i2c_core pps_core scsi_transport_sas [last unloaded: scsi_debug]
> [11231.440342] CPU: 24 PID: 15334 Comm: dio_truncate Not tainted 4.11.0-rc3-linux-next-65b2dc3-next-20170324 #336
> [11231.488861] Hardware name: HP ProLiant DL360 Gen9, BIOS P89 05/06/2015
> [11231.521003] task: ffff9eb578bc5a00 task.stack: ffffc277665d8000
> [11231.547477] RIP: 0010:__audit_syscall_entry+0xf0/0x100
> [11231.570495] RSP: 0018:ffffc277665dbe90 EFLAGS: 00010206
> [11231.594551] RAX: 0000000000000000 RBX: ffff9ebf2896a800 RCX: 0000000000000000
> [11231.626815] RDX: 0000000000004000 RSI: 00007ffe7a853c60 RDI: 0000000000000002
> [11231.658965] RBP: ffffc277665dbea0 R08: 00007ffe7a853940 R09: ffff9eb578bc5a00
> [11231.691211] R10: 00007ffe7a853940 R11: 00000000770b5a00 R12: 0000000000000000
> [11231.723119] R13: 0000000000000002 R14: 0000000000000000 R15: 0000000000000000
> [11231.755258] FS: 00007fdbdb18b740(0000) GS:ffff9ebf3fc00000(0000) knlGS:0000000000000000
> [11231.791482] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [11231.817433] CR2: 00007fff02451000 CR3: 0000000760820000 CR4: 00000000001406e0
> [11231.849728] Call Trace:
> [11231.860748] syscall_trace_enter+0x1d0/0x2b0
> [11231.880034] ? __audit_syscall_exit+0x209/0x290
> [11231.900057] do_syscall_64+0x155/0x180
> [11231.916776] entry_SYSCALL64_slow_path+0x25/0x25
> [11231.937440] RIP: 0033:0x7fdbdad70c20
> [11231.953513] RSP: 002b:00007ffe7a853c28 EFLAGS: 00000246 ORIG_RAX: 0000000000000002
> [11231.989037] RAX: ffffffffffffffda RBX: 00007fdbdb18b6c0 RCX: 00007fdbdad70c20
> [11232.023770] RDX: 0000000000000000 RSI: 0000000000004000 RDI: 00007ffe7a853c60
> [11232.059308] RBP: 00007ffe7a853c60 R08: 0000000000000000 R09: 0000000001a68010
> [11232.091419] R10: 00007ffe7a853940 R11: 0000000000000246 R12: 00000000ffffffff
> [11232.123493] R13: 00007ffe7a854d50 R14: 0000000000000000 R15: 0000000000000000
> [11232.155457] Code: 02 00 00 00 00 00 00 5b 41 5c 5d c3 48 c7 43 50 00 00 00 00 48 c7 c2 a0 f8 6f a6 48 89 de 4c 89 cf e8 05 f5 ff ff 41 89 c4 eb a9 <0f> 0b 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00
> [11232.240315] RIP: __audit_syscall_entry+0xf0/0x100 RSP: ffffc277665dbe90
> [11232.272441] BUG: unable to handle kernel paging request at ffff9ebf29362000
> [11232.272451] ---[ end trace 7e25ab22dc4e0f7a ]---
Can you elaborate a bit more on this? For example, what were you
doing that caused this fault? Is it easily reproduced?
I'm assuming based on the kernel name,
4.11.0-rc3-linux-next-65b2dc3-next-20170324, that this is linux-next
from March 24th. Looking at that code it doesn't have that last big
pull request that Linus merged on Saturday, the 25th. We did merge
some small changes into audit/next on Wednesday, the 22nd, and
Thursday, the 23rd, but nothing that should involve the syscall entry
code. Hmmm.
--
paul moore
www.paul-moore.com
^ permalink raw reply
* Re: linux-next: unsigned commit in the rcu tree
From: Paul E. McKenney @ 2017-03-26 16:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20170327003327.3d5bf230@canb.auug.org.au>
On Mon, Mar 27, 2017 at 12:33:27AM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Commit 08b35b89141a ("fixup! srcu: Create a tiny SRCU") has not
> Signed-off-by tag at all :-(
>
> Please do not put commits in your linux-next included branch that are
> not signed.
I should have done the rebase before pushing, which I have now done.
Please accept my apologies for the noise!
Thanx, Paul
^ permalink raw reply
* Re: linux-next: unsigned commit in the rcu tree
From: Stephen Rothwell @ 2017-03-26 22:45 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next
In-Reply-To: <20170326162204.GX3637@linux.vnet.ibm.com>
Hi Paul,
On Sun, 26 Mar 2017 09:22:04 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> On Mon, Mar 27, 2017 at 12:33:27AM +1100, Stephen Rothwell wrote:
> > Hi Paul,
> >
> > Commit 08b35b89141a ("fixup! srcu: Create a tiny SRCU") has not
> > Signed-off-by tag at all :-(
> >
> > Please do not put commits in your linux-next included branch that are
> > not signed.
>
> I should have done the rebase before pushing, which I have now done.
> Please accept my apologies for the noise!
Now worries, but I think you forgot to push (i.e. that commit is still
the top of the rcu tree as I see it) ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: unsigned commit in the rcu tree
From: Paul E. McKenney @ 2017-03-26 23:18 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next
In-Reply-To: <20170327094549.1868c8e5@canb.auug.org.au>
On Mon, Mar 27, 2017 at 09:45:49AM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> On Sun, 26 Mar 2017 09:22:04 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > On Mon, Mar 27, 2017 at 12:33:27AM +1100, Stephen Rothwell wrote:
> > > Hi Paul,
> > >
> > > Commit 08b35b89141a ("fixup! srcu: Create a tiny SRCU") has not
> > > Signed-off-by tag at all :-(
> > >
> > > Please do not put commits in your linux-next included branch that are
> > > not signed.
> >
> > I should have done the rebase before pushing, which I have now done.
> > Please accept my apologies for the noise!
>
> Now worries, but I think you forgot to push (i.e. that commit is still
> the top of the rcu tree as I see it) ...
Quite right! I just pushed the new branch.
Thanx, Paul
^ permalink raw reply
* linux-next: manual merge of the gfs2 tree with the net tree
From: Stephen Rothwell @ 2017-03-26 23:52 UTC (permalink / raw)
To: Steven Whitehouse, Bob Peterson, David Miller, Networking
Cc: linux-next, linux-kernel, Hayes Wang
Hi all,
Today's linux-next merge of the gfs2 tree got a conflict in:
drivers/net/usb/r8152.c
between commit:
2f25abe6bac5 ("r8152: prevent the driver from transmitting packets with carrier off")
from the net tree and commit:
ce594e9824ab ("r8152: simply the arguments")
from the gfs2 and net-next trees.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/usb/r8152.c
index c34df33c6d72,3262a326aae6..000000000000
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -3698,27 -3697,19 +3705,29 @@@ static int rtl8152_resume(struct usb_in
if (!test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
tp->rtl_ops.init(tp);
queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);
- netif_device_attach(tp->netdev);
+ netif_device_attach(netdev);
}
- if (netif_running(tp->netdev) && tp->netdev->flags & IFF_UP) {
+ if (netif_running(netdev) && netdev->flags & IFF_UP) {
if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
+ struct napi_struct *napi = &tp->napi;
+
tp->rtl_ops.autosuspend_en(tp, false);
- napi_disable(&tp->napi);
+ napi_disable(napi);
set_bit(WORK_ENABLE, &tp->flags);
- if (netif_carrier_ok(netdev))
- rtl_start_rx(tp);
+
- if (netif_carrier_ok(tp->netdev)) {
++ if (netif_carrier_ok(netdev)) {
+ if (rtl8152_get_speed(tp) & LINK_STATUS) {
+ rtl_start_rx(tp);
+ } else {
- netif_carrier_off(tp->netdev);
++ netif_carrier_off(netdev);
+ tp->rtl_ops.disable(tp);
- netif_info(tp, link, tp->netdev,
++ netif_info(tp, link, netdev,
+ "linking down\n");
+ }
+ }
+
- napi_enable(&tp->napi);
+ napi_enable(napi);
clear_bit(SELECTIVE_SUSPEND, &tp->flags);
smp_mb__after_atomic();
if (!list_empty(&tp->rx_done))
^ permalink raw reply
* linux-next: manual merge of the gfs2 tree with the net tree
From: Stephen Rothwell @ 2017-03-26 23:56 UTC (permalink / raw)
To: Steven Whitehouse, Bob Peterson, David Miller, Networking
Cc: linux-next, linux-kernel, Florian Westphal, Alexey Kodanev
Hi all,
Today's linux-next merge of the gfs2 tree got a conflict in:
net/core/secure_seq.c
between commit:
28ee1b746f49 ("secure_seq: downgrade to per-host timestamp offsets")
from the net tree and commit:
a30aad50c26c ("tcp: rename *_sequence_number() to *_seq_and_tsoff()")
from the gfs2 and net-next trees.
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/core/secure_seq.c
index d28da7d363f1,fb87e78a2cc7..000000000000
--- a/net/core/secure_seq.c
+++ b/net/core/secure_seq.c
@@@ -47,25 -45,8 +47,25 @@@ static u32 seq_scale(u32 seq
#endif
#if IS_ENABLED(CONFIG_IPV6)
+static u32 secure_tcpv6_ts_off(const __be32 *saddr, const __be32 *daddr)
+{
+ const struct {
+ struct in6_addr saddr;
+ struct in6_addr daddr;
+ } __aligned(SIPHASH_ALIGNMENT) combined = {
+ .saddr = *(struct in6_addr *)saddr,
+ .daddr = *(struct in6_addr *)daddr,
+ };
+
+ if (sysctl_tcp_timestamps != 1)
+ return 0;
+
+ return siphash(&combined, offsetofend(typeof(combined), daddr),
+ &ts_secret);
+}
+
- u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,
- __be16 sport, __be16 dport, u32 *tsoff)
+ u32 secure_tcpv6_seq_and_tsoff(const __be32 *saddr, const __be32 *daddr,
+ __be16 sport, __be16 dport, u32 *tsoff)
{
const struct {
struct in6_addr saddr;
@@@ -82,10 -63,10 +82,10 @@@
net_secret_init();
hash = siphash(&combined, offsetofend(typeof(combined), dport),
&net_secret);
- *tsoff = sysctl_tcp_timestamps == 1 ? (hash >> 32) : 0;
+ *tsoff = secure_tcpv6_ts_off(saddr, daddr);
return seq_scale(hash);
}
- EXPORT_SYMBOL(secure_tcpv6_sequence_number);
+ EXPORT_SYMBOL(secure_tcpv6_seq_and_tsoff);
u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
__be16 dport)
@@@ -107,16 -88,8 +107,16 @@@ EXPORT_SYMBOL(secure_ipv6_port_ephemera
#endif
#ifdef CONFIG_INET
+static u32 secure_tcp_ts_off(__be32 saddr, __be32 daddr)
+{
+ if (sysctl_tcp_timestamps != 1)
+ return 0;
+
+ return siphash_2u32((__force u32)saddr, (__force u32)daddr,
+ &ts_secret);
+}
- /* secure_tcp_sequence_number(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d),
+ /* secure_tcp_seq_and_tsoff(a, b, 0, d) == secure_ipv4_port_ephemeral(a, b, d),
* but fortunately, `sport' cannot be 0 in any circumstances. If this changes,
* it would be easy enough to have the former function use siphash_4u32, passing
* the arguments as separate u32.
^ permalink raw reply
* Re: linux-next: unsigned commit in the rcu tree
From: Stephen Rothwell @ 2017-03-27 0:31 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next
In-Reply-To: <20170326231813.GZ3637@linux.vnet.ibm.com>
Hi Paul,
On Sun, 26 Mar 2017 16:18:13 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> Quite right! I just pushed the new branch.
Excellent, thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the kspp tree with the drm-misc tree
From: Stephen Rothwell @ 2017-03-27 1:26 UTC (permalink / raw)
To: Kees Cook, Daniel Vetter, Intel Graphics, DRI
Cc: Emese Revfy, linux-next, linux-kernel
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
include/drm/drm_drv.h
between commit:
91faa0478b59 ("drm: drop extern from function decls")
from the drm-misc tree and commit:
6bbaac116552 ("initify: Mark functions with the __nocapture attribute")
from the kspp 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/drm/drm_drv.h
index 53b98321df9b,ade960c65929..000000000000
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@@ -510,19 -403,11 +510,19 @@@ struct drm_driver
int num_ioctls;
const struct file_operations *fops;
+ /* Everything below here is for legacy driver, never use! */
+ /* private: */
+
/* List of devices hanging off this driver with stealth attach. */
struct list_head legacy_dev_list;
+ int (*firstopen) (struct drm_device *);
+ int (*dma_ioctl) (struct drm_device *dev, void *data, struct drm_file *file_priv);
+ int (*dma_quiescent) (struct drm_device *);
+ int (*context_dtor) (struct drm_device *dev, int context);
+ int dev_priv_size;
};
- __printf(6, 7)
-extern __printf(6, 7) __nocapture(4)
++__printf(6, 7) __nocapture(4)
void drm_dev_printk(const struct device *dev, const char *level,
unsigned int category, const char *function_name,
const char *prefix, const char *format, ...);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* linux-next: build warning after merge of the spi tree
From: Stephen Rothwell @ 2017-03-27 2:41 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-next, linux-kernel, Vignesh R
Hi Mark,
After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:
drivers/spi/spi-ti-qspi.c: In function 'ti_qspi_dma_xfer':
drivers/spi/spi-ti-qspi.c:398:21: warning: unused variable 'dma_dev' [-Wunused-variable]
struct dma_device *dma_dev = chan->device;
^
Introduced by commit
1351aaeb50b2 ("spi: spi-ti-qspi: Use dma_engine wrapper for dma memcpy call")
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build warning after merge of the spi tree
From: Vignesh R @ 2017-03-27 5:33 UTC (permalink / raw)
To: Mark Brown; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20170327134112.69ff893d@canb.auug.org.au>
On Monday 27 March 2017 08:11 AM, Stephen Rothwell wrote:
> Hi Mark,
>
> After merging the spi tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
>
> drivers/spi/spi-ti-qspi.c: In function 'ti_qspi_dma_xfer':
> drivers/spi/spi-ti-qspi.c:398:21: warning: unused variable 'dma_dev' [-Wunused-variable]
> struct dma_device *dma_dev = chan->device;
> ^
>
> Introduced by commit
>
> 1351aaeb50b2 ("spi: spi-ti-qspi: Use dma_engine wrapper for dma memcpy call")
>
Sorry, I have posted a fix for the same.
--
Regards
Vignesh
^ permalink raw reply
* linux-next: Tree for Mar 27
From: Stephen Rothwell @ 2017-03-27 5:29 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170324:
The gfs2 tree gained conflicts against the net tree.
The kspp tree gained a conflict against the drm-misc tree.
Non-merge commits (relative to Linus' tree): 4906
5492 files changed, 403174 insertions(+), 90419 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
and pseries_le_defconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 254 trees (counting Linus' and 37 trees of bug
fix patches pending for the current merge release).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (c02ed2e75ef4 Linux 4.11-rc4)
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition)
Merging arc-current/for-curr (ae9955aeb8e4 ARC: vdk: Fix support of UIO)
Merging arm-current/fixes (a1016e94cce9 ARM: wire up statx syscall)
Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (cc638a488a52 gcc-plugins: update architecture list in documentation)
Merging sparc/master (f8e6859ea9d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (6ac3b77a6fff irda: vlsi_ir: fix check for DMA mapping errors)
Merging ipsec/master (72ef9c4125c7 dccp: fix memory leak during tear-down of unsuccessful connection request)
Merging netfilter/master (f83bf8da1135 netfilter: nfnl_cthelper: Fix memory leak)
Merging ipvs/master (5371bbf4b295 net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled)
Merging wireless-drivers/master (6be3b6cce1e2 ath10k: fix incorrect wlan_mac_base in qca6174_regs)
Merging mac80211/master (ea90e0dc8cec nl80211: fix dumpit error path RTNL deadlocks)
Merging sound-current/for-linus (3f307834e695 ALSA: hda - Adding a group of pin definition to fix headset problem)
Merging pci-current/for-linus (9abb27c7594a PCI: thunder-pem: Add legacy firmware support for Cavium ThunderX host controller)
Merging driver-core.current/driver-core-linus (966fa72a716c kernfs: Check KERNFS_HAS_RELEASE before calling kernfs_release_file())
Merging tty.current/tty-linus (a4a3e061149f tty: fix data race in tty_ldisc_ref_wait())
Merging usb.current/usb-linus (fd290e7096bd Merge tag 'usb-serial-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held)
Merging usb-serial-fixes/usb-linus (436ecf5519d8 USB: serial: qcserial: add Dell DW5811e)
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
Merging staging.current/staging-linus (43c49938bf72 Merge tag 'iio-fixes-for-4.11c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (5c1724c42dc1 Merge tag 'extcon-fixes-for-4.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus)
Merging input-current/for-linus (5659495a7a14 uapi: add missing install of userio.h)
Merging crypto-current/master (9df0eb180c20 crypto: xts,lrw - fix out-of-bounds write after kmalloc failure)
Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info)
Merging vfio-fixes/for-linus (65b1adebfe43 vfio: Rework group release notifier warning)
Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-rc1)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats)
Merging drm-intel-fixes/for-linux-next-fixes (590379aef2e3 drm/i915: make context status notifier head be per engine)
Merging drm-misc-fixes/for-linux-next-fixes (12ffed96d436 drm/fb-helper: Allow var->x/yres(_virtual) < fb->width/height again)
Merging kbuild/for-next (74dfe8b17a52 Merge branches 'fixes' and 'kbuild' into 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 (d5adbfcd5f7b Linux 4.10-rc7)
Merging arm/for-next (2bc6cdda1e32 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (d0c2152bb96e Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
Merging amlogic/for-next (278380ca1a58 Merge branch 'v4.12/drivers' into tmp/aml-rebuild)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
Merging at91/at91-next (982b07d2b5f3 Merge tag 'at91-ab-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (00c0ffa8545a Merge branch 'zte/dt64' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (69cbc9086459 Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (bf395c7d2d96 Merge branch 'omap-for-v4.12/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
Merging renesas/next (47b97a15402a Merge branch 'dt-for-v4.12' into next)
Merging rockchip/for-next (7beee4accce2 Merge branch 'v4.12-armsoc/dts64-symlinks' 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 (ece32e531453 Merge branch 'next/dt' into for-next)
Merging tegra/for-next (cc516494e180 Merge branch for-4.12/clk into for-next)
Merging arm64/for-next/core (29d981217a5d arm64: drop unnecessary newlines in show_regs())
Merging clk/clk-next (7f0b97d5bb4c Merge tag 'sunxi-clk-fixes-for-4.11' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-fixes)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init())
Merging m68knommu/for-next (97da3854c526 Linux 4.11-rc3)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
Merging mips/mips-for-linux-next (d72c4a87e3df Merge branch 'linus' into mips-for-linux-next)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
Merging parisc-hd/for-next (c470abd4fde4 Linux 4.10)
Merging powerpc/next (c7e790c5f4c3 powerpc/64s: POWER8 add missing machine check definitions)
Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (2fa5ed7d8707 s390/mm: Remove double gaddr calculation when notifying)
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 (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (ec59c4ad070d Merge branch 'xtensa-boot' into xtensa-for-next)
Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation)
Merging befs/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (e162345e07e1 Merge branch 'for-next-next-v4.12-20170314' into for-next-20170314)
CONFLICT (content): Merge conflict in fs/btrfs/inode.c
Merging ceph/master (633ee407b9d1 libceph: force GFP_NOIO for socket allocations)
Merging cifs/for-next (70c1da060b51 cifs: remove unused code)
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 (ab4949640d66 reiserfs: avoid a -Wmaybe-uninitialized warning)
Merging ext4/dev (d67d64f42314 ext4: fix two spelling nits)
Merging f2fs/dev (22588f8773f6 f2fs: don't reserve additional space in xattr block)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (9a87ad3da905 fuse: release: private_data cannot be NULL)
Merging gfs2/for-next (307c3320a929 Revert "GFS2: Wait for iopen glock dequeues")
CONFLICT (content): Merge conflict in net/core/secure_seq.c
CONFLICT (content): Merge conflict in drivers/net/usb/r8152.c
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/genet/bcmmii.c
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
Merging nfs/linux-next (97da3854c526 Linux 4.11-rc3)
Merging nfsd/nfsd-next (4544f5d6f165 uapi: fix linux/nfsd/cld.h userspace compilation errors)
Merging orangefs/for-next (e98bdb3059cb Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next)
Merging overlayfs/overlayfs-next (b1eaa950f7e9 ovl: lockdep annotate of nested stacked overlayfs inode lock)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes)
Merging xfs/for-next (8d242e932fb7 xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (9e9c5ba8bd70 Merge branch 'work.statx' into for-next)
CONFLICT (content): Merge conflict in samples/Kconfig
CONFLICT (content): Merge conflict in fs/proc/base.c
CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
Merging printk/for-next (d9c23523ed98 printk: drop call_console_drivers() unused param)
Merging pci/next (d0ec4e67c924 Merge branch 'pci/switchtec' into next)
Merging pstore/for-next/pstore (eec50d76a6ee pstore: Drop needless inode lock during population)
Merging hid/for-next (04e2e78ca134 Merge branch 'for-4.11/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (346e400cfceb i2c: thunderx: ACPI support for clock settings)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (95e15d573eaa hwmon: (dell-smm) Add Dell XPS 15 9560 into DMI list)
Merging jc_docs/docs-next (3f816bac24f0 Documentation: device-mapper: cache.txt: Fix typos)
Merging v4l-dvb/master (c3d4fb0fb41f [media] rc: sunxi-cir: simplify optional reset handling)
Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (6f9655b1b81f drivers/video: Convert remaining uses of pr_warning to pr_warn)
Merging pm/linux-next (fbf5d8d10fc7 Merge branch 'intel_pstate' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next)
Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
Merging net-next/master (88275ed0cb3a Merge branch 'netvsc-next')
Merging ipsec-next/master (add641e7dee3 sched: act_csum: don't mangle TCP and UDP GSO packets)
Merging netfilter-next/master (592d42ac7fd3 Merge branch 'qed-IOV-cleanups')
Merging ipvs-next/master (3c679cba588a ipvs: Document sysctl pmtu_disc)
Merging wireless-drivers-next/master (41977e86c984 rt2x00: add support for MT7620)
Merging bluetooth/master (3c66d1c7ed41 Merge branch 'mlxsw-cosmetics')
Merging mac80211-next/master (335d534938d3 nl80211: Use signed function for a signed variable)
Merging rdma/for-next (9294000d6d89 IB/srp: Drain the send queue before destroying a QP)
Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe())
Merging nand/nand/next (c5d664aa5a4c mtd: nand: do not check R/B# for CMD_SET_FEATURES in nand_command(_lp))
Merging spi-nor/next (9f3cd4537da0 drivers mtd: spi-nor: add Macronix MX25Ux033E and MX25Ux035 variants)
Merging crypto/master (796b40c61714 crypto: ixp4xx - Use sg_virt())
Merging drm/drm-next (65d1086c4479 BackMerge tag 'v4.11-rc3' into drm-next)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_shrinker.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_context.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/scheduler.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/cmd_parser.c
Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays)
Merging drm-intel/for-linux-next (6f9b850bec05 drm/i915: Fix semaphore emission for BDW+ RCS ringbuffer emission)
Merging drm-tegra/drm/tegra/for-next (0725ed651da1 drm/tegra: Add tiling FB modifiers)
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c
Merging drm-misc/for-linux-next (f19aee7f2792 drm/vblank: Remove DRM_VBLANKTIME_IN_VBLANK)
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 (74aab70a5e46 drm/msm/mdp5: Enable 3D mux in mdp5_ctl)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (751c5fae1940 drm: mali-dp: Fix smart layer not going to composition)
Merging sunxi/sunxi/for-next (b76f2725b9b6 Merge branches 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next)
Merging kspp/for-next/kspp (9b5e50a16f07 security/Kconfig: further restrict HARDENED_USERCOPY)
CONFLICT (content): Merge conflict in include/drm/drm_drv.h
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
Merging sound/for-next (a16fbb85c78a ALSA: hda/ca0132: Remove double parentheses)
Merging sound-asoc/for-next (defac605e64f Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/ux500', 'asoc/topic/wm8903', 'asoc/topic/wm8960' and 'asoc/topic/zte-tdm' into asoc-next)
Merging modules/modules-next (5bd933fe4481 module: set .init_array alignment to 8)
Merging input/next (f5a28a7d4858 Input: ads7846 - avoid pen up/down when reading hwmon)
Merging block/for-next (3dca2c2f3d3b Merge branch 'for-4.12/block' into for-next)
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (0e13a4515dad Merge branch 'dm-4.11' into dm-next)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (1226df5ab7f8 mmc: sdhci: clarify the get_timeout_clock callback)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1ad45a9bc4e0 md/raid5-cache: fix payload endianness problem in raid5-cache)
Merging mfd/for-mfd-next (7ca7babfd27f mfd: palmas: Reset the POWERHOLD mux during power off)
Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight)
Merging battery/for-next (5782dcb20370 power: supply: bq24190_charger: Don't spam the logs on charger plug / unplug)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (b925bd919f85 Merge remote-tracking branches 'regulator/topic/pfuze100' and 'regulator/topic/twl6030' into regulator-next)
Merging security/next (3dfc9b02864b LSM: Initialize security_hook_heads upon registration.)
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9c312e79d6af selinux: Delete an unnecessary variable initialisation in range_read())
Merging tpmdd/next (9cabb81dc5a3 tpm/tpm_crb: Enable TPM CRB interface for ARM64)
Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail)
Merging iommu/next (41346dad4de0 Merge branches 'x86/vt-d', 'arm/core', 'core' and 'iommu/fixes' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_pages)
Merging trivial/for-next (d0c2c269a3cc drivers: Clean up duplicated email address)
Merging audit/next (36fe46d172e5 audit: normalize NETFILTER_PKT)
CONFLICT (content): Merge conflict in net/netfilter/xt_AUDIT.c
Merging devicetree/for-next (0634c2958927 of: Add function for generating a DT modalias with a newline)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (4018671222a7 Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (614368bf6b28 Merge branch 'x86/vdso')
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
Merging edac-amd/for-next (819f60fb7db1 EDAC, pnd2_edac: Fix reported DIMM number)
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging ftrace/for-next (65a50c656276 ftrace/graph: Add ftrace_graph_max_depth kernel parameter)
Merging rcu/rcu/next (fd6f7b882ba7 srcu: Introduce CLASSIC_SRCU Kconfig option)
Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (97da3854c526 Linux 4.11-rc3)
Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (bcd3bb63dbc8 KVM: PPC: Book3S HV: Disable HPT resizing on POWER9 for now)
Merging kvms390/next (4e0b1ab72b8a KVM: s390: gs support for kvm guests)
Merging xen-tip/linux-next (d825adb48cf9 xenbus: Remove duplicate inclusion of linux/init.h)
Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages())
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
Merging drivers-x86/for-next (b68049014a82 platform/x86: silead_dmi: Add entry for Insyde 7W tablets)
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 (d7e0f7dddeda leds: cpcap: new driver)
CONFLICT (content): Merge conflict in drivers/platform/x86/dell-laptop.c
Merging ipmi/for-next (ea6200e84182 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
Merging driver-core/driver-core-next (7e040726850a eventpoll.h: add missing epoll event masks)
Merging usb/usb-next (5370860a1f0e USB: usblp: refactor endpoint retrieval)
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/pch_udc.c
Merging usb-gadget/next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging usb-serial/usb-next (2ac8fc51ddf1 USB: serial: whiteheat: simplify endpoint check)
Merging usb-chipidea-next/ci-for-usb-next (4f4555cfe704 usb: chipidea: udc: update gadget state after bus resume)
Merging phy-next/next (fe0134d07127 phy: phy-exynos-pcie: make it explicitly non-modular)
Merging tty/tty-next (acbdad8dd1ab serial: 8250_dw: simplify optional reset handling)
CONFLICT (content): Merge conflict in drivers/tty/tty_ldisc.c
Merging char-misc/char-misc-next (392910cf3f8a drivers, firewire: convert fw_node.ref_count from atomic_t to refcount_t)
CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c
Merging extcon/extcon-next (ad3b7dd097c2 extcon: intel-cht-wc: Add Intel Cherry Trail Whiskey Cove PMIC extcon driver)
Merging staging/staging-next (b0fe8f7b9b5a staging: rtl8192e: Fix issues reported by checkpatch.pl)
Merging mux/for-next (9920ed1461bb mux: core: fix error handling in devm_mux_chip_alloc)
Merging slave-dma/next (4bc9bf4ef86e Merge branch 'topic/xilinx' into next)
Merging cgroup/for-next (9df7000bc3d1 Merge branch 'for-4.12' into for-next)
Merging scsi/for-next (ebb5a94667b4 Merge branch 'fixes' into for-next)
Merging scsi-mkp/for-next (33bd712be7d2 scsi: esas2r: Remove redundant NULL check on buffer)
Merging target-updates/for-next (98fec7793703 iscsi-target: Propigate queue_data_in + queue_status errors)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors)
Merging libata/for-next (bf5dae67c554 Merge branch 'for-4.12' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (80363894995b virtio_mmio: expose header to userspace)
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (eb3328011396 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c
Merging pinctrl/for-next (7c107d2ce51e Merge branch 'devel' into for-next)
Merging pinctrl-samsung/for-next (786b1f7c95d7 Merge branch 'pinctrl-next' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (040757f738e1 ucount: Remove the atomicity from ucount->count)
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (c1ae3cfa0e89 Linux 4.11-rc1)
Merging y2038/y2038 (69973b830859 Linux 4.9)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging livepatching/for-next (10517429b5ac livepatch: make klp_mutex proper part of API)
CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S
CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h
Merging coresight/next (6de8ad2f92ea coresight: Fixes coresight DT parse to get correct output port ID.)
Merging rtc/rtc-next (65e9e65cebbe rtc: cpcap: kfreeing devm allocated memory)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (52084f89b38c device-dax: fix debug output typo)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
Merging akpm-current/current (20518a1747d5 initramfs: use vfs_stat/lstat directly)
CONFLICT (content): Merge conflict in arch/x86/include/asm/atomic64_64.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/atomic.h
Applying: linux-next-rejects
$ git checkout -b akpm remotes/origin/akpm/master
Applying: mm: introduce kv[mz]alloc helpers
Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up
Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB
Applying: lib/rhashtable.c: simplify a strange allocation pattern
Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern
Applying: fs/xattr.c: zero out memory copied to userspace in getxattr
Applying: treewide: use kv[mz]alloc* rather than opencoded variants
Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant
Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant
Applying: drivers/md/bcache/super.c: use kvmalloc
Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly
Applying: scripts/spelling.txt: add "memory" pattern and fix typos
Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: treewide: move set_memory_* functions away from cacheflush.h
Applying: arm: use set_memory.h header
Applying: arm64: use set_memory.h header
Applying: s390: use set_memory.h header
Applying: x86: use set_memory.h header
Applying: agp: use set_memory.h header
Applying: drm: use set_memory.h header
Applying: drm-use-set_memoryh-header-fix
Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header
Applying: drivers/watchdog/hpwdt.c: use set_memory.h header
Applying: include/linux/filter.h: use set_memory.h header
Applying: kernel/module.c: use set_memory.h header
Applying: kernel/power/snapshot.c: use set_memory.h header
Applying: alsa: use set_memory.h header
Applying: drivers/misc/sram-exec.c: use set_memory.h header
Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header
Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h
Applying: treewide: decouple cacheflush.h and set_memory.h
Applying: x86/atomic: move __arch_atomic_add_unless out of line
Applying: x86-atomic-move-__atomic_add_unless-out-of-line-fix
Applying: kernel/sched/fair.c: uninline __update_load_avg()
Applying: kref: remove WARN_ON for NULL release functions
Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd
Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec
Applying: tracing: move trace_handle_return() out of line
Merging akpm/master (57ba8c21a15a tracing: move trace_handle_return() out of line)
^ permalink raw reply
* next-20170327 build: 0 failures 7 warnings (next-20170327)
From: Build bot for Mark Brown @ 2017-03-27 8:48 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170327
Git describe: next-20170327
Commit: 7f0c4a163a Add linux-next specific files for 20170327
Build Time: 100 min 4 sec
Passed: 10 / 10 (100.00 %)
Failed: 0 / 10 ( 0.00 %)
Errors: 0
Warnings: 7
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allmodconfig
4 warnings 0 mismatches : arm-multi_v7_defconfig
1 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Warnings Summary: 7
2 ../drivers/spi/spi-ti-qspi.c:398:21: warning: unused variable 'dma_dev' [-Wunused-variable]
1 arch/arm/configs/multi_v7_defconfig:600:warning: symbol value 'm' invalid for ROCKCHIP_INNO_HDMI
1 arch/arm/configs/multi_v7_defconfig:599:warning: symbol value 'm' invalid for ROCKCHIP_DW_MIPI_DSI
1 arch/arm/configs/multi_v7_defconfig:598:warning: symbol value 'm' invalid for ROCKCHIP_DW_HDMI
1 arch/arm/configs/multi_v7_defconfig:597:warning: symbol value 'm' invalid for ROCKCHIP_ANALOGIX_DP
1 ../include/uapi/linux/byteorder/big_endian.h:32:26: warning: large integer implicitly truncated to unsigned type [-Woverflow]
1 ../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../include/uapi/linux/byteorder/big_endian.h:32:26: warning: large integer implicitly truncated to unsigned type [-Woverflow]
../drivers/misc/aspeed-lpc-ctrl.c:232:17: warning: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t {aka long long unsigned int}' [-Wformat=]
../drivers/spi/spi-ti-qspi.c:398:21: warning: unused variable 'dma_dev' [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
arch/arm/configs/multi_v7_defconfig:597:warning: symbol value 'm' invalid for ROCKCHIP_ANALOGIX_DP
arch/arm/configs/multi_v7_defconfig:598:warning: symbol value 'm' invalid for ROCKCHIP_DW_HDMI
arch/arm/configs/multi_v7_defconfig:599:warning: symbol value 'm' invalid for ROCKCHIP_DW_MIPI_DSI
arch/arm/configs/multi_v7_defconfig:600:warning: symbol value 'm' invalid for ROCKCHIP_INNO_HDMI
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/spi/spi-ti-qspi.c:398:21: warning: unused variable 'dma_dev' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm-multi_v5_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
From: Paul McKenney @ 2017-03-27 17:14 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Daniel Vetter, Intel Graphics, LKML, DRI, Jani Nikula, linux-next
In-Reply-To: <20170322110050.1e2ea77d@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 2157 bytes --]
> On Tue, Mar 21, 2017 at 5:00 PM, Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_shrinker.c
>
> between commit:
>
> 3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths
(shrinker)")
>
> from the drm-intel-fixes tree and commit:
>
> 519d52498156 ("drm/i915: i915_gem_shrink_all() needs an awake device")
>
> from the drm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/i915_gem_shrinker.c
> index d5d2b4c6ed38,006a8b908f77..000000000000
> --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
> +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
> @@@ -263,7 -264,9 +264,9 @@@ unsigned long i915_gem_shrink_all(struc
> I915_SHRINK_BOUND |
> I915_SHRINK_UNBOUND |
> I915_SHRINK_ACTIVE);
> + intel_runtime_pm_put(dev_priv);
> +
> - rcu_barrier(); /* wait until our RCU delayed slab frees are
completed */
> + synchronize_rcu(); /* wait for our earlier RCU delayed slab frees
*/
Unless I am really confused, the RCU delayed slab frees are via call_rcu().
This means that synchronize_rcu() is -not- guaranteed to wait on them.
For example, CPU 0 might be making its way through a pile of callbacks,
including some RCU delayed slab free callbacks. If there are enough
callbacks, it could take CPU 0 several grace periods to work through the
backlog. CPU 1 might have no callbacks queued, and might execute the
above code. Now synchronize_rcu() will wait for a grace period, but only
one, and not necessarily for CPU 0's backlog to drain.
I do not believe that the above fix is safe.
> return freed;
> }
>
[-- Attachment #1.2: Type: text/html, Size: 4202 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* linux-next: manual merge of the kbuild tree with the input-current tree
From: Stephen Rothwell @ 2017-03-27 22:55 UTC (permalink / raw)
To: Masahiro Yamada, Dmitry Torokhov
Cc: linux-next, linux-kernel, Nicolas Dichtel, Naohiro Aota
Hi Masahiro,
Today's linux-next merge of the kbuild tree got a conflict in:
include/uapi/linux/Kbuild
between commit:
5659495a7a14 ("uapi: add missing install of userio.h")
from the input-current tree and commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree.
I fixed it up (the latter supercedes the former, so I just used it) and
can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the s390 tree with the kbuild tree
From: Stephen Rothwell @ 2017-03-27 23:37 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens, Masahiro Yamada
Cc: linux-next, linux-kernel, Nicolas Dichtel
Hi all,
Today's linux-next merge of the s390 tree got a conflict in:
arch/s390/include/uapi/asm/Kbuild
between commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree and commit:
916cda1aa1b4 ("s390: add a system call for guarded storage")
from the s390 tree.
I fixed it up (the form should supercede the latter, so I used the former)
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: manual merge of the kbuild tree with the input-current tree
From: Masahiro Yamada @ 2017-03-28 0:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dmitry Torokhov, linux-next, Linux Kernel Mailing List,
Nicolas Dichtel, Naohiro Aota
In-Reply-To: <20170328095532.04abad61@canb.auug.org.au>
Hi Stephen,
2017-03-28 7:55 GMT+09:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Masahiro,
>
> Today's linux-next merge of the kbuild tree got a conflict in:
>
> include/uapi/linux/Kbuild
>
> between commit:
>
> 5659495a7a14 ("uapi: add missing install of userio.h")
>
> from the input-current tree and commit:
>
> 65017bab8a9e ("uapi: export all headers under uapi directories")
>
> from the kbuild tree.
>
> I fixed it up (the latter supercedes the former, so I just used it) and
> can carry the fix as necessary.
Right. header-y is no longer needed to export headers.
Thanks!
--
Best Regards
Masahiro Yamada
^ 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