* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Mauro Carvalho Chehab @ 2017-02-02 22:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170203092446.7e86e8af@canb.auug.org.au>
Em Fri, 3 Feb 2017 09:24:46 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Tue, 31 Jan 2017 11:55:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
>
> I am still getting this error.
Gah, forgot to push the fix on the -next branch. Should be ok now.
Regards,
Mauro
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2017-02-02 22:59 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170202204620.75b20605@vento.lan>
Hi Mauro,
On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> Gah, forgot to push the fix on the -next branch. Should be ok now.
What I fetch for the v4l-dvb tree is the master branch of
git://linuxtv.org/mchehab/media-next.git
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20170202 build: 4 failures 7 warnings (next-20170202)
From: Paul Gortmaker @ 2017-02-02 23:08 UTC (permalink / raw)
To: Build bot for Mark Brown, Mike Rapoport
Cc: kernel-build-reports, linaro-kernel, linux-next@vger.kernel.org
In-Reply-To: <E1cZEYY-0006f4-PQ@optimist>
On Thu, Feb 2, 2017 at 5:23 AM, Build bot for Mark Brown
<broonie@kernel.org> wrote:
> Tree/Branch: next-20170202
> Git describe: next-20170202
> Commit: c356cf7a65 Add linux-next specific files for 20170202
>
> Build Time: 94 min 58 sec
>
> Passed: 6 / 10 ( 60.00 %)
> Failed: 4 / 10 ( 40.00 %)
>
> Errors: 4
> Warnings: 7
> Section Mismatches: 0
>
> Failed defconfigs:
> arm64-allmodconfig
> arm-allnoconfig
> arm-allmodconfig
>
> Errors:
>
> arm64-allmodconfig
> ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
>
> arm-allnoconfig
> ../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
> ../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
>
Also in sfr build: http://kisskb.ellerman.id.au/kisskb/buildresult/12924855/
Bisects as follows:
5b8d82e2e798609e113ec0dae37708f0578b68e2 is the first bad commit
commit 5b8d82e2e798609e113ec0dae37708f0578b68e2
Author: Mike Rapoport <rppt@linux.vnet.ibm.com>
Date: Thu Feb 2 10:46:41 2017 +1100
userfaultfd: non-cooperative: add event for memory unmaps
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Mauro Carvalho Chehab @ 2017-02-02 23:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170203095934.2bbbbf45@canb.auug.org.au>
Em Fri, 3 Feb 2017 09:59:34 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > Gah, forgot to push the fix on the -next branch. Should be ok now.
>
> What I fetch for the v4l-dvb tree is the master branch of
> git://linuxtv.org/mchehab/media-next.git
I actually push the patches on a different tree:
git://linuxtv.org/media_tree.git
At the branches "master" and "fixes", where
master - for rolling develoment patches
fixes - for bug fixes against current -rc release
My current procedure is to manually merge both branches
at git://linuxtv.org/mchehab/media-next.git, but this is a manual
work, that I use to do by the end of the days I merge patches.
Unfortunately, sometimes, I got side-tracked by something and
I forget to do such manual merge.
--
Thanks,
Mauro
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Stephen Rothwell @ 2017-02-03 0:01 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170202212440.5e514ebc@vento.lan>
Hi Mauro,
On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> I actually push the patches on a different tree:
> git://linuxtv.org/media_tree.git
>
> At the branches "master" and "fixes", where
>
> master - for rolling develoment patches
> fixes - for bug fixes against current -rc release
So maybe I should fetch those 2 branches separately and save you the
bother of merging them yourself? There will be occasional conflicts,
but I get those with others trees as well.
> My current procedure is to manually merge both branches
> at git://linuxtv.org/mchehab/media-next.git, but this is a manual
> work, that I use to do by the end of the days I merge patches.
> Unfortunately, sometimes, I got side-tracked by something and
> I forget to do such manual merge.
Unless you need to do that for your own testing.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the v4l-dvb tree
From: Mauro Carvalho Chehab @ 2017-02-03 0:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Sean Young
In-Reply-To: <20170203110117.4a0c5628@canb.auug.org.au>
Em Fri, 3 Feb 2017 11:01:17 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > I actually push the patches on a different tree:
> > git://linuxtv.org/media_tree.git
> >
> > At the branches "master" and "fixes", where
> >
> > master - for rolling develoment patches
> > fixes - for bug fixes against current -rc release
>
> So maybe I should fetch those 2 branches separately and save you the
> bother of merging them yourself? There will be occasional conflicts,
> but I get those with others trees as well.
Yeah, that makes sense.
>
> > My current procedure is to manually merge both branches
> > at git://linuxtv.org/mchehab/media-next.git, but this is a manual
> > work, that I use to do by the end of the days I merge patches.
> > Unfortunately, sometimes, I got side-tracked by something and
> > I forget to do such manual merge.
>
> Unless you need to do that for your own testing.
Yes, when I merge there, I usually run a batch process that takes
about 2 hours on my current build machine[1] and compile it with 57
different config/arch combinations.
[1] I'm waiting for a new machine that will hopefully reduce it.
With Kernel test robot, this usually get good results.
It would be still interesting if you could pull from it, as
sometimes I need to create topic branches (either when there's
a controversial patchset that I would be sending in separate, or
when I need to pull from some other subsystem tree to solve a
complex merge conflict).
So, if this is not a problem to you, maybe you can setup your
environment to pull (in this order) from:
git://linuxtv.org/media_tree.git fixes
git://linuxtv.org/media_tree.git master
git://linuxtv.org/mchehab/media-next.git master
Most of the time, the last pull won't get anything.
--
Thanks,
Mauro
^ permalink raw reply
* linux-next: manual merge of the rcu tree with the powerpc tree
From: Stephen Rothwell @ 2017-02-03 2:03 UTC (permalink / raw)
To: Paul E. McKenney, Michael Ellerman, Benjamin Herrenschmidt,
PowerPC
Cc: linux-next, linux-kernel, Anton Blanchard
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
arch/powerpc/Kconfig
between commit:
d6c569b99558 ("powerpc/64: Move HAVE_CONTEXT_TRACKING from pseries to common Kconfig")
from the powerpc tree and commit:
c7327406b3c3 ("rcu: Make arch select smp_mb__after_unlock_lock() strength")
from the rcu 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/powerpc/Kconfig
index a47e2b22df67,9fecd004fee8..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -164,10 -164,11 +164,11 @@@ config PP
select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
select HAVE_ARCH_HARDENED_USERCOPY
select HAVE_KERNEL_GZIP
- select HAVE_CC_STACKPROTECTOR
+ select HAVE_CONTEXT_TRACKING if PPC64
+ select ARCH_WEAK_RELEASE_ACQUIRE
config GENERIC_CSUM
- def_bool CPU_LITTLE_ENDIAN
+ def_bool n
config EARLY_PRINTK
bool
^ permalink raw reply
* linux-next: manual merge of the rcu tree with the netfilter-next tree
From: Stephen Rothwell @ 2017-02-03 2:08 UTC (permalink / raw)
To: Paul E. McKenney, Pablo Neira Ayuso, NetFilter
Cc: linux-next, linux-kernel, Florian Westphal
Hi all,
Today's linux-next merge of the rcu tree got a conflict in:
net/netfilter/nf_conntrack_core.c
between commit:
a9e419dc7be6 ("netfilter: merge ctinfo into nfct pointer storage area")
from the netfilter-next tree and commit:
55f619e5c322 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU")
from the rcu tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc net/netfilter/nf_conntrack_core.c
index 071b97fcbefb,13b7e5159660..000000000000
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@@ -1876,9 -1862,8 +1876,9 @@@ int nf_conntrack_init_start(void
nf_conntrack_max = max_factor * nf_conntrack_htable_size;
nf_conntrack_cachep = kmem_cache_create("nf_conntrack",
- sizeof(struct nf_conn), 0,
+ sizeof(struct nf_conn),
+ NFCT_INFOMASK + 1,
- SLAB_DESTROY_BY_RCU | SLAB_HWCACHE_ALIGN, NULL);
+ SLAB_TYPESAFE_BY_RCU | SLAB_HWCACHE_ALIGN, NULL);
if (!nf_conntrack_cachep)
goto err_cachep;
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Mike Galbraith @ 2017-02-03 3:05 UTC (permalink / raw)
To: Peter Zijlstra, Ross Zwisler
Cc: Sachin Sant, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML
In-Reply-To: <20170202155506.GX6515@twins.programming.kicks-ass.net>
On Thu, 2017-02-02 at 16:55 +0100, Peter Zijlstra wrote:
> On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
> > 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:
>
>
> Could some of you test this? It seems to cure things in my (very)
> limited testing.
Hotplug stress gripe is gone here.
-Mike
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Sachin Sant @ 2017-02-03 4:33 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ross Zwisler, Mike Galbraith, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML
In-Reply-To: <20170202155506.GX6515@twins.programming.kicks-ass.net>
> On 02-Feb-2017, at 9:25 PM, Peter Zijlstra <peterz@infradead.org> wrote:
>
> On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
>> 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:
>
>
> Could some of you test this? It seems to cure things in my (very)
> limited testing.
>
I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
where I ran into rcu stall:
[ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
[ 173.493473] 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
[ 173.493476] (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
[ 173.493482] Task dump for CPU 8:
[ 173.493484] cpuhp/8 R running task 0 3416 2 0x00000884
[ 173.493489] Call Trace:
[ 173.493492] [c0000004f7b834a0] [c0000004f7b83560] 0xc0000004f7b83560 (unreliable)
[ 173.493498] [c0000004f7b83670] [c000000000008d28] alignment_common+0x128/0x130
[ 173.493503] --- interrupt: 600 at _raw_spin_lock+0x2c/0xc0
[ 173.493503] LR = try_to_wake_up+0x204/0x5c0
[ 173.493507] [c0000004f7b83960] [c0000004f4d8084c] 0xc0000004f4d8084c (unreliable)
[ 173.493511] [c0000004f7b83990] [c0000000000fef54] try_to_wake_up+0x204/0x5c0
[ 173.493515] [c0000004f7b83a10] [c0000000000e2b88] create_worker+0x148/0x250
[ 173.493519] [c0000004f7b83ab0] [c0000000000e6e1c] alloc_unbound_pwq+0x3bc/0x4c0
[ 173.493522] [c0000004f7b83b10] [c0000000000e7084] wq_update_unbound_numa+0x164/0x270
[ 173.493526] [c0000004f7b83bb0] [c0000000000e8990] workqueue_online_cpu+0x250/0x3b0
[ 173.493529] [c0000004f7b83c70] [c0000000000c2758] cpuhp_invoke_callback+0x148/0x5b0
[ 173.493533] [c0000004f7b83ce0] [c0000000000c2df8] cpuhp_up_callbacks+0x48/0x140
[ 173.493536] [c0000004f7b83d30] [c0000000000c3e98] cpuhp_thread_fun+0x148/0x180
[ 173.493540] [c0000004f7b83d60] [c0000000000f3930] smpboot_thread_fn+0x290/0x2a0
[ 173.493544] [c0000004f7b83dc0] [c0000000000edb3c] kthread+0x14c/0x190
[ 173.493547] [c0000004f7b83e30] [c00000000000b4e8] ret_from_kernel_thread+0x5c/0x74
[ 243.913715] INFO: task kworker/0:2:380 blocked for more than 120 seconds.
[ 243.913732] Not tainted 4.10.0-rc6-next-20170202 #6
[ 243.913735] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
[ 243.913738] kworker/0:2 D 0 380 2 0x00000800
[ 243.913746] Workqueue: events vmstat_shepherd
[ 243.913748] Call Trace:
[ 243.913752] [c0000000ff07f820] [c00000000011135c] enqueue_entity+0x81c/0x1200 (unreliable)
[ 243.913757] [c0000000ff07f9f0] [c00000000001a660] __switch_to+0x300/0x400
[ 243.913762] [c0000000ff07fa50] [c0000000008df4f4] __schedule+0x314/0xb10
[ 243.913766] [c0000000ff07fb20] [c0000000008dfd30] schedule+0x40/0xb0
[ 243.913769] [c0000000ff07fb50] [c0000000008e02b8] schedule_preempt_disabled+0x18/0x30
[ 243.913773] [c0000000ff07fb70] [c0000000008e1654] __mutex_lock.isra.6+0x1a4/0x660
[ 243.913777] [c0000000ff07fc00] [c0000000000c3828] get_online_cpus+0x48/0x90
[ 243.913780] [c0000000ff07fc30] [c00000000025fd78] vmstat_shepherd+0x38/0x150
[ 243.913784] [c0000000ff07fc80] [c0000000000e5794] process_one_work+0x1a4/0x4d0
[ 243.913788] [c0000000ff07fd20] [c0000000000e5b58] worker_thread+0x98/0x5a0
[ 243.913791] [c0000000ff07fdc0] [c0000000000edb3c] kthread+0x14c/0x190
[ 243.913795] [c0000000ff07fe30] [c00000000000b4e8] ret_from_kernel_thread+0x5c/0x74
[ 243.913824] INFO: task drmgr:3413 blocked for more than 120 seconds.
[ 243.913826] Not tainted 4.10.0-rc6-next-20170202 #6
[ 243.913829] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
[ 243.913831] drmgr D 0 3413 3114 0x00040080
[ 243.913834] Call Trace:
[ 243.913836] [c000000257ff3380] [c000000257ff3440] 0xc000000257ff3440 (unreliable)
[ 243.913840] [c000000257ff3550] [c00000000001a660] __switch_to+0x300/0x400
[ 243.913844] [c000000257ff35b0] [c0000000008df4f4] __schedule+0x314/0xb10
[ 243.913847] [c000000257ff3680] [c0000000008dfd30] schedule+0x40/0xb0
[ 243.913851] [c000000257ff36b0] [c0000000008e4594] schedule_timeout+0x274/0x470
[ 243.913855] [c000000257ff37b0] [c0000000008e0efc] wait_for_common+0x1ac/0x2c0
[ 243.913858] [c000000257ff3830] [c0000000000c50e4] bringup_cpu+0x84/0xe0
[ 243.913862] [c000000257ff3860] [c0000000000c2758] cpuhp_invoke_callback+0x148/0x5b0
[ 243.913865] [c000000257ff38d0] [c0000000000c2df8] cpuhp_up_callbacks+0x48/0x140
[ 243.913868] [c000000257ff3920] [c0000000000c5438] _cpu_up+0xe8/0x1c0
[ 243.913872] [c000000257ff3980] [c0000000000c5630] do_cpu_up+0x120/0x150
[ 243.913876] [c000000257ff3a00] [c0000000005c005c] cpu_subsys_online+0x5c/0xe0
[ 243.913879] [c000000257ff3a50] [c0000000005b7d84] device_online+0xb4/0x120
[ 243.913883] [c000000257ff3a90] [c000000000093424] dlpar_online_cpu+0x144/0x1e0
[ 243.913887] [c000000257ff3b50] [c000000000093c08] dlpar_cpu_add+0x108/0x2f0
[ 243.913891] [c000000257ff3be0] [c0000000000948dc] dlpar_cpu_probe+0x3c/0x80
[ 243.913894] [c000000257ff3c20] [c0000000000207a8] arch_cpu_probe+0x38/0x60
[ 243.913898] [c000000257ff3c40] [c0000000005c0880] cpu_probe_store+0x40/0x70
[ 243.913902] [c000000257ff3c70] [c0000000005b2e94] dev_attr_store+0x34/0x60
[ 243.913906] [c000000257ff3c90] [c0000000003b0fc4] sysfs_kf_write+0x64/0xa0
[ 243.913910] [c000000257ff3cb0] [c0000000003afd10] kernfs_fop_write+0x170/0x250
[ 243.913914] [c000000257ff3d00] [c0000000002fb0f0] __vfs_write+0x40/0x1c0
[ 243.913917] [c000000257ff3d90] [c0000000002fcba8] vfs_write+0xc8/0x240
[ 243.913921] [c000000257ff3de0] [c0000000002fe790] SyS_write+0x60/0x110
[ 243.913924] [c000000257ff3e30] [c00000000000b184] system_call+0x38/0xe0
[ 243.913929] INFO: task ppc64_cpu:3423 blocked for more than 120 seconds.
[ 243.913931] Not tainted 4.10.0-rc6-next-20170202 #6
[ 243.913933] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
Thanks
-Sachin
^ permalink raw reply
* linux-next: manual merge of the akpm tree with the block tree
From: Stephen Rothwell @ 2017-02-03 4:53 UTC (permalink / raw)
To: Andrew Morton, Jens Axboe; +Cc: linux-next, linux-kernel, Jan Kara
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
fs/block_dev.c
between commit:
b1d2dc5659b4 ("block: Make blk_get_backing_dev_info() safe without open bdev")
from the block tree and patch:
"fs: add i_blocksize()"
from the akpm tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/block_dev.c
index 73031ec54a7b,921e868e84de..000000000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -988,8 -971,7 +988,8 @@@ struct block_device *bdget(dev_t dev
bdev->bd_contains = NULL;
bdev->bd_super = NULL;
bdev->bd_inode = inode;
+ bdev->bd_bdi = &noop_backing_dev_info;
- bdev->bd_block_size = (1 << inode->i_blkbits);
+ bdev->bd_block_size = i_blocksize(inode);
bdev->bd_part_count = 0;
bdev->bd_invalidated = 0;
inode->i_mode = S_IFBLK;
^ permalink raw reply
* linux-next: Tree for Feb 3
From: Stephen Rothwell @ 2017-02-03 5:29 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20170202:
Dropped tree: vfs-miklos (build failure and out of date)
The powerpc tree gained a conflict against the powerpc-fixes tree.
The vfs-miklos tree still had its build failure, so I just dropped it
again for today.
The v4l-dvb tree still had its build failure so I used the version from
next-20170130.
The regulator tree still had its build failure so I used the version from
next-20170131.
The rcu tree gained conflicts against the powerpc and netfilter-next
trees.
The akpm tree gained a conflict against the block tree.
Non-merge commits (relative to Linus' tree): 6884
7479 files changed, 292247 insertions(+), 145339 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 (6d04dfc89660 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
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 (f9a42e0d58cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
Merging net/master (6d04dfc89660 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 (52f5631a4c05 rtlwifi: rtl8192ce: Fix loading of incorrect firmware)
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 (030305d69fc6 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 (d07830db1bdb USB: serial: pl2303: add ATEN device ID)
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 (433e19cf33d3 Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read())
Merging input-current/for-linus (601bbbe05173 Input: uinput - fix crash when mixing old and new init style)
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 (2da64d20a0b2 vfio/spapr: Fix missing mutex unlock when creating a window)
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 (92c715fca907 drm/atomic: Fix double free in drm_atomic_state_default_clear)
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 (fcd9955afaf1 ARC: [plat-*] ARC_HAS_COH_CACHES no longer relevant)
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 (f6fbb582473b 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 (f8e8eda32b4a 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 (9c96e7f72029 firmware: qcom: scm: Fix interrupted SCM calls)
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 (9689628ec120 Merge branch 'for-v4.11/drivers-soc-exynos-pmu-the-joy-never-ends' into for-next)
Merging tegra/for-next (6ef2dbf97439 Merge branch for-4.11/i2c into for-next)
Merging arm64/for-next/core (965861d66fad arm64: ensure __raw_read_system_reg() is self-consistent)
Merging clk/clk-next (eaff16bc4988 clk: qcom: SDHCI enablement on Nexus 5X / 6P)
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 (26eb4aa9a48a Merge branch '4.10-fixes' into mips-for-linux-next)
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 (673bc4354d42 powerpc/pseries: Report DLPAR capabilities)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
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 (ba21d0ea2189 s390/dasd: correct inconsistent indenting)
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 (6e72293ab0e9 xtensa: fix noMMU build on cores with MMU)
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 (ae6f8dd4d0c8 CIFS: Allow to switch on encryption with seal mount option)
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 (224efa5c34a9 ext4: fix data corruption in data=journal mode)
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 (5fae1fbb3793 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 (028f25332c4f docs: Convert the regulator docbook to RST)
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 (0ea7febc7c4f Merge branch 'acpi-ec' 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 (1f3d62090d3b xgene_enet: remove bogus forward declarations)
CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
Merging ipsec-next/master (62e13097c46c net: phy: broadcom: rehook BCM54612E specific init)
Merging netfilter-next/master (2851940ffee3 netfilter: allow logging from non-init namespaces)
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
Merging wireless-drivers-next/master (36401cb7ffae brcmfmac: be more verbose when PSM's watchdog fires)
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 (69e8baab7757 Merge branch 'topic/core-for-4.11' 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 (dc12bcccadaf mtd: spi-nor: cqspi: remove redundant dead code on error return check)
Merging crypto/master (7dede913fc2a crypto: vmx - disable preemption to enable vsx in aes_ctr.c)
Merging drm/drm-next (99743ae4c5f5 Merge branch 'drm-etnaviv-next' of https://git.pengutronix.de/git/lst/linux into drm-next)
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 (18566acac18f Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next)
Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
Merging drm-misc/for-linux-next (7e6328fd1f84 drm: Fix build when FBDEV_EMULATION is disabled)
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 (bddc0430b26b drm/msm: return -EFAULT if copy_from_user() fails)
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 (ffa3140e4264 initify: Mark functions with the __unverified_nocapture attribute)
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 (374a504025a0 Merge branch 'topic/intel-lpe-audio-dp' into for-next)
Merging sound-asoc/for-next (932568ee674e Merge remote-tracking branches 'asoc/topic/wm8741', '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 (5ec69524d430 Input: joydev - use clamp() macro)
Merging block/for-next (5f8127b8db66 Merge branch 'for-4.11/next' into for-next)
CONFLICT (content): Merge conflict in drivers/block/nbd.c
Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next)
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/next (15f5ace6cf7f mmc: core: switch to ida_simple_ functions in block.c)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (1b4c4139722b Documentation: move MD related doc into a separate dir)
Merging mfd/for-mfd-next (197ac6d28fce MAINTAINERS: Add include/dt-bindings/mfd to MFD entry)
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 (105ca48d8c7e Merge remote-tracking branches 'regulator/topic/rc5t583', 'regulator/topic/rn5t618', 'regulator/topic/s2mpa01', 'regulator/topic/supplies' and 'regulator/topic/tps65217' into regulator-next)
$ git reset --hard HEAD^
Merging next-20170131 version of regulator
Merging security/next (20f482ab9e0f ima: allow to check MAY_APPEND)
Merging integrity/next (20f482ab9e0f ima: allow to check MAY_APPEND)
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 (3b7b3428eff7 tpm: add securityfs support for TPM 2.0 firmware event log)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
Merging iommu/next (66452a2d5f8f Merge branches 'iommu/fixes', 'arm/exynos', 'arm/smmu', 'arm/core', 'x86/vt-d' 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 (8cf4664332d3 dt-bindings: power: reset: qnap-poweroff: Drop reference to pm_power_off)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
Merging spi/for-next (3f87493930a0 Merge remote-tracking branches 'spi/topic/s3c64xx', '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 (ea27eef0c920 lockdep: Use "WARNING" tag on lockdep splats)
CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_core.c
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 (a5f4adf992f5 KVM: MIPS: Allow multiple VCPUs to be created)
Merging kvm-ppc/kvm-ppc-next (050f23390f6b KVM: PPC: Book3S HV: Advertise availablity of HPT resizing on KVM HV)
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 (a45463cbf3f9 workqueue: avoid clang warning)
Merging drivers-x86/for-next (52248516ed94 platform/x86: silead depends on I2C being built-in)
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 (bc2be239feef serial: imx: Fix the CTS_B polarity in RS485 mode)
Merging usb/usb-next (4f8c483ab4e9 Merge tag 'phy-for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
Merging usb-gadget/next (e42a5dbb8a3d usb: dwc3: host: pass quirk-broken-port-ped property for known broken revisions)
Merging usb-serial/usb-next (c528fcb116e6 USB: serial: keyspan_pda: fix receive sanity checks)
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 (fa6a8adf3ab7 Merge tag 'iio-for-4.11c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
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 (cadf8106661c doc: convert UIO howto from docbook to sphinx)
CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst
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 (63f1ca59453a Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11)
Merging scsi/for-next (2340d775b189 Merge branch 'misc' into for-next)
Merging scsi-mkp/for-next (86e6828a8aed scsi: scsi_debug: Add OPTIMAL TRANSFER LENGTH GRANULARITY option.)
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 (e06fd3154941 target: Avoid that XCOPY commands trigger a deadlock)
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 (5029eb953682 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 (015bb305b8eb Merge branch 'nsfs-discovery')
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 (4c6106406eb1 rtc: sun6i: Fix compatibility with old DT binding)
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 (6359c2913f72 ipc/mqueue: add missing sparse annotation)
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()
CONFLICT (content): Merge conflict in fs/block_dev.c
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 (460d87d8dbcb 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: Miklos Szeredi @ 2017-02-03 8:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Amir Goldstein
In-Reply-To: <20170203093436.0c486463@canb.auug.org.au>
On Thu, Feb 2, 2017 at 11:34 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Miklos,
>
> On Tue, 31 Jan 2017 11:16:56 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> 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.
>
> This mess is still there ...
Sorry, I removed the conflicting content from that tree.
Thanks,
Miklos
^ permalink raw reply
* next-20170203 build: 4 failures 7 warnings (next-20170203)
From: Build bot for Mark Brown @ 2017-02-03 8:39 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20170203
Git describe: next-20170203
Commit: 421cf055e6 Add linux-next specific files for 20170203
Build Time: 95 min 22 sec
Passed: 6 / 10 ( 60.00 %)
Failed: 4 / 10 ( 40.00 %)
Errors: 4
Warnings: 7
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allnoconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
arm-allnoconfig
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
arm-allmodconfig
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : x86_64-allnoconfig
1 warnings 0 mismatches : arm64-allnoconfig
1 warnings 0 mismatches : arm-allnoconfig
6 warnings 0 mismatches : arm-allmodconfig
-------------------------------------------------------------------------------
Errors summary: 4
2 ../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
1 ../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
1 ../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
1 ../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings Summary: 7
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:814:40: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' 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]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 0 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
-------------------------------------------------------------------------------
arm-allnoconfig : FAIL, 2 errors, 1 warnings, 0 section mismatches
Errors:
../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
Warnings:
../drivers/char/random.c:318:12: warning: 'random_min_urandom_seed' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 6 warnings, 0 section mismatches
Errors:
../drivers/staging/bcm2835-audio/bcm2835-vchiq.c:97:9: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
../drivers/staging/media/platform/bcm2835/mmal-vchiq.c:453:8: error: implicit declaration of function 'vchi_msg_queue' [-Werror=implicit-function-declaration]
Warnings:
../drivers/iio/adc/rcar-gyroadc.c:429:27: warning: 'num_channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:426:22: warning: 'sample_width' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:428:23: warning: 'channels' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/iio/adc/rcar-gyroadc.c:398:26: warning: 'adcmode' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:814: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]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
arm-multi_v4t_defconfig
x86_64-defconfig
arm-multi_v7_defconfig
arm-multi_v5_defconfig
arm64-defconfig
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Peter Zijlstra @ 2017-02-03 8:53 UTC (permalink / raw)
To: Sachin Sant
Cc: Matt Fleming, Mike Galbraith, linuxppc-dev@lists.ozlabs.org, LKML,
linux-next@vger.kernel.org, Ross Zwisler
In-Reply-To: <3BAB5673-2BF8-46E0-8018-6A0F3DEEC9F7@linux.vnet.ibm.com>
On Fri, Feb 03, 2017 at 10:03:14AM +0530, Sachin Sant wrote:
>
> > On 02-Feb-2017, at 9:25 PM, Peter Zijlstra <peterz@infradead.org> wrote:
> >
> > On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
> >> 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:
> >
> >
> > Could some of you test this? It seems to cure things in my (very)
> > limited testing.
> >
>
> I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
> where I ran into rcu stall:
>
> [ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
> [ 173.493473] 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
> [ 173.493476] (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
Right, I actually saw that too, but I don't think that would be related
to my patch. I'll see if I can dig into this though, ought to get fixed
regardless.
Thanks for testing!
^ permalink raw reply
* Re: linux-next: manual merge of the vfs-miklos tree with the overlayfs tree and build failure
From: Stephen Rothwell @ 2017-02-03 9:03 UTC (permalink / raw)
To: Miklos Szeredi; +Cc: linux-next, linux-kernel, Amir Goldstein
In-Reply-To: <CAJfpegtAZkenPkE0NHUfeSFcCJmBygVqCh8_yaVRqLj-5hjKEQ@mail.gmail.com>
Hi Miklos,
On Fri, 3 Feb 2017 09:35:09 +0100 Miklos Szeredi <miklos@szeredi.hu> wrote:
>
> Sorry, I removed the conflicting content from that tree.
Excellent, thanks.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Sachin Sant @ 2017-02-03 11:04 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Matt Fleming, Ross Zwisler, Mike Galbraith, LKML,
linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
In-Reply-To: <20170203085301.GA6515@twins.programming.kicks-ass.net>
[-- Attachment #1: Type: text/html, Size: 948 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the regulator tree
From: Mark Brown @ 2017-02-03 11:31 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Bhumika Goyal
In-Reply-To: <20170203092955.62f9681b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
On Fri, Feb 03, 2017 at 09:30:04AM +1100, Stephen Rothwell wrote:
> > Discarded that commit.
> The patch is still there ...
Only in the merge branch, it got dropped from the source branch but the
merge ended up not being rebuilt.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: next-20170202 build: 4 failures 7 warnings (next-20170202)
From: Mark Brown @ 2017-02-03 12:01 UTC (permalink / raw)
To: Paul Gortmaker, Andrew Morton
Cc: Mike Rapoport, kernel-build-reports, linaro-kernel,
linux-next@vger.kernel.org, Hillf Danton
In-Reply-To: <CAP=VYLraQvfRLdFMVCiqS9DtH-GHNYdM+CYZ_hJ+K8GwWLKT+Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 802 bytes --]
On Thu, Feb 02, 2017 at 06:08:44PM -0500, Paul Gortmaker wrote:
> On Thu, Feb 2, 2017 at 5:23 AM, Build bot for Mark Brown
> > arm-allnoconfig
> > ../mm/nommu.c:1201:15: error: conflicting types for 'do_mmap'
> > ../mm/nommu.c:1580:5: error: conflicting types for 'do_munmap'
> Also in sfr build: http://kisskb.ellerman.id.au/kisskb/buildresult/12924855/
> Bisects as follows:
> 5b8d82e2e798609e113ec0dae37708f0578b68e2 is the first bad commit
> commit 5b8d82e2e798609e113ec0dae37708f0578b68e2
> Author: Mike Rapoport <rppt@linux.vnet.ibm.com>
> Date: Thu Feb 2 10:46:41 2017 +1100
>
> userfaultfd: non-cooperative: add event for memory unmaps
I'm seeing that showing up as 197b090832eaa4a6e in -next, adding the
other people who acked/signed off on the commit.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Mike Galbraith @ 2017-02-03 12:59 UTC (permalink / raw)
To: Peter Zijlstra, Sachin Sant
Cc: Ross Zwisler, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML
In-Reply-To: <20170203085301.GA6515@twins.programming.kicks-ass.net>
On Fri, 2017-02-03 at 09:53 +0100, Peter Zijlstra wrote:
> On Fri, Feb 03, 2017 at 10:03:14AM +0530, Sachin Sant wrote:
> > I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
> > where I ran into rcu stall:
> >
> > [ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
> > [ 173.493473] > > > > 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
> > [ 173.493476] > > > > (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
>
> Right, I actually saw that too, but I don't think that would be related
> to my patch. I'll see if I can dig into this though, ought to get fixed
> regardless.
FWIW, I'm not seeing stalls/hangs while beating hotplug up in tip. (so
next grew a wart?)
-Mike
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Borislav Petkov @ 2017-02-03 13:04 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ross Zwisler, Mike Galbraith, Sachin Sant, Matt Fleming,
Michael Ellerman, linuxppc-dev@lists.ozlabs.org,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170202155506.GX6515@twins.programming.kicks-ass.net>
On Thu, Feb 02, 2017 at 04:55:06PM +0100, Peter Zijlstra wrote:
> On Tue, Jan 31, 2017 at 10:22:47AM -0700, Ross Zwisler wrote:
> > 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:
>
>
> Could some of you test this? It seems to cure things in my (very)
> limited testing.
Tested-by: Borislav Petkov <bp@suse.de>
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Peter Zijlstra @ 2017-02-03 13:37 UTC (permalink / raw)
To: Mike Galbraith
Cc: Sachin Sant, Ross Zwisler, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML,
Paul McKenney
In-Reply-To: <1486126774.4277.6.camel@gmx.de>
On Fri, Feb 03, 2017 at 01:59:34PM +0100, Mike Galbraith wrote:
> On Fri, 2017-02-03 at 09:53 +0100, Peter Zijlstra wrote:
> > On Fri, Feb 03, 2017 at 10:03:14AM +0530, Sachin Sant wrote:
>
> > > I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
> > > where I ran into rcu stall:
> > >
> > > [ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
> > > [ 173.493473] > > > > 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
> > > [ 173.493476] > > > > (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
> >
> > Right, I actually saw that too, but I don't think that would be related
> > to my patch. I'll see if I can dig into this though, ought to get fixed
> > regardless.
>
> FWIW, I'm not seeing stalls/hangs while beating hotplug up in tip. (so
> next grew a wart?)
I've seen it on tip. It looks like hot unplug goes really slow when
there's running tasks on the CPU being taken down.
What I did was something like:
taskset -p $((1<<1)) $$
for ((i=0; i<20; i++)) do while :; do :; done & done
taskset -p $((1<<0)) $$
echo 0 > /sys/devices/system/cpu/cpu1/online
And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
_really_ slow and the RCU stall triggers. What I suspect happens is that
hotplug stops participating in the RCU state machine early, but only
tells RCU about it really late, and in between it gets suspicious it
takes too long.
I've yet to dig through the RCU code to figure out the exact sequence of
events, but found the above to be fairly reliable in triggering the
issue.
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Mike Galbraith @ 2017-02-03 13:52 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Sachin Sant, Ross Zwisler, Matt Fleming, Michael Ellerman,
linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, LKML,
Paul McKenney
In-Reply-To: <20170203133748.GB6515@twins.programming.kicks-ass.net>
On Fri, 2017-02-03 at 14:37 +0100, Peter Zijlstra wrote:
> On Fri, Feb 03, 2017 at 01:59:34PM +0100, Mike Galbraith wrote:
> > FWIW, I'm not seeing stalls/hangs while beating hotplug up in tip. (so
> > next grew a wart?)
>
> I've seen it on tip. It looks like hot unplug goes really slow when
> there's running tasks on the CPU being taken down.
>
> What I did was something like:
>
> taskset -p $((1<<1)) $$
> for ((i=0; i<20; i++)) do while :; do :; done & done
>
> taskset -p $((1<<0)) $$
> echo 0 > /sys/devices/system/cpu/cpu1/online
>
> And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
> _really_ slow and the RCU stall triggers. What I suspect happens is that
> hotplug stops participating in the RCU state machine early, but only
> tells RCU about it really late, and in between it gets suspicious it
> takes too long.
Ah. I wasn't doing a really hard pounding, just running a couple
instances of Steven's script. To beat hell out of it, I add futextest,
stockfish and a small kbuild on a big box.
-Mike
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Paul E. McKenney @ 2017-02-03 15:44 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Mike Galbraith, Sachin Sant, Ross Zwisler, Matt Fleming,
Michael Ellerman, linuxppc-dev@lists.ozlabs.org,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170203133748.GB6515@twins.programming.kicks-ass.net>
On Fri, Feb 03, 2017 at 02:37:48PM +0100, Peter Zijlstra wrote:
> On Fri, Feb 03, 2017 at 01:59:34PM +0100, Mike Galbraith wrote:
> > On Fri, 2017-02-03 at 09:53 +0100, Peter Zijlstra wrote:
> > > On Fri, Feb 03, 2017 at 10:03:14AM +0530, Sachin Sant wrote:
> >
> > > > I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
> > > > where I ran into rcu stall:
> > > >
> > > > [ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
> > > > [ 173.493473] > > > > 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
> > > > [ 173.493476] > > > > (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
> > >
> > > Right, I actually saw that too, but I don't think that would be related
> > > to my patch. I'll see if I can dig into this though, ought to get fixed
> > > regardless.
> >
> > FWIW, I'm not seeing stalls/hangs while beating hotplug up in tip. (so
> > next grew a wart?)
>
> I've seen it on tip. It looks like hot unplug goes really slow when
> there's running tasks on the CPU being taken down.
>
> What I did was something like:
>
> taskset -p $((1<<1)) $$
> for ((i=0; i<20; i++)) do while :; do :; done & done
>
> taskset -p $((1<<0)) $$
> echo 0 > /sys/devices/system/cpu/cpu1/online
>
> And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
> _really_ slow and the RCU stall triggers. What I suspect happens is that
> hotplug stops participating in the RCU state machine early, but only
> tells RCU about it really late, and in between it gets suspicious it
> takes too long.
>
> I've yet to dig through the RCU code to figure out the exact sequence of
> events, but found the above to be fairly reliable in triggering the
> issue.
If you send me the full splat from the dmesg and the RCU portions of
.config, I will take a look. Is this new behavior, or a new test?
Thanx, Paul
^ permalink raw reply
* Re: [tip:sched/core] sched/core: Add debugging code to catch missing update_rq_clock() calls
From: Paul E. McKenney @ 2017-02-03 15:54 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Mike Galbraith, Sachin Sant, Ross Zwisler, Matt Fleming,
Michael Ellerman, linuxppc-dev@lists.ozlabs.org,
linux-next@vger.kernel.org, LKML
In-Reply-To: <20170203154457.GJ30506@linux.vnet.ibm.com>
On Fri, Feb 03, 2017 at 07:44:57AM -0800, Paul E. McKenney wrote:
> On Fri, Feb 03, 2017 at 02:37:48PM +0100, Peter Zijlstra wrote:
> > On Fri, Feb 03, 2017 at 01:59:34PM +0100, Mike Galbraith wrote:
> > > On Fri, 2017-02-03 at 09:53 +0100, Peter Zijlstra wrote:
> > > > On Fri, Feb 03, 2017 at 10:03:14AM +0530, Sachin Sant wrote:
> > >
> > > > > I ran few cycles of cpu hot(un)plug tests. In most cases it works except one
> > > > > where I ran into rcu stall:
> > > > >
> > > > > [ 173.493453] INFO: rcu_sched detected stalls on CPUs/tasks:
> > > > > [ 173.493473] > > > > 8-...: (2 GPs behind) idle=006/140000000000000/0 softirq=0/0 fqs=2996
> > > > > [ 173.493476] > > > > (detected by 0, t=6002 jiffies, g=885, c=884, q=6350)
> > > >
> > > > Right, I actually saw that too, but I don't think that would be related
> > > > to my patch. I'll see if I can dig into this though, ought to get fixed
> > > > regardless.
> > >
> > > FWIW, I'm not seeing stalls/hangs while beating hotplug up in tip. (so
> > > next grew a wart?)
> >
> > I've seen it on tip. It looks like hot unplug goes really slow when
> > there's running tasks on the CPU being taken down.
> >
> > What I did was something like:
> >
> > taskset -p $((1<<1)) $$
> > for ((i=0; i<20; i++)) do while :; do :; done & done
> >
> > taskset -p $((1<<0)) $$
> > echo 0 > /sys/devices/system/cpu/cpu1/online
> >
> > And with those 20 tasks stuck sucking cycles on CPU1, the unplug goes
> > _really_ slow and the RCU stall triggers. What I suspect happens is that
> > hotplug stops participating in the RCU state machine early, but only
> > tells RCU about it really late, and in between it gets suspicious it
> > takes too long.
> >
> > I've yet to dig through the RCU code to figure out the exact sequence of
> > events, but found the above to be fairly reliable in triggering the
> > issue.
> If you send me the full splat from the dmesg and the RCU portions of
> .config, I will take a look. Is this new behavior, or a new test?
If new behavior, I would be most suspicious of these commits in -rcu which
recently entered -tip:
19e4d983cda1 rcu: Place guard on rcu_all_qs() and rcu_note_context_switch() actions
913324b1364f rcu: Eliminate flavor scan in rcu_momentary_dyntick_idle()
fcdcfefafa45 rcu: Pull rcu_qs_ctr into rcu_dynticks structure
0919a0b7e7a5 rcu: Pull rcu_sched_qs_mask into rcu_dynticks structure
caa7c8e34293 rcu: Make rcu_note_context_switch() do deferred NOCB wakeups
41e4b159d516 rcu: Make rcu_all_qs() do deferred NOCB wakeups
b457a3356a68 rcu: Make call_rcu() do deferred NOCB wakeups
Does reverting any of these help?
Thanx, Paul
^ 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