* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Ross Zwisler @ 2017-01-31 17:22 UTC (permalink / raw)
To: Mike Galbraith
Cc: Sachin Sant, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, peterz, linux-next@vger.kernel.org,
LKML
In-Reply-To: <1485863317.4498.2.camel@gmx.de>
On Tue, Jan 31, 2017 at 4:48 AM, Mike Galbraith <efault@gmx.de> wrote:
> On Tue, 2017-01-31 at 16:30 +0530, Sachin Sant wrote:
>> Trimming the cc list.
>>
>> > > I assume I should be worried?
>> >
>> > Thanks for the report. No need to worry, the bug has existed for a
>> > while, this patch just turns on the warning ;-)
>> >
>> > The following commit queued up in tip/sched/core should fix your
>> > issues (assuming you see the same callstack on all your powerpc
>> > machines):
>> >
>> > https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=sched/core&id=1b1d62254df0fe42a711eb71948f915918987790
>>
>> I still see this warning with today’s next running inside PowerVM LPAR
>> on a POWER8 box. The stack trace is different from what Michael had
>> reported.
>>
>> Easiest way to recreate this is to Online/offline cpu’s.
>
> (Ditto tip.today, x86_64 + hotplug stress)
<>
I'm also seeing a splat in the mmots tree with
v4.10-rc5-mmots-2017-01-26-15-49, which pulled in this commit by
merging with next. Just booting on an x86_64 VM gives me this:
[ 13.090436] ------------[ cut here ]------------
[ 13.090577] WARNING: CPU: 8 PID: 1 at kernel/sched/sched.h:804
update_load_avg+0x85b/0xb80
[ 13.090577] rq->clock_update_flags < RQCF_ACT_SKIP
[ 13.090578] Modules linked in: dax_pmem dax nd_pmem nd_btt nd_e820 libnvdimm
[ 13.090582] CPU: 8 PID: 1 Comm: systemd Not tainted
4.10.0-rc5-mm1-00313-g5c0c3d7-dirty #10
[ 13.090583] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996),
BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014
[ 13.090583] Call Trace:
[ 13.090585] dump_stack+0x86/0xc3
[ 13.090586] __warn+0xcb/0xf0
[ 13.090588] warn_slowpath_fmt+0x5f/0x80
[ 13.090590] update_load_avg+0x85b/0xb80
[ 13.090591] ? debug_smp_processor_id+0x17/0x20
[ 13.090593] detach_task_cfs_rq+0x3f/0x210
[ 13.090594] task_change_group_fair+0x24/0x100
[ 13.090596] sched_change_group+0x5f/0x110
[ 13.090597] sched_move_task+0x53/0x160
[ 13.090598] cpu_cgroup_attach+0x36/0x70
[ 13.090600] cgroup_migrate_execute+0x230/0x3f0
[ 13.090602] cgroup_migrate+0xce/0x140
[ 13.090603] ? cgroup_migrate+0x5/0x140
[ 13.090604] cgroup_attach_task+0x27f/0x3e0
[ 13.090606] ? cgroup_attach_task+0x9b/0x3e0
[ 13.090608] __cgroup_procs_write+0x30e/0x510
[ 13.090608] ? __cgroup_procs_write+0x70/0x510
[ 13.090610] cgroup_procs_write+0x14/0x20
[ 13.090611] cgroup_file_write+0x44/0x1e0
[ 13.090613] kernfs_fop_write+0x13c/0x1c0
[ 13.090614] __vfs_write+0x37/0x160
[ 13.090615] ? rcu_read_lock_sched_held+0x4a/0x80
[ 13.090616] ? rcu_sync_lockdep_assert+0x2f/0x60
[ 13.090617] ? __sb_start_write+0x10d/0x220
[ 13.090618] ? vfs_write+0x19b/0x1f0
[ 13.090619] ? security_file_permission+0x3b/0xc0
[ 13.090620] vfs_write+0xcb/0x1f0
[ 13.090621] SyS_write+0x58/0xc0
[ 13.090623] entry_SYSCALL_64_fastpath+0x1f/0xc2
[ 13.090623] RIP: 0033:0x7f8b7c1be210
[ 13.090624] RSP: 002b:00007ffe73febfd8 EFLAGS: 00000246 ORIG_RAX:
0000000000000001
[ 13.090625] RAX: ffffffffffffffda RBX: 000055a84870a7e0 RCX: 00007f8b7c1be210
[ 13.090625] RDX: 0000000000000004 RSI: 000055a84870aa10 RDI: 0000000000000033
[ 13.090626] RBP: 0000000000000000 R08: 000055a84870a8c0 R09: 00007f8b7dbda900
[ 13.090627] R10: 000055a84870aa10 R11: 0000000000000246 R12: 0000000000000000
[ 13.090627] R13: 000055a848775360 R14: 000055a84870a7e0 R15: 0000000000000033
[ 13.090629] ---[ end trace ba535936c2409043 ]---
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Mike Galbraith @ 2017-01-31 11:48 UTC (permalink / raw)
To: Sachin Sant, Matt Fleming, Michael Ellerman
Cc: linuxppc-dev@lists.ozlabs.org, peterz, linux-next@vger.kernel.org,
linux-kernel
In-Reply-To: <33118425-8548-475A-8DED-9A2424C0BCCC@linux.vnet.ibm.com>
On Tue, 2017-01-31 at 16:30 +0530, Sachin Sant wrote:
> Trimming the cc list.
>
> > > I assume I should be worried?
> >
> > Thanks for the report. No need to worry, the bug has existed for a
> > while, this patch just turns on the warning ;-)
> >
> > The following commit queued up in tip/sched/core should fix your
> > issues (assuming you see the same callstack on all your powerpc
> > machines):
> >
> > https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=sched/core&id=1b1d62254df0fe42a711eb71948f915918987790
>
> I still see this warning with today’s next running inside PowerVM LPAR
> on a POWER8 box. The stack trace is different from what Michael had
> reported.
>
> Easiest way to recreate this is to Online/offline cpu’s.
(Ditto tip.today, x86_64 + hotplug stress)
[ 94.804196] ------------[ cut here ]------------
[ 94.804201] WARNING: CPU: 3 PID: 27 at kernel/sched/sched.h:804 set_next_entity+0x81c/0x910
[ 94.804201] rq->clock_update_flags < RQCF_ACT_SKIP
[ 94.804202] Modules linked in: ebtable_filter(E) ebtables(E) fuse(E) bridge(E) stp(E) llc(E) iscsi_ibft(E) iscsi_boot_sysfs(E) ip6t_REJECT(E) xt_tcpudp(E) nf_conntrack_ipv6(E) nf_defrag_ipv6(E) ip6table_raw(E) ipt_REJECT(E) iptable_raw(E) iptable_filter(E) ip6table_mangle(E) nf_conntrack_netbios_ns(E) nf_conntrack_broadcast(E) nf_conntrack_ipv4(E) nf_defrag_ipv4(E) ip_tables(E) xt_conntrack(E) nf_conntrack(E) ip6table_filter(E) ip6_tables(E) x_tables(E) x86_pkg_temp_thermal(E) intel_powerclamp(E) coretemp(E) kvm_intel(E) kvm(E) irqbypass(E) crct10dif_pclmul(E) crc32_pclmul(E) nls_iso8859_1(E) crc32c_intel(E) nls_cp437(E) snd_hda_codec_realtek(E) snd_hda_codec_hdmi(E) snd_hda_codec_generic(E) nfsd(E) aesni_intel(E) snd_hda_intel(E) snd_hda_codec(E) snd_hwdep(E) aes_x86_64(E) snd_hda_core
(E) crypto_simd(E)
[ 94.804220] snd_pcm(E) auth_rpcgss(E) snd_timer(E) snd(E) iTCO_wdt(E) iTCO_vendor_support(E) joydev(E) nfs_acl(E) lpc_ich(E) cryptd(E) lockd(E) intel_smartconnect(E) mfd_core(E) i2c_i801(E) battery(E) glue_helper(E) mei_me(E) shpchp(E) mei(E) soundcore(E) grace(E) fan(E) thermal(E) tpm_infineon(E) pcspkr(E) sunrpc(E) efivarfs(E) sr_mod(E) cdrom(E) hid_logitech_hidpp(E) hid_logitech_dj(E) uas(E) usb_storage(E) hid_generic(E) usbhid(E) nouveau(E) wmi(E) i2c_algo_bit(E) drm_kms_helper(E) syscopyarea(E) sysfillrect(E) sysimgblt(E) fb_sys_fops(E) ahci(E) xhci_pci(E) ehci_pci(E) ttm(E) libahci(E) xhci_hcd(E) ehci_hcd(E) r8169(E) mii(E) libata(E) drm(E) usbcore(E) fjes(E) video(E) button(E) af_packet(E) sd_mod(E) vfat(E) fat(E) ext4(E) crc16(E) jbd2(E) mbcache(E) dm_mod(E) loop(E) sg(E) scsi_
mod(E) autofs4(E)
[ 94.804246] CPU: 3 PID: 27 Comm: migration/3 Tainted: G E 4.10.0-tip #15
[ 94.804247] Hardware name: MEDION MS-7848/MS-7848, BIOS M7848W08.20C 09/23/2013
[ 94.804247] Call Trace:
[ 94.804251] ? dump_stack+0x5c/0x7c
[ 94.804253] ? __warn+0xc4/0xe0
[ 94.804255] ? warn_slowpath_fmt+0x4f/0x60
[ 94.804256] ? set_next_entity+0x81c/0x910
[ 94.804258] ? pick_next_task_fair+0x20a/0xa20
[ 94.804259] ? sched_cpu_starting+0x50/0x50
[ 94.804260] ? sched_cpu_dying+0x237/0x280
[ 94.804261] ? sched_cpu_starting+0x50/0x50
[ 94.804262] ? cpuhp_invoke_callback+0x83/0x3e0
[ 94.804263] ? take_cpu_down+0x56/0x90
[ 94.804266] ? multi_cpu_stop+0xa9/0xd0
[ 94.804267] ? cpu_stop_queue_work+0xb0/0xb0
[ 94.804268] ? cpu_stopper_thread+0x81/0x110
[ 94.804270] ? smpboot_thread_fn+0xfe/0x150
[ 94.804272] ? kthread+0xf4/0x130
[ 94.804273] ? sort_range+0x20/0x20
[ 94.804274] ? kthread_park+0x80/0x80
[ 94.804276] ? ret_from_fork+0x26/0x40
[ 94.804277] ---[ end trace b0a9e4aa1fb229bb ]---
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Sachin Sant @ 2017-01-31 11:00 UTC (permalink / raw)
To: Matt Fleming, Michael Ellerman
Cc: linuxppc-dev@lists.ozlabs.org, peterz, linux-next@vger.kernel.org,
linux-kernel
In-Reply-To: <20170130213435.GM31613@codeblueprint.co.uk>
Trimming the cc list.
>> I assume I should be worried?
>
> Thanks for the report. No need to worry, the bug has existed for a
> while, this patch just turns on the warning ;-)
>
> The following commit queued up in tip/sched/core should fix your
> issues (assuming you see the same callstack on all your powerpc
> machines):
>
> https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=sched/core&id=1b1d62254df0fe42a711eb71948f915918987790
I still see this warning with today’s next running inside PowerVM LPAR
on a POWER8 box. The stack trace is different from what Michael had
reported.
Easiest way to recreate this is to Online/offline cpu’s.
[ 114.795609] rq->clock_update_flags < RQCF_ACT_SKIP
[ 114.795621] ------------[ cut here ]------------
[ 114.795632] WARNING: CPU: 2 PID: 27 at kernel/sched/sched.h:804 set_next_entity+0xbc8/0xcc0
[ 114.795634] Modules linked in: 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 rpadlpar_io rpaphp kvm_pr kvm ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter dccp_diag dccp tcp_diag udp_diag inet_diag unix_diag af_packet_diag netlink_diag rpcrdma ib_isert iscsi_target_mod ib_iser libiscsi scsi_transport_iscsi ib_srpt target_core_mod ib_srp ib_ipoib rdma_ucm ib_ucm ib_uverbs ib_umad rdma_cm ib_cm iw_cm iw_cxgb3 ib_core ghash_generic xts gf128mul tpm_ibmvtpm tpm sg vmx_crypto pseries_rng nfsd auth_rpcgss nfs_acl lockd grace sunrpc binfmt_misc ip_tables xfs libcrc32c sr_mod sd_mod cdrom cxgb3 ibmvscsi ibmveth scsi_transport
_srp mdio
[ 114.795751] dm_mirror dm_region_hash dm_log dm_mod
[ 114.795762] CPU: 2 PID: 27 Comm: migration/2 Not tainted 4.10.0-rc6-next-20170131 #1
[ 114.795765] task: c0000004fa2f8600 task.stack: c0000004fa49c000
[ 114.795768] NIP: c000000000114ed8 LR: c000000000114ed4 CTR: c0000000004a8cf0
[ 114.795771] REGS: c0000004fa49f6a0 TRAP: 0700 Not tainted (4.10.0-rc6-next-20170131)
[ 114.795773] MSR: 8000000002823033 <SF,VEC,VSX,FP,ME,IR,DR,RI,LE>
[ 114.795787] CR: 28004022 XER: 00000000
[ 114.795789] CFAR: c0000000008ec5c4 SOFTE: 0
GPR00: c000000000114ed4 c0000004fa49f920 c00000000100dd00 0000000000000026
GPR04: 0000000000000000 0000000000000006 6574616470755f6b c0000000011cdd00
GPR08: 0000000000000000 c000000000c6edb0 000000015ef20000 d000000006488538
GPR12: 0000000000004400 c00000000e801200 c0000000000ecc38 c0000004fe064300
GPR16: 0000000000000000 0000000000000001 0000000000000000 c000000000f27e08
GPR20: c000000000f277c5 0000000000000000 0000000000000004 0000000000000000
GPR24: c00000015fba49f0 c000000000f27e08 c000000000ef9e80 c0000004fa49fb00
GPR28: c00000015fba4980 c00000015fba49f0 c0000004f34c1000 c00000015fba49f0
[ 114.795850] NIP [c000000000114ed8] set_next_entity+0xbc8/0xcc0
[ 114.795855] LR [c000000000114ed4] set_next_entity+0xbc4/0xcc0
[ 114.795857] Call Trace:
[ 114.795862] [c0000004fa49f920] [c000000000114ed4] set_next_entity+0xbc4/0xcc0 (unreliable)
[ 114.795869] [c0000004fa49f9d0] [c000000000119f4c] pick_next_task_fair+0xfc/0x6f0
[ 114.795874] [c0000004fa49fae0] [c000000000104820] sched_cpu_dying+0x3c0/0x450
[ 114.795880] [c0000004fa49fb80] [c0000000000c1958] cpuhp_invoke_callback+0x148/0x5b0
[ 114.795886] [c0000004fa49fbf0] [c0000000000c3340] take_cpu_down+0xb0/0x110
[ 114.795893] [c0000004fa49fc50] [c0000000001a1e58] multi_cpu_stop+0x1a8/0x1e0
[ 114.795899] [c0000004fa49fca0] [c0000000001a20c4] cpu_stopper_thread+0x104/0x1e0
[ 114.795905] [c0000004fa49fd60] [c0000000000f2b90] smpboot_thread_fn+0x290/0x2a0
[ 114.795911] [c0000004fa49fdc0] [c0000000000ecd7c] kthread+0x14c/0x190
[ 114.795919] [c0000004fa49fe30] [c00000000000b4e8] ret_from_kernel_thread+0x5c/0x74
[ 114.795921] Instruction dump:
[ 114.795924] 0fe00000 4bfff884 3d02fff2 89289ac5 2f890000 40fef4ec 39200001 3c62ffac
[ 114.795936] 38633698 99289ac5 487d76b5 60000000 <0fe00000> 4bfff4cc eb9f0118 e93f0120
[ 114.795948] ---[ end trace 5c822f32f967fbc5 ]---
[ 123.059141] nr_pdflush_threads exported in /proc is scheduled for removal
Thanks
-Sachin
^ permalink raw reply
* Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
From: Stephen Rothwell @ 2017-01-31 10:38 UTC (permalink / raw)
To: Amir Goldstein; +Cc: Miklos Szeredi, linux-next, linux-kernel
In-Reply-To: <CAOQ4uxhUQxJs_3SW0Gtm-UAEbvWR7BsjudNH8LUX24OwYnvyZA@mail.gmail.com>
Hi Amir,
On Tue, 31 Jan 2017 08:47:43 +0200 Amir Goldstein <amir73il@gmail.com> wrote:
>
> That's strange.
> overlayfs-next whose head is the for mentioned commit is based on
> v4.10-rc6 and has no duplicated patches AFAICS
The duplicate patches are between v4.10-rc1 and the vfs-miklos tree and
the overlayfs tree includes v4.10-rc1, so there is interactions there.
> Please note that my patch moves do_clone_file_range() from line 1743
> to line 2566,
> because it needs to use file_start_write(), which is defined in line 2533.
> so perhaps the conflict was not resolved correctly?
That is probably what happened, but if the vfs-miklos tree is cleaned
up, these conflicts will all go away.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20170131 build: 2 failures 3 warnings (next-20170131)
From: Build bot for Mark Brown @ 2017-01-31 10:33 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170131
Git describe: next-20170131
Commit: 7c088bd91d Add linux-next specific files for 20170131
Build Time: 105 min 2 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 6
Warnings: 3
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-allnoconfig
2 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 6
1 ../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
1 ../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
1 ../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings Summary: 3
3 ../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
x86_64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 6 errors, 2 warnings, 0 section mismatches
Errors:
../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
Warnings:
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:815:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allmodconfig
arm-multi_v5_defconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Michael Ellerman @ 2017-01-31 8:35 UTC (permalink / raw)
To: Matt Fleming
Cc: fweisbec, tglx, pmladek, hpa, efault, sergey.senozhatsky.work,
peterz, mgorman, wanpeng.li, umgwanakikbuti, byungchul.park, jack,
mingo, riel, luca.abeni, yuyang.du, torvalds, linux-kernel,
linux-tip-commits, linuxppc-dev@lists.ozlabs.org,
linux-next@vger.kernel.org
In-Reply-To: <20170130213435.GM31613@codeblueprint.co.uk>
Matt Fleming <matt@codeblueprint.co.uk> writes:
> On Tue, 31 Jan, at 08:24:53AM, Michael Ellerman wrote:
>>
>> I'm hitting this on multiple powerpc systems:
>>
>> [ 38.339126] rq->clock_update_flags < RQCF_ACT_SKIP
>> [ 38.339134] ------------[ cut here ]------------
>> [ 38.339142] WARNING: CPU: 2 PID: 1 at kernel/sched/sched.h:804 detach_task_cfs_rq+0xa0c/0xd10
>
> [...]
>
>> I assume I should be worried?
>
> Thanks for the report. No need to worry, the bug has existed for a
> while, this patch just turns on the warning ;-)
>
> The following commit queued up in tip/sched/core should fix your
> issues (assuming you see the same callstack on all your powerpc
> machines):
>
> https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=sched/core&id=1b1d62254df0fe42a711eb71948f915918987790
Great thanks.
Looks like that commit is in today's linux-next, so hopefully I won't
see any oopses in my boot tests overnight. If I do I'll let you know.
cheers
^ permalink raw reply
* linux-next: Tree for Jan 31
From: Stephen Rothwell @ 2017-01-31 7:11 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170130:
New tree: idr
Dropped tree: vfs-miklos (build failure and out of date)
The vfs-miklos tree gained a conflict against the overlayfs tree and a
build failure, so I just dropped it for today.
The v4l-dvb tree gained a build failure so I used the version from
next-20170130.
The pm tree gained a conflict against the mips tree.
The net-next tree gained conflicts against the net tree.
The block tree lost its build failure.
The pinctrl tree gained a conflict against the arm-soc tree.
Non-merge commits (relative to Linus' tree): 6025
6756 files changed, 246406 insertions(+), 124169 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 36 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 (751321b3dd50 Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (566cf877a1fc Linux 4.10-rc6)
Merging arm-current/fixes (228dbbfb5d77 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (a0615a16f7d0 powerpc/mm: Use the correct pointer when setting a 2MB pte)
Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (040587af3122 net/sched: cls_flower: Correct matching on ICMPv6 code)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (a47b70ea86bd ravb: unmap descriptors when freeing rings)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (2b1d530cb315 MAINTAINERS: ath9k-devel is closed)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (672980c62c68 PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (a3683e0c1410 Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (5d03a2fd2292 USB: serial: option: add device ID for HP lt2523 (Novatel E371))
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (b17c1bba9cec staging: greybus: timesync: validate platform state callback)
Merging char-misc.current/char-misc-linus (191e885a2e13 firmware: fix NULL pointer dereference in __fw_load_abort())
Merging input-current/for-linus (3f5c34c6d468 Input: wm97xx - make missing platform data non-fatal)
Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (bd00fdf198e2 vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (566cf877a1fc Linux 4.10-rc6)
Merging drm-misc-fixes/for-linux-next-fixes (e6e7b48b295a drm: Don't race connector registration)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (1ba318e23204 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (1788019881e3 ARM: SoC: Document merges)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (dca8057e0936 Merge v4.11/dt64)
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 (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-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 (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (115a6d23681c Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (36dbd2631399 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (52091edac563 arm64: dts: qcom: Add msm8916 CoreSight components)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (95648b747071 Merge branch 'next/soc' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (49f6cba617fe arm64: handle sys and undef traps consistently)
Merging clk/clk-next (eaff16bc4988 clk: qcom: SDHCI enablement on Nexus 5X / 6P)
CONFLICT (add/add): Merge conflict in include/dt-bindings/clock/stm32fx-clock.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (bc53b7e567ab m68k/defconfig: amcore board defconfig tuning)
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 (bf0505dfeac3 MIPS: Fix special case in 64 bit IP checksumming.)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (10528b9c45cf powerpc/bpf: Flush the entire JIT buffer)
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 (9437964885f8 s390/bpf: remove redundant check for non-null image)
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 (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (514f7d5f893f Merge branch 'for-next-next-v4.11-20170126' into for-next-20170126)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
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 (70f16cef06b5 udf: allow implicit blocksize specification during mount)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (9b0d4b59b911 f2fs: declare missing static function)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (aacee72061a3 GFS2: Reduce contention on gfs2_log_lock)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (566cf877a1fc Linux 4.10-rc6)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (97e147358bea vfs: wrap write f_ops with file_{start,end}_write())
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 (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/copy_up.c
$ git reset --hard HEAD^
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (8ffbb1ee31d9 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (248c3398aae1 hwmon: Relax name attribute validation for new APIs)
Merging jc_docs/docs-next (2069889ff78c docs/zh_CN: Add coding-style into docs build system)
Merging v4l-dvb/master (61e0654cf079 Merge branch 'patchwork' into to_next)
$ git reset --hard HEAD^
Merging next-20170130 version of v4l-dvb
Merging fbdev/fbdev-for-next (561eb9d09a93 fbdev: omap/lcd: Make callbacks optional)
Merging pm/linux-next (688fb029a443 Merge branch 'pm-cpufreq' into linux-next)
CONFLICT (content): Merge conflict in arch/mips/configs/lemote2f_defconfig
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' 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 (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (63c190429020 Merge branch 'ESPRESSObin-ethernet')
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/macb.h
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (1995876a06bc xfrm: Add a dummy network device for napi.)
Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (575ddce05077 rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (b4dfe5135f87 Merge branch 'topic/cma-tos' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (07f76443ef81 mtd: nand: mediatek: remove redundant dev_err call in mtk_nfc_probe())
Merging spi-nor/next (8bb6059f038c Documentation: mtk-quadspi: update DT bindings)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (a5b2b6ebf34b drm/sti: Fix compilation failure for drm_framebuffer.pixel_format)
CONFLICT (content): Merge conflict in include/drm/drm_connector.h
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_connector.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 (8adabb8928bc drm/i915: Pevent copying uninitialised garbage into vma->ggtt_view)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (376e5f5449d1 MAINTAINERS: add dma-fence* files to Sync File maintainership)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (e24f5ead1d61 Merge branch 'sunxi/dt64-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
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 (287215e9c466 Merge branch 'topic/intel-lpe-audio' into for-next)
Merging sound-asoc/for-next (3b9a1add8e1c Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (7598d167df99 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (f719315b52b5 Input: constify device_type structures)
Merging block/for-next (2b2cda014e59 Merge branch 'for-4.11/rq-refactor' into for-next)
Merging lightnvm/for-next (350e28c7e510 lightnvm: allow targets to use sysfs)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (2fb4d2ecbaa8 mmc: core/mmci: restore pre/post_req behaviour)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (161d1e707a7b md/r5cache: enable chunk_aligned_read with write back cache)
Merging mfd/for-mfd-next (3d66c8abc13e mfd: cpcap: Add minimal support)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (b09dc5185241 Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/qcom-smd', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (710584b9daef Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next)
Merging integrity/next (07a77aadc4e8 ima: fix ima_d_path() possible race with rename)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (f6513b2fa319 tpm: add securityfs support for TPM 2.0 firmware event log)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (2e6f524c8cea Merge branches 'iommu/fixes', 'arm/exynos', 'arm/smmu', 'arm/core' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (a51741ebe131 Documentation: usb: fix wrong documentation paths)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (8d58e8f66f84 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (5bf728f02218 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (1bd9900b8301 EDAC, amd64: Add x86cpuid sanity check during init)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
Merging rcu/rcu/next (19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (9d93dc1c96ec arm/arm64: KVM: Get rid of KVM_MEMSLOT_INCOHERENT)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (ad53fe0decb9 Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next)
Merging kvms390/next (a8c39dd77cb9 KVM: s390: Add debug logging to basic cpu model interface)
Merging xen-tip/linux-next (cc272163ea55 x86/xen: Fix APIC id mismatch warning on Intel)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (9eeda3897a85 platform/x86: add support for devices with Silead touchscreens)
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
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 (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (aa42db44f670 8250: of: remove remnants of generic of_serial driver)
Merging usb/usb-next (4ddecf76b5ae USB: cdc-acm: fix TIOCGSERIAL flags)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (ea534e0b4047 USB: serial: add uPD78F0730 USB to Serial Adaptor Driver)
Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging staging/staging-next (63d8d50ce356 staging: lustre: lnet: Fix coding style errors)
CONFLICT (modify/delete): drivers/staging/greybus/timesync_platform.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/greybus/timesync_platform.c left in tree.
$ git rm -f drivers/staging/greybus/timesync_platform.c
Merging char-misc/char-misc-next (f2d697604cc8 eeprom: idt_89hpesx: Drop kfree for memory allocated with devm_kzalloc)
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging slave-dma/next (69a875aef693 Merge branch 'for-linus' into next)
Merging cgroup/for-next (769a3d317959 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (2340d775b189 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (13c599069130 scsi: hisi_sas: decrease running_req in hisi_sas_slot_task_free())
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ec4537a7d64f pci: drop link_reset)
Merging rpmsg/for-next (5956dd81ac18 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (f334eae9c4e9 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2039834c86f3 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/suspend.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (4651209c75d1 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 (68eb94f16227 proc: Better ownership of files for non-dumpable tasks in user namespaces)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (c440408cf690 random: convert get_random_int/long into get_random_u32/u64)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
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 (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (21da8ba5b665 rtc: sun6i: Switch to devm_rtc_device_register)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging idr/idr-4.11 (39272ecab724 radix-tree: Store a pointer to the root in each node)
Merging akpm-current/current (f40364e40a57 ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (d5cd4249c55f mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
From: Amir Goldstein @ 2017-01-31 6:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Miklos Szeredi, linux-next, linux-kernel
In-Reply-To: <20170131111656.3e77663b@canb.auug.org.au>
On Tue, Jan 31, 2017 at 2:16 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Miklos,
>
> Today's linux-next merge of the vfs-miklos tree got a conflict in:
>
> fs/read_write.c
>
> between commit:
>
> 97e147358bea ("vfs: wrap write f_ops with file_{start,end}_write()")
>
> from the overlayfs tree and various duplicated patches between v4.10-rc1
> and the vfs-miklos tree.
>
That's strange.
overlayfs-next whose head is the for mentioned commit is based on
v4.10-rc6 and has no duplicated patches AFAICS
Perhaps you are referring to the similar named patch:
3616119 vfs: no mnt_want_write_file() in vfs_{copy,clone}_file_range()
Miklos has converted mnt_want_write_file() => sb_start_write() for v4.10-rc1
and my change converts it again sb_start_write() => file_start_write(),
which is mostly a semantic difference, but with some implications.
> Please clean up the vfs-miklos tree.
>
> I fixed it up (I just 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.
>
> I then got this build failure from my arm multi_v7_defconfig build:
>
> In file included from /home/sfr/next/next/include/linux/seq_file.h:10:0,
> from /home/sfr/next/next/include/linux/pinctrl/consumer.h:17,
> from /home/sfr/next/next/include/linux/pinctrl/devinfo.h:21,
> from /home/sfr/next/next/include/linux/device.h:24,
> from /home/sfr/next/next/include/linux/dma-mapping.h:6,
> from /home/sfr/next/next/arch/arm/kernel/asm-offsets.c:16:
> /home/sfr/next/next/include/linux/fs.h:2566:19: error: redefinition of 'do_clone
> _file_range'
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
> /home/sfr/next/next/include/linux/fs.h:1743:19: note: previous definition of 'do_clone_file_range' was here
> static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
> ^
>
Please note that my patch moves do_clone_file_range() from line 1743
to line 2566,
because it needs to use file_start_write(), which is defined in line 2533.
so perhaps the conflict was not resolved correctly?
> so I decided to just drop the vfs-miklos tree for today.
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the pinctrl tree with the arm-soc tree
From: Stephen Rothwell @ 2017-01-31 5:29 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-next, linux-kernel, Marek Szyprowski, Krzysztof Kozlowski
Hi Linus,
Today's linux-next merge of the pinctrl tree got a conflict in:
arch/arm/mach-exynos/suspend.c
between commit:
b4765037fc8c ("ARM: EXYNOS: Constify list of retention registers")
from the arm-soc tree and commit:
07731019c59c ("pinctrl: samsung: Move retention control from mach-exynos to the pinctrl driver")
from the pinctrl tree.
I fixed it up (the latter removed the code updated by the former, so I
just did that) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2017-01-31 1:18 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Rafal Ozieblo, Andrei Pistirica
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/cadence/macb.h
between commit:
dc97a89e726c ("net: macb: Fix 64 bit addressing support for GEM")
from the net tree and commit:
c2594d804d5c ("macb: Common code to enable ptp support for MACB/GEM")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/cadence/macb.h
index fc8550a5d47f,94ddedd2d83e..000000000000
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@@ -385,9 -426,18 +426,20 @@@
/* Bitfields in DCFG6. */
#define GEM_PBUF_LSO_OFFSET 27
#define GEM_PBUF_LSO_SIZE 1
+#define GEM_DAW64_OFFSET 23
+#define GEM_DAW64_SIZE 1
+ /* Bitfields in TISUBN */
+ #define GEM_SUBNSINCR_OFFSET 0
+ #define GEM_SUBNSINCR_SIZE 16
+
+ /* Bitfields in TI */
+ #define GEM_NSINCR_OFFSET 0
+ #define GEM_NSINCR_SIZE 8
+
+ /* Bitfields in ADJ */
+ #define GEM_ADDSUB_OFFSET 31
+ #define GEM_ADDSUB_SIZE 1
/* Constants for CLK */
#define MACB_CLK_DIV8 0
#define MACB_CLK_DIV16 1
@@@ -885,9 -942,7 +952,11 @@@ struct macb
u32 wol;
+#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
+ enum macb_hw_dma_cap hw_dma_cap;
+#endif
++
+ struct macb_ptp_info *ptp_info; /* macb-ptp interface */
};
static inline bool macb_is_gem(struct macb *bp)
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2017-01-31 1:23 UTC (permalink / raw)
To: David Miller, Networking
Cc: linux-next, linux-kernel, Hadar Hen Zion, Saeed Mahameed,
Or Gerlitz
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
between commit:
3e621b19b0bb ("net/mlx5e: Support TC encapsulation offloads with upper devices")
from the net tree and commits:
75c33da82736 ("net/mlx5e: TC ipv4 tunnel encap offload cosmetic changes")
9a941117fb76 ("net/mlx5e: Maximize ip tunnel key usage on the TC offloading path")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index c5282b6aba8b,640f10f2e994..000000000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@@ -660,13 -684,10 +684,11 @@@ static int mlx5e_route_lookup_ipv4(stru
struct net_device **out_dev,
struct flowi4 *fl4,
struct neighbour **out_n,
- __be32 *saddr,
int *out_ttl)
{
+ struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
struct rtable *rt;
struct neighbour *n = NULL;
- int ttl;
#if IS_ENABLED(CONFIG_INET)
int ret;
@@@ -678,21 -699,21 +700,19 @@@
#else
return -EOPNOTSUPP;
#endif
-
- if (!switchdev_port_same_parent_id(priv->netdev, rt->dst.dev)) {
- pr_warn("%s: can't offload, devices not on same HW e-switch\n", __func__);
- ip_rt_put(rt);
- return -EOPNOTSUPP;
- }
+ /* if the egress device isn't on the same HW e-switch, we use the uplink */
+ if (!switchdev_port_same_parent_id(priv->netdev, rt->dst.dev))
+ *out_dev = mlx5_eswitch_get_uplink_netdev(esw);
+ else
+ *out_dev = rt->dst.dev;
- ttl = ip4_dst_hoplimit(&rt->dst);
+ *out_ttl = ip4_dst_hoplimit(&rt->dst);
n = dst_neigh_lookup(&rt->dst, &fl4->daddr);
ip_rt_put(rt);
if (!n)
return -ENOMEM;
*out_n = n;
- *saddr = fl4->saddr;
- *out_ttl = ttl;
- *out_dev = rt->dst.dev;
return 0;
}
^ permalink raw reply
* linux-next: manual merge of the pm tree with the mips tree
From: Stephen Rothwell @ 2017-01-31 1:00 UTC (permalink / raw)
To: Rafael J. Wysocki, Ralf Baechle
Cc: linux-next, linux-kernel, Arnd Bergmann, Viresh Kumar
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
arch/mips/configs/lemote2f_defconfig
between commit:
b3f6046186ef ("MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change")
from the mips tree and commit:
e7f73a76e07a ("cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS config option")
from the pm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/mips/configs/lemote2f_defconfig
index 0cdb431bff80,bed745596d86..000000000000
--- a/arch/mips/configs/lemote2f_defconfig
+++ b/arch/mips/configs/lemote2f_defconfig
@@@ -39,8 -39,7 +39,7 @@@ CONFIG_HIBERNATION=
CONFIG_PM_STD_PARTITION="/dev/hda3"
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_DEBUG=y
-CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT=y
- CONFIG_CPU_FREQ_STAT_DETAILS=y
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
^ permalink raw reply
* linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2017-01-31 0:55 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Sean Young
Hi Mauro,
After merging the v4l-dvb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
^
include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
.platform_data = _pdata }
^
Caused by commit
a92def1becf3 ("[media] ir-rx51: port to rc-core")
I have used the v4l-dvb tree from next-20170130 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
From: Stephen Rothwell @ 2017-01-31 0:16 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: linux-next, linux-kernel, Amir Goldstein
Hi Miklos,
Today's linux-next merge of the vfs-miklos tree got a conflict in:
fs/read_write.c
between commit:
97e147358bea ("vfs: wrap write f_ops with file_{start,end}_write()")
from the overlayfs tree and various duplicated patches between v4.10-rc1
and the vfs-miklos tree.
Please clean up the vfs-miklos tree.
I fixed it up (I just 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.
I then got this build failure from my arm multi_v7_defconfig build:
In file included from /home/sfr/next/next/include/linux/seq_file.h:10:0,
from /home/sfr/next/next/include/linux/pinctrl/consumer.h:17,
from /home/sfr/next/next/include/linux/pinctrl/devinfo.h:21,
from /home/sfr/next/next/include/linux/device.h:24,
from /home/sfr/next/next/include/linux/dma-mapping.h:6,
from /home/sfr/next/next/arch/arm/kernel/asm-offsets.c:16:
/home/sfr/next/next/include/linux/fs.h:2566:19: error: redefinition of 'do_clone
_file_range'
static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
^
/home/sfr/next/next/include/linux/fs.h:1743:19: note: previous definition of 'do_clone_file_range' was here
static inline int do_clone_file_range(struct file *file_in, loff_t pos_in,
^
so I decided to just drop the vfs-miklos tree for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Matt Fleming @ 2017-01-30 21:34 UTC (permalink / raw)
To: Michael Ellerman
Cc: fweisbec, tglx, pmladek, hpa, efault, sergey.senozhatsky.work,
peterz, mgorman, wanpeng.li, umgwanakikbuti, byungchul.park, jack,
mingo, riel, luca.abeni, yuyang.du, torvalds, linux-kernel,
linux-tip-commits, linuxppc-dev@lists.ozlabs.org,
linux-next@vger.kernel.org
In-Reply-To: <87tw8gutp6.fsf@concordia.ellerman.id.au>
On Tue, 31 Jan, at 08:24:53AM, Michael Ellerman wrote:
>
> I'm hitting this on multiple powerpc systems:
>
> [ 38.339126] rq->clock_update_flags < RQCF_ACT_SKIP
> [ 38.339134] ------------[ cut here ]------------
> [ 38.339142] WARNING: CPU: 2 PID: 1 at kernel/sched/sched.h:804 detach_task_cfs_rq+0xa0c/0xd10
[...]
> I assume I should be worried?
Thanks for the report. No need to worry, the bug has existed for a
while, this patch just turns on the warning ;-)
The following commit queued up in tip/sched/core should fix your
issues (assuming you see the same callstack on all your powerpc
machines):
https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=sched/core&id=1b1d62254df0fe42a711eb71948f915918987790
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Michael Ellerman @ 2017-01-30 21:24 UTC (permalink / raw)
To: linux-tip-commits
Cc: pmladek, riel, linuxppc-dev, luca.abeni, sergey.senozhatsky.work,
matt, fweisbec, efault, yuyang.du, linux-kernel, byungchul.park,
peterz, torvalds, umgwanakikbuti, linux-next, hpa, jack, tglx,
mgorman, mingo, wanpeng.li
In-Reply-To: <tip-cb42c9a3ebbbb23448c3f9a25417fae6309b1a92@git.kernel.org>
tip-bot for Matt Fleming <tipbot@zytor.com> writes:
> diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
> index 98e7eee..6eeae7e 100644
> --- a/kernel/sched/sched.h
> +++ b/kernel/sched/sched.h
> @@ -768,48 +768,110 @@ static inline u64 __rq_clock_broken(struct rq *rq)
> return READ_ONCE(rq->clock);
> }
>
> +/*
> + * rq::clock_update_flags bits
> + *
> + * %RQCF_REQ_SKIP - will request skipping of clock update on the next
> + * call to __schedule(). This is an optimisation to avoid
> + * neighbouring rq clock updates.
> + *
> + * %RQCF_ACT_SKIP - is set from inside of __schedule() when skipping is
> + * in effect and calls to update_rq_clock() are being ignored.
> + *
> + * %RQCF_UPDATED - is a debug flag that indicates whether a call has been
> + * made to update_rq_clock() since the last time rq::lock was pinned.
> + *
> + * If inside of __schedule(), clock_update_flags will have been
> + * shifted left (a left shift is a cheap operation for the fast path
> + * to promote %RQCF_REQ_SKIP to %RQCF_ACT_SKIP), so you must use,
> + *
> + * if (rq-clock_update_flags >= RQCF_UPDATED)
> + *
> + * to check if %RQCF_UPADTED is set. It'll never be shifted more than
> + * one position though, because the next rq_unpin_lock() will shift it
> + * back.
> + */
> +#define RQCF_REQ_SKIP 0x01
> +#define RQCF_ACT_SKIP 0x02
> +#define RQCF_UPDATED 0x04
> +
> +static inline void assert_clock_updated(struct rq *rq)
> +{
> + /*
> + * The only reason for not seeing a clock update since the
> + * last rq_pin_lock() is if we're currently skipping updates.
> + */
> + SCHED_WARN_ON(rq->clock_update_flags < RQCF_ACT_SKIP);
> +}
I'm hitting this on multiple powerpc systems:
[ 38.339126] rq->clock_update_flags < RQCF_ACT_SKIP
[ 38.339134] ------------[ cut here ]------------
[ 38.339142] WARNING: CPU: 2 PID: 1 at kernel/sched/sched.h:804 detach_task_cfs_rq+0xa0c/0xd10
[ 38.339142] Modules linked in: fuse pseries_rng rng_core vmx_crypto ib_iser rdma_cm iw_cm ib_cm ib_core libiscsi scsi_transport_iscsi autofs4 btrfs raid456 async_raid6_recov async_memcpy async_pq async_xor async_tx xor raid6_pq libcrc32c multipath raid10
[ 38.339162] CPU: 2 PID: 1 Comm: systemd Not tainted 4.10.0-rc6-gccN-next-20170130-g14dcd7e #1
[ 38.339163] task: c000000ffc900000 task.stack: c0000007fda00000
[ 38.339164] NIP: c00000000012d31c LR: c00000000012d318 CTR: c0000000005aed80
[ 38.339165] REGS: c0000007fda03630 TRAP: 0700 Not tainted (4.10.0-rc6-gccN-next-20170130-g14dcd7e)
[ 38.339166] MSR: 8000000000029033 <SF,EE,ME,IR,DR,RI,LE>
[ 38.339170] CR: 28044242 XER: 20000000
[ 38.339171] CFAR: c000000000a732c8 SOFTE: 0
GPR00: c00000000012d318 c0000007fda038b0 c000000000f32c00 0000000000000026
GPR04: 0000000000000000 00000000000001f7 6574616470755f6b 0000000000000000
GPR08: 00000004baa70000 c000000000e1edb0 0000000000000000 0000000000000e8a
GPR12: 0000000000004400 c00000000eaa0800 00003fffc25fdd50 000000003a30b518
GPR16: 000001002495fe70 0000000000000000 000000003a301668 000000000000001b
GPR20: 0000000000000001 c000000ff1d0a000 c0000004a8191300 c00000000b12fe90
GPR24: c000000000e80500 c000000001026dfc c0000007fda03aa0 c0000007fda03b30
GPR28: c0000007fda03b10 c0000004bb864880 c00000000b12fe80 c0000004acb8a900
[ 38.339186] NIP [c00000000012d31c] detach_task_cfs_rq+0xa0c/0xd10
[ 38.339188] LR [c00000000012d318] detach_task_cfs_rq+0xa08/0xd10
[ 38.339188] Call Trace:
[ 38.339189] [c0000007fda038b0] [c00000000012d318] detach_task_cfs_rq+0xa08/0xd10 (unreliable)
[ 38.339192] [c0000007fda03970] [c000000000133cb8] task_change_group_fair+0x48/0x130
[ 38.339193] [c0000007fda039b0] [c0000000001139e4] sched_change_group+0x64/0xd0
[ 38.339195] [c0000007fda039f0] [c000000000121790] sched_move_task+0x60/0x210
[ 38.339197] [c0000007fda03a40] [c000000000121984] cpu_cgroup_attach+0x44/0x70
[ 38.339200] [c0000007fda03a80] [c0000000001b84d0] cgroup_migrate_execute+0x410/0x460
[ 38.339202] [c0000007fda03af0] [c0000000001b8790] cgroup_attach_task+0x180/0x350
[ 38.339203] [c0000007fda03bb0] [c0000000001bb76c] __cgroup_procs_write+0x30c/0x450
[ 38.339205] [c0000007fda03c40] [c0000000001b5644] cgroup_file_write+0x74/0x160
[ 38.339208] [c0000007fda03ca0] [c0000000003fec00] kernfs_fop_write+0x190/0x260
[ 38.339210] [c0000007fda03cf0] [c000000000344a0c] __vfs_write+0x6c/0x1c0
[ 38.339211] [c0000007fda03d90] [c000000000346988] vfs_write+0xd8/0x240
[ 38.339213] [c0000007fda03de0] [c00000000034882c] SyS_write+0x6c/0x110
[ 38.339215] [c0000007fda03e30] [c00000000000b760] system_call+0x38/0xfc
[ 38.339215] Instruction dump:
[ 38.339217] 60420000 3d22fff4 8929130e 2f890000 409ef6c4 39200001 3d42fff4 3c62ffd2
[ 38.339220] 3863b610 992a130e 48945f65 60000000 <0fe00000> 4bfff6a0 60000000 60000000
[ 38.339223] ---[ end trace d76dabbf37156e2a ]---
I assume I should be worried?
cheers
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the staging tree
From: Linus Walleij @ 2017-01-30 17:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Roman Sommer, Mika Westerberg
In-Reply-To: <20170130152855.7e8cb6c2@canb.auug.org.au>
On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
OK I'll mention it to Linus (the big penguin). Thanks!
Linus Walleij
^ permalink raw reply
* Re: linux-next: manual merge of the gpio tree with the staging tree
From: Greg KH @ 2017-01-30 17:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus Walleij, linux-next, linux-kernel, Roman Sommer,
Mika Westerberg
In-Reply-To: <20170130152855.7e8cb6c2@canb.auug.org.au>
On Mon, Jan 30, 2017 at 03:28:55PM +1100, Stephen Rothwell wrote:
> Hi Linus,
>
> Today's linux-next merge of the gpio tree got a conflict in:
>
> drivers/staging/greybus/gpio.c
>
> between commit:
>
> 1d3dfbd1dd34 ("staging: greybus: fix checkpatch unsigned warnings")
>
> from the staging tree and commit:
>
> 2956b5d94a76 ("pinctrl / gpio: Introduce .set_config() callback for GPIO chips")
>
> from the gpio 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/staging/greybus/gpio.c
> index 558550cfe687,51384bdde450..000000000000
> --- a/drivers/staging/greybus/gpio.c
> +++ b/drivers/staging/greybus/gpio.c
> @@@ -474,17 -474,20 +474,20 @@@ static void gb_gpio_set(struct gpio_chi
> gb_gpio_set_value_operation(ggc, (u8)offset, !!value);
> }
>
> - static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned int offset,
> - unsigned int debounce)
> -static int gb_gpio_set_config(struct gpio_chip *chip, unsigned offset,
> ++static int gb_gpio_set_config(struct gpio_chip *chip, unsigned int offset,
> + unsigned long config)
> {
> struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
> - u16 usec;
> + u32 debounce;
>
> + if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)
> + return -ENOTSUPP;
> +
> + debounce = pinconf_to_config_argument(config);
> if (debounce > U16_MAX)
> return -EINVAL;
> - usec = (u16)debounce;
>
> - return gb_gpio_set_debounce_operation(ggc, (u8)offset, usec);
> + return gb_gpio_set_debounce_operation(ggc, (u8)offset, (u16)debounce);
> }
>
> static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)
Looks good, thanks for this.
greg k-h
^ permalink raw reply
* Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
From: Stephen Rothwell @ 2017-01-30 10:21 UTC (permalink / raw)
To: Michael Ellerman
Cc: linux-kernel, linux-next, Andrew Donnellan, paulmck, linuxppc-dev
In-Reply-To: <87lgtsx45f.fsf@concordia.ellerman.id.au>
Hi Michael,
On Mon, 30 Jan 2017 20:56:12 +1100 Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan <andrew.donnellan@au1.ibm.com> wrote:
> >>
> >> config PPC has a lot of selects under it. They're not sorted in any
> >> particular order, leading to merge conflicts when adding items at the end.
> >>
> >> Sort them alphabetically.
> >
> > Excellent, thanks.
> >
> >> Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
> >> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
> >> ---
> >>
> >> On top of linux-next 20170130
> >
> > Probably best done on top of powerpc-next and I can cope with the
> > conflicts one more time.
>
> But I don't want to send that many conflicts to Linus.
>
> What we need to do is generate the patch just after 4.11-rc1 is out,
> that way there should be zero skew between my fixes/next and Linus'
> tree. I've been meaning to do it for a few releases but just never
> remember.
>
> So Andrew if you can remember to do it then that would be awesome :)
>
> >> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> >> index 689cf9218b21..570195c8a86a 100644
> >> --- a/arch/powerpc/Kconfig
> >> +++ b/arch/powerpc/Kconfig
> >> @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
> >> config PPC
> >
> > Could we add a comment just above asking that the selects be kept in order?
>
> Actually at the bottom would make more sense I think, that's where
> people will try to add new ones.
Sure, both good ideas.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20170130 build: 1 failures 3 warnings (next-20170130)
From: Build bot for Mark Brown @ 2017-01-30 10:02 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170130
Git describe: next-20170130
Commit: 14dcd7ee9f Add linux-next specific files for 20170130
Build Time: 104 min 18 sec
Passed: 9 / 10 ( 90.00 %)
Failed: 1 / 10 ( 10.00 %)
Errors: 6
Warnings: 3
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-multi_v5_defconfig
-------------------------------------------------------------------------------
Errors summary: 6
1 ../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
1 ../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
1 ../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
1 ../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
Warnings Summary: 3
1 ../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/pinctrl/mvebu/pinctrl-kirkwood.c:460:19: warning: unused variable 'res' [-Wunused-variable]
1 ../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:816:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 6 errors, 2 warnings, 0 section mismatches
Errors:
../drivers/hsi/clients/cmt_speech.c:1114:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/armada/armada_gem.c:38:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_drv.c:468:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/etnaviv/etnaviv_gem.c:178:5: error: conflicting types for 'etnaviv_gem_fault'
../drivers/gpu/drm/omapdrm/omap_drv.c:696:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
../drivers/gpu/drm/omapdrm/omap_gem.c:531:5: error: conflicting types for 'omap_gem_fault'
Warnings:
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:816:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:126:3: warning: 'ept_cfg' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/pinctrl/mvebu/pinctrl-kirkwood.c:460:19: warning: unused variable 'res' [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm64-allnoconfig
arm64-allmodconfig
arm-multi_v7_defconfig
x86_64-defconfig
arm-allnoconfig
x86_64-allnoconfig
arm-multi_v4t_defconfig
arm64-defconfig
^ permalink raw reply
* Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
From: Michael Ellerman @ 2017-01-30 9:56 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Donnellan
Cc: linux-next, paulmck, linuxppc-dev, linux-kernel
In-Reply-To: <20170130204102.423cebea@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan <andrew.donnellan@au1.ibm.com> wrote:
>>
>> config PPC has a lot of selects under it. They're not sorted in any
>> particular order, leading to merge conflicts when adding items at the end.
>>
>> Sort them alphabetically.
>
> Excellent, thanks.
>
>> Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
>> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
>> ---
>>
>> On top of linux-next 20170130
>
> Probably best done on top of powerpc-next and I can cope with the
> conflicts one more time.
But I don't want to send that many conflicts to Linus.
What we need to do is generate the patch just after 4.11-rc1 is out,
that way there should be zero skew between my fixes/next and Linus'
tree. I've been meaning to do it for a few releases but just never
remember.
So Andrew if you can remember to do it then that would be awesome :)
>> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
>> index 689cf9218b21..570195c8a86a 100644
>> --- a/arch/powerpc/Kconfig
>> +++ b/arch/powerpc/Kconfig
>> @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
>> config PPC
>
> Could we add a comment just above asking that the selects be kept in order?
Actually at the bottom would make more sense I think, that's where
people will try to add new ones.
cheers
^ permalink raw reply
* Re: [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
From: Stephen Rothwell @ 2017-01-30 9:41 UTC (permalink / raw)
To: Andrew Donnellan
Cc: mpe, linuxppc-dev, paulmck, benh, linux-kernel, linux-next
In-Reply-To: <20170130093002.22180-1-andrew.donnellan@au1.ibm.com>
Hi Andrew,
On Mon, 30 Jan 2017 20:30:02 +1100 Andrew Donnellan <andrew.donnellan@au1.ibm.com> wrote:
>
> config PPC has a lot of selects under it. They're not sorted in any
> particular order, leading to merge conflicts when adding items at the end.
>
> Sort them alphabetically.
Excellent, thanks.
> Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
> ---
>
> On top of linux-next 20170130
Probably best done on top of powerpc-next and I can cope with the
conflicts one more time.
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 689cf9218b21..570195c8a86a 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
> config PPC
Could we add a comment just above asking that the selects be kept in order?
> bool
> default y
> - select BUILDTIME_EXTABLE_SORT
> + select ARCH_HAS_DEVMEM_IS_ALLOWED
> + select ARCH_HAS_DMA_SET_COHERENT_MASK
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* [PATCH] powerpc: sort Kconfig selects under CONFIG_PPC
From: Andrew Donnellan @ 2017-01-30 9:30 UTC (permalink / raw)
To: mpe, linuxppc-dev; +Cc: sfr, linux-next, paulmck, linux-kernel
In-Reply-To: <87y3xtw62l.fsf@concordia.ellerman.id.au>
config PPC has a lot of selects under it. They're not sorted in any
particular order, leading to merge conflicts when adding items at the end.
Sort them alphabetically.
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
---
On top of linux-next 20170130
---
arch/powerpc/Kconfig | 128 +++++++++++++++++++++++++--------------------------
1 file changed, 64 insertions(+), 64 deletions(-)
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 689cf9218b21..570195c8a86a 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -80,91 +80,91 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
config PPC
bool
default y
- select BUILDTIME_EXTABLE_SORT
+ select ARCH_HAS_DEVMEM_IS_ALLOWED
+ select ARCH_HAS_DMA_SET_COHERENT_MASK
+ select ARCH_HAS_ELF_RANDOMIZE
+ select ARCH_HAS_GCOV_PROFILE_ALL
+ select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
+ select ARCH_HAS_SG_CHAIN
+ select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ select ARCH_HAS_UBSAN_SANITIZE_ALL
+ select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_MIGHT_HAVE_PC_PARPORT
select ARCH_MIGHT_HAVE_PC_SERIO
+ select ARCH_SUPPORTS_ATOMIC_RMW
+ select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
+ select ARCH_USE_BUILTIN_BSWAP
+ select ARCH_USE_CMPXCHG_LOCKREF if PPC64
+ select ARCH_WANT_IPC_PARSE_VERSION
+ select ARCH_WEAK_RELEASE_ACQUIRE
select BINFMT_ELF
- select ARCH_HAS_ELF_RANDOMIZE
- select OF
- select OF_EARLY_FLATTREE
- select OF_RESERVED_MEM
- select HAVE_FTRACE_MCOUNT_RECORD
+ select BUILDTIME_EXTABLE_SORT
+ select CLONE_BACKWARDS
+ select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
+ select EDAC_ATOMIC_SCRUB
+ select EDAC_SUPPORT
+ select GENERIC_ATOMIC64 if PPC32
+ select GENERIC_CLOCKEVENTS
+ select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+ select GENERIC_CMOS_UPDATE
+ select GENERIC_CPU_AUTOPROBE
+ select GENERIC_IRQ_SHOW
+ select GENERIC_IRQ_SHOW_LEVEL
+ select GENERIC_SMP_IDLE_THREAD
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
+ select GENERIC_TIME_VSYSCALL_OLD
+ select HAVE_ARCH_AUDITSYSCALL
+ select HAVE_ARCH_HARDENED_USERCOPY
+ select HAVE_ARCH_JUMP_LABEL
+ select HAVE_ARCH_KGDB
+ select HAVE_ARCH_SECCOMP_FILTER
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_CBPF_JIT if !PPC64
+ select HAVE_DEBUG_KMEMLEAK
+ select HAVE_DEBUG_STACKOVERFLOW
+ select HAVE_DMA_API_DEBUG
select HAVE_DYNAMIC_FTRACE
select HAVE_DYNAMIC_FTRACE_WITH_REGS if MPROFILE_KERNEL
- select HAVE_FUNCTION_TRACER
+ select HAVE_EBPF_JIT if PPC64
+ select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
+ select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER
- select SYSCTL_EXCEPTION_TRACE
- select VIRT_TO_BUS if !PPC64
+ select HAVE_FUNCTION_TRACER
+ select HAVE_GENERIC_RCU_GUP
+ select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
select HAVE_IDE
select HAVE_IOREMAP_PROT
- select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
+ select HAVE_IRQ_EXIT_ON_IRQ_STACK
+ select HAVE_KERNEL_GZIP
select HAVE_KPROBES
- select HAVE_ARCH_KGDB
select HAVE_KRETPROBES
- select HAVE_ARCH_TRACEHOOK
+ select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
- select HAVE_DMA_API_DEBUG
+ select HAVE_MOD_ARCH_SPECIFIC
+ select HAVE_NMI if PERF_EVENTS
select HAVE_OPROFILE
- select HAVE_DEBUG_KMEMLEAK
- select ARCH_HAS_SG_CHAIN
- select GENERIC_ATOMIC64 if PPC32
select HAVE_PERF_EVENTS
+ select HAVE_PERF_EVENTS_NMI if PPC64
select HAVE_PERF_REGS
select HAVE_PERF_USER_STACK_DUMP
+ select HAVE_RCU_TABLE_FREE if SMP
select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx)
- select ARCH_WANT_IPC_PARSE_VERSION
- select SPARSE_IRQ
+ select HAVE_SYSCALL_TRACEPOINTS
+ select HAVE_VIRT_CPU_ACCOUNTING
select IRQ_DOMAIN
- select GENERIC_IRQ_SHOW
- select GENERIC_IRQ_SHOW_LEVEL
select IRQ_FORCED_THREADING
- select HAVE_RCU_TABLE_FREE if SMP
- select HAVE_SYSCALL_TRACEPOINTS
- select HAVE_CBPF_JIT if !PPC64
- select HAVE_EBPF_JIT if PPC64
- select HAVE_ARCH_JUMP_LABEL
- select ARCH_HAVE_NMI_SAFE_CMPXCHG
- select ARCH_HAS_GCOV_PROFILE_ALL
- select GENERIC_SMP_IDLE_THREAD
- select GENERIC_CMOS_UPDATE
- select GENERIC_TIME_VSYSCALL_OLD
- select GENERIC_CLOCKEVENTS
- select GENERIC_CLOCKEVENTS_BROADCAST if SMP
- select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- select GENERIC_STRNCPY_FROM_USER
- select GENERIC_STRNLEN_USER
- select HAVE_MOD_ARCH_SPECIFIC
select MODULES_USE_ELF_RELA
- select CLONE_BACKWARDS
- select ARCH_USE_BUILTIN_BSWAP
- select OLD_SIGSUSPEND
- select OLD_SIGACTION if PPC32
- select HAVE_DEBUG_STACKOVERFLOW
- select HAVE_IRQ_EXIT_ON_IRQ_STACK
- select ARCH_USE_CMPXCHG_LOCKREF if PPC64
- select HAVE_ARCH_AUDITSYSCALL
- select ARCH_SUPPORTS_ATOMIC_RMW
- select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
select NO_BOOTMEM
- select HAVE_GENERIC_RCU_GUP
- select HAVE_PERF_EVENTS_NMI if PPC64
- select HAVE_NMI if PERF_EVENTS
- select EDAC_SUPPORT
- select EDAC_ATOMIC_SCRUB
- select ARCH_HAS_DMA_SET_COHERENT_MASK
- select ARCH_HAS_DEVMEM_IS_ALLOWED
- select HAVE_ARCH_SECCOMP_FILTER
- select ARCH_HAS_UBSAN_SANITIZE_ALL
- select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
- select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
- select GENERIC_CPU_AUTOPROBE
- select HAVE_VIRT_CPU_ACCOUNTING
- select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
- select HAVE_ARCH_HARDENED_USERCOPY
- select HAVE_KERNEL_GZIP
- select ARCH_WEAK_RELEASE_ACQUIRE
+ select OF
+ select OF_EARLY_FLATTREE
+ select OF_RESERVED_MEM
+ select OLD_SIGACTION if PPC32
+ select OLD_SIGSUSPEND
+ select SPARSE_IRQ
+ select SYSCTL_EXCEPTION_TRACE
+ select VIRT_TO_BUS if !PPC64
config GENERIC_CSUM
def_bool n
--
Andrew Donnellan OzLabs, ADL Canberra
andrew.donnellan@au1.ibm.com IBM Australia Limited
^ permalink raw reply related
* linux-next: Tree for Jan 30
From: Stephen Rothwell @ 2017-01-30 6:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
There will be no linux-next release until Monday (next-20170130).
Changes since 20170125:
New tree: spi-nor
The drm tree lost its build failure.
The block tree gained a build failure so I used the version from
next-20170125.
The tip tree gained a conflict against the drm-misc-fixes tree.
The rcu tree gained a conflict against the powerpc-fixes tree.
The staging tree gained a conflict against the staging.current tree.
The gpio tree gained a conflict against the staging tree.
Non-merge commits (relative to Linus' tree): 5603
6347 files changed, 228529 insertions(+), 117188 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 253 trees (counting Linus' and 36 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 (2c5d9555d6d9 Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
Merging arc-current/for-curr (9aed02feae57 ARC: [arcompact] handle unaligned access delay slot corner case)
Merging arm-current/fixes (90f92c631b21 ARM: 8613/1: Fix the uaccess crash on PB11MPCore)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (b5fa0f7f88ed powerpc: Fix build failure with clang due to BUILD_BUG_ON())
Merging sparc/master (5d0e7705774d sparc: Fixed typo in sstate.c. Replaced panicing with panicking)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (1b1bc42c1692 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
Merging netfilter/master (a47b70ea86bd ravb: unmap descriptors when freeing rings)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging wireless-drivers/master (2b1d530cb315 MAINTAINERS: ath9k-devel is closed)
Merging mac80211/master (115865fa0826 mac80211: don't try to sleep in rate_control_rate_init())
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (672980c62c68 PCI/ASPM: Handle PCI-to-PCIe bridges as roots of PCIe hierarchies)
Merging driver-core.current/driver-core-linus (49def1853334 Linux 4.10-rc4)
Merging tty.current/tty-linus (49def1853334 Linux 4.10-rc4)
Merging usb.current/usb-linus (a3683e0c1410 Merge tag 'usb-serial-4.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
Merging usb-gadget-fixes/fixes (efe357f4633a usb: dwc2: host: fix Wmaybe-uninitialized warning)
Merging usb-serial-fixes/usb-linus (5d03a2fd2292 USB: serial: option: add device ID for HP lt2523 (Novatel E371))
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
Merging staging.current/staging-linus (b17c1bba9cec staging: greybus: timesync: validate platform state callback)
Merging char-misc.current/char-misc-linus (191e885a2e13 firmware: fix NULL pointer dereference in __fw_load_abort())
Merging input-current/for-linus (3f5c34c6d468 Input: wm97xx - make missing platform data non-fatal)
Merging crypto-current/master (11e3b725cfc2 crypto: arm64/aes-blk - honour iv_out requirement in CBC and CTR modes)
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
Merging vfio-fixes/for-linus (bd00fdf198e2 vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null)
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
Merging drm-intel-fixes/for-linux-next-fixes (45d9f43911a9 Merge tag 'gvt-fixes-2017-01-25' of https://github.com/01org/gvt-linux into drm-intel-fixes)
Merging drm-misc-fixes/for-linux-next-fixes (7c6d639d465e drm/ttm: Make sure BOs being swapped out are cacheable)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
Merging arm/for-next (01c4a81b2c85 Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
Merging arm-soc/for-next (8729616aee44 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/platsmp.c
Merging amlogic/for-next (61e787270fde Merge v4.11/dt64)
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
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 (e514f82c67c1 Merge tag 'at91-ab-4.11-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (8d6e1b09237b Merge branch anholt/bcm2835-dt-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 (57aba12f97c2 Merge branch 'zte/pm-domains' into for-next)
Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next)
Merging mvebu/for-next (9e6baf6c9d61 Merge branch 'mvebu/98DX' into mvebu/for-next)
Merging omap/for-next (36dbd2631399 Merge branch 'omap-for-v4.11/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (52091edac563 arm64: dts: qcom: Add msm8916 CoreSight components)
Merging renesas/next (59fd3e06b3d7 Merge branches 'arm64-dt-for-v4.11', 'dt-for-v4.11' and 'soc-for-v4.11' into next)
Merging rockchip/for-next (0aab64671deb Merge branch 'v4.11-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
Merging samsung-krzk/for-next (95648b747071 Merge branch 'next/soc' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (49f6cba617fe arm64: handle sys and undef traps consistently)
Merging clk/clk-next (eaff16bc4988 clk: qcom: SDHCI enablement on Nexus 5X / 6P)
CONFLICT (add/add): Merge conflict in include/dt-bindings/clock/stm32fx-clock.h
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/st,stm32-rcc.txt
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
Merging m68knommu/for-next (d25c164fc0be m68k/defconfig: amcore board defconfig tuning)
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 (bf0505dfeac3 MIPS: Fix special case in 64 bit IP checksumming.)
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
Merging openrisc/for-next (5de769bbfdfc arch/openrisc/lib/memcpy.c: use correct OR1200 option)
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
Merging powerpc/next (10528b9c45cf powerpc/bpf: Flush the entire JIT buffer)
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 (9437964885f8 s390/bpf: remove redundant check for non-null image)
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 (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (514f7d5f893f Merge branch 'for-next-next-v4.11-20170126' into for-next-20170126)
Merging ceph/master (6df8c9d80a27 ceph: fix bad endianness handling in parse_reply_info_extra)
Merging cifs/for-next (81ddd8c0c5e1 cifs: initialize file_info_lock)
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 (70f16cef06b5 udf: allow implicit blocksize specification during mount)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
Merging gfs2/for-next (192738b711d3 GFS2: Inline function meta_lo_add)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
Merging nfs/linux-next (d56a5ca366e7 Merge tag 'nfs-for-4.10-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs)
Merging nfsd/nfsd-next (42e24662a806 nfsd: special case truncates some more)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
Merging overlayfs/overlayfs-next (4c7d0c9cb713 ovl: fix possible use after free on redirect dir lookup)
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 (e0d76fa4475e xfs: prevent quotacheck from overloading inode lru)
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
CONFLICT (content): Merge conflict in fs/read_write.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
Merging pci/next (83a96ebd0efa Merge branch 'pci/host-thunder' into next)
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
Merging hid/for-next (8ffbb1ee31d9 Merge branch 'for-4.10/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (f4d9f6fbbf57 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
Merging hwmon-staging/hwmon-next (248c3398aae1 hwmon: Relax name attribute validation for new APIs)
Merging jc_docs/docs-next (2069889ff78c docs/zh_CN: Add coding-style into docs build system)
Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
Merging pm/linux-next (7a72b8775225 Merge branch 'pm-opp' into linux-next)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
Merging thermal/next (7b09ae6042cd Merge branches 'ida-conversion' and 'for-rc' 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 (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
Merging swiotlb/linux-next (f1225ee4c8fc swiotlb-xen: update dev_addr after swapping pages)
Merging net-next/master (5b8784aaf29b openvswitch: Simplify do_execute_actions().)
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (eb758c8864d4 esp: Introduce a helper to setup the trailer)
Merging netfilter-next/master (1a28ad74ebd8 netfilter: nf_tables: eliminate useless condition checks)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (575ddce05077 rtlwifi: rtl_usb: Fix for URB leaking when doing ifconfig up/down)
Merging bluetooth/master (264e6777f958 Merge branch 'netvsc-enhancements')
Merging mac80211-next/master (228c8c6b1f43 wireless: define cipher/AKM suites using a macro)
Merging rdma/for-next (24dc831b77ec IB/core: Add inline function to validate port)
Merging rdma-leon/rdma-next (b4dfe5135f87 Merge branch 'topic/cma-tos' into rdma-next)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
Merging spi-nor/next (841510ccbbbe mtd: fsl-quadspi: Rename SEQID_QUAD_READ to SEQID_READ)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (a5b2b6ebf34b drm/sti: Fix compilation failure for drm_framebuffer.pixel_format)
CONFLICT (content): Merge conflict in include/drm/drm_atomic.h
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 (8adabb8928bc drm/i915: Pevent copying uninitialised garbage into vma->ggtt_view)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
Merging drm-misc/for-linux-next (8c96c678011e dma/fence: Export enable-signaling tracepoint for emission by drivers)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
Merging mali-dp/for-upstream/mali-dp (83d642ee6dbe drm: mali-dp: fix stride setting for multi-plane formats)
Merging sunxi/sunxi/for-next (c94f7962e97c Merge branch 'sunxi/dt-for-4.11' into sunxi/for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
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 (287215e9c466 Merge branch 'topic/intel-lpe-audio' into for-next)
Merging sound-asoc/for-next (3b9a1add8e1c Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
Merging input/next (f719315b52b5 Input: constify device_type structures)
Merging block/for-next (9053ec7625de Merge branch 'for-4.11/rq-refactor' into for-next)
$ git reset --hard HEAD^
Merging next-20170125 version of block
Merging lightnvm/for-next (c3679c6eac5d lightnvm: use end_io callback instead of instance)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (486bbbfcb7c6 mmc: core: Extend mmc_of_parse() to check for mmc-ddr-3_3v)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (161d1e707a7b md/r5cache: enable chunk_aligned_read with write back cache)
Merging mfd/for-mfd-next (3d66c8abc13e mfd: cpcap: Add minimal support)
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
Merging battery/for-next (744cc304a18f power: supply: add AC power supply driver for AXP20X and AXP22X PMICs)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (b09dc5185241 Merge remote-tracking branches 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/qcom-smd', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
Merging security/next (710584b9daef Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next)
Merging integrity/next (07a77aadc4e8 ima: fix ima_d_path() possible race with rename)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
Applying: selinux: merge fix for "smc: establish new socket family"
Merging tpmdd/next (526a9f2ddb60 tpm: fix RC value check in tpm2_seal_trusted)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
Merging audit/next (62bc306e2083 audit: log 32-bit socketcalls)
CONFLICT (content): Merge conflict in include/uapi/linux/audit.h
Merging devicetree/for-next (a51741ebe131 Documentation: usb: fix wrong documentation paths)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (8d58e8f66f84 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/slave' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (f38c1a474296 Merge branch 'x86/platform')
CONFLICT (content): Merge conflict in security/apparmor/include/apparmor.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/ttm/ttm_bo.c
Applying: locking/atomic, kref: merge fixup for code movement
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Merging edac-amd/for-next (1bd9900b8301 EDAC, amd64: Add x86cpuid sanity check during init)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
Merging ftrace/for-next (b9b0c831bed2 ftrace: Convert graph filter to use hash tables)
Merging rcu/rcu/next (19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Applying: smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Merging kvm/linux-next (0b4c208d443b Revert "KVM: nested VMX: disable perf cpuid reporting")
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
Merging kvm-ppc/kvm-ppc-next (fcd4f3c6d150 KVM: PPC: Book3S PR: Refactor program interrupt related code into separate function)
Merging kvms390/next (f95a72b9824a KVM: s390: guestdbg: filter PER i-fetch on EXECUTE properly)
Merging xen-tip/linux-next (cc272163ea55 x86/xen: Fix APIC id mismatch warning on Intel)
Merging percpu/for-next (966d2b04e070 percpu-refcount: fix reference leak during percpu-atomic transition)
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
Merging drivers-x86/for-next (9eeda3897a85 platform/x86: add support for devices with Silead touchscreens)
CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_powerbtn.c
CONFLICT (content): Merge conflict in drivers/platform/x86/fujitsu-laptop.c
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 (8bb1de680dac tools/leds: Add led_hw_brightness_mon program)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
Merging driver-core/driver-core-next (64e90a8acb85 Introduce STATIC_USERMODEHELPER to mediate call_usermodehelper())
Merging tty/tty-next (aa42db44f670 8250: of: remove remnants of generic of_serial driver)
Merging usb/usb-next (4ddecf76b5ae USB: cdc-acm: fix TIOCGSERIAL flags)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (ea534e0b4047 USB: serial: add uPD78F0730 USB to Serial Adaptor Driver)
Merging usb-chipidea-next/ci-for-usb-next (30a9566a4f60 usb: chipidea: usb2: delete the redundant setting default DMA mask code)
Merging phy-next/next (0b10f64dbe60 phy: qcom-ufs: Fix misplaced jump label)
Merging staging/staging-next (63d8d50ce356 staging: lustre: lnet: Fix coding style errors)
CONFLICT (modify/delete): drivers/staging/greybus/timesync_platform.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/greybus/timesync_platform.c left in tree.
$ git rm -f drivers/staging/greybus/timesync_platform.c
Merging char-misc/char-misc-next (f2d697604cc8 eeprom: idt_89hpesx: Drop kfree for memory allocated with devm_kzalloc)
Merging extcon/extcon-next (8ea227886002 extcon: arizona: Wait for any running HPDETs to complete on jack removal)
Merging slave-dma/next (91f141dbc9f0 Merge branch 'topic/zx' into next)
Merging cgroup/for-next (b4788e87f687 Merge branch 'for-4.11' into for-next)
Merging scsi/for-next (2340d775b189 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (13c599069130 scsi: hisi_sas: decrease running_req in hisi_sas_slot_task_free())
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging target-bva/for-next (300af14bdb28 qla2xxx: Disable out-of-order processing by default in firmware)
Merging libata/for-next (428d57c1683a Merge branch 'for-4.11' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (ec4537a7d64f pci: drop link_reset)
Merging rpmsg/for-next (5956dd81ac18 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (1d9bc2778fe9 Merge branch 'devel' into for-next)
CONFLICT (content): Merge conflict in drivers/staging/greybus/gpio.c
Merging pinctrl/for-next (2a15343f1e82 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
Merging pwm/for-next (e52d5f1c5221 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 (68eb94f16227 proc: Better ownership of files for non-dumpable tasks in user namespaces)
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (1e4c2830c369 selftest: cpufreq: Add special tests)
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile
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 (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
Merging rtc/rtc-next (21da8ba5b665 rtc: sun6i: Switch to devm_rtc_device_register)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging extable/extable (24bf9bdef929 module.h: remove extable.h include now users have migrated)
Merging akpm-current/current (f40364e40a57 ipc/sem: add hysteresis)
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs: add i_blocksize()
Applying: truncate: use i_blocksize()
Applying: nilfs2: use nilfs_btree_node_size()
Applying: nilfs2: use i_blocksize()
Applying: Reimplement IDR and IDA using the radix tree
Applying: idr: support storing NULL in the IDR
Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_probe_helper.c
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: scripts/spelling.txt: add some typo-words
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
Merging akpm/master (c35aea4a9cca mm: clarify mm_struct.mm_{users,count} documentation)
^ permalink raw reply
* Re: linux-next: Tree for Jan 30
From: Stephen Rothwell @ 2017-01-30 6:49 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
In-Reply-To: <20170130174901.6c7e88bd@canb.auug.org.au>
Hi all,
On Mon, 30 Jan 2017 17:49:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> There will be no linux-next release until Monday (next-20170130).
Obviously, this is not longer relevant :-)
--
Cheers,
Stephen Rothwell
^ 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