* Re: linux-next: build failure after merge of the rcu tree
From: Paul E. McKenney @ 2016-01-08 3:41 UTC (permalink / raw)
To: Boqun Feng
Cc: Stephen Rothwell, linux-next, linux-kernel, Tejun Heo,
Christoph Lameter
In-Reply-To: <20160108013631.GA11410@fixme-laptop.cn.ibm.com>
On Fri, Jan 08, 2016 at 09:37:04AM +0800, Boqun Feng wrote:
> On Thu, Jan 07, 2016 at 12:52:20PM -0800, Paul E. McKenney wrote:
> > On Fri, Jan 08, 2016 at 07:19:32AM +1100, Stephen Rothwell wrote:
> > > Hi Paul,
> > >
> > > On Thu, 7 Jan 2016 10:02:44 -0800 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> > > >
> > > > On Thu, Jan 07, 2016 at 07:57:25PM +1100, Stephen Rothwell wrote:
> > > > > Hi Paul,
> > > > >
> > > > > [I found this a few days ago, but I think I forgot to send the email,
> > > > > sorry.]
> > > > >
> > > > > After merging the rcu tree, today's linux-next build (powerpc
> > > > > allyesconfig) failed like this:
> > > > >
> > > > > kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
> > > > > kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
> > > > >
> > > > > Caused by commit
> > > > >
> > > > > abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
> > > > >
> > > > > I have reverted that commit for today.
> > > >
> > > > Hello, Stephen,
> > > >
> > > > Very strange. The "static" keyword does not mean anything here?
> > > > Easy enough to use different symbols in the two different files,
> > > > but this situation is not so good for information hiding.
> > > >
> > > > Happy to update rcuperf.c to use a different name, but in the
> > > > immortal words of MSDOS, "Are you sure?" :-)
> > >
> > > I have no idea why it happens, but I do get the error above unless I
> > > revert that commit. So, yes, I am sure :-)
> > >
> > > OK, I looked further and
> > >
> > > DEFINE_STATIC_SRCU(srcu_ctl);
> > >
> > > becomes this (NLs added for clarity):
> > >
> > > static __attribute__((section(".discard"), unused)) char __pcpu_scope_srcu_ctl_srcu_array;
> > > extern __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> > > __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> > > extern __attribute__((section(".data..percpu" ""))) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> > > __attribute__((section(".data..percpu" ""))) __attribute__((weak)) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> > > static struct srcu_struct srcu_ctl = {
> > > .
> > > .
> > > };
> > >
> > > So, the "static" is not very effective :-(
> >
> > Oddly enough, this appears to be toolchain dependent. No idea why.
> >
>
> Maybe the reason is because "static" doesn't work well with
> DEFINE_PER_CPU sometimes?
>
> The definition of __DEFINE_STATIC_SRCU is:
>
> #define __DEFINE_SRCU(name, is_static) \
> static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
> is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
>
> whereas DEFINE_PER_CPU(which calls DEFINE_PER_CPU_SECTION) *could*
> consists of *several* definitions:
>
> #if defined(ARCH_NEEDS_WEAK_PER_CPU) || defined(CONFIG_DEBUG_FORCE_WEAK_PER_CPU)
> ...
> #define DEFINE_PER_CPU_SECTION(type, name, sec) \
> __PCPU_DUMMY_ATTRS char __pcpu_scope_##name; \
> extern __PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
> __PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
> extern __PCPU_ATTRS(sec) __typeof__(type) name; \
> __PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES __weak \
> __typeof__(type) name
> #else
> ...
> #define DEFINE_PER_CPU_SECTION(type, name, sec) \
> __PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES \
> __typeof__(type) name
> #endif
>
> So if ARCH_NEEDS_WEAK_PER_CPU=y or CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y,
> the "static" keyword only has effects on the first definition i.e.
> __pcpu_scope_##name.
>
> Mind to check your config options, Stephen?
>
>
> IOW, DEFINE_PER_CPU is not designed to work with "static", maybe we
> should add STATIC_DEFINE_PER_CPU for that purpose?
Indeed, I suspect that SRCU might not be the only thing that would like
static per-CPU variables. ;-)
> Cc Tejun and Christoph for their opinions.
>
> Regards,
> Boqun
Thanx, Paul
> > Here is a patch that I will be merging in.
> >
> > Thanx, Paul
> >
> > ------------------------------------------------------------------------
> >
> > commit d81f900405de0dc6152692a2088258b8b35d740d
> > Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> > Date: Thu Jan 7 12:39:10 2016 -0800
> >
> > Merge with abcd7ec0808e (rcutorture: Add RCU grace-period performance tests)
> >
> > Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> >
> > diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
> > index eef82a9460d8..4c8d99aa4f5e 100644
> > --- a/kernel/rcu/rcuperf.c
> > +++ b/kernel/rcu/rcuperf.c
> > @@ -188,8 +188,8 @@ static struct rcu_perf_ops rcu_bh_ops = {
> > * Definitions for srcu perf testing.
> > */
> >
> > -DEFINE_STATIC_SRCU(srcu_ctl);
> > -static struct srcu_struct *srcu_ctlp = &srcu_ctl;
> > +DEFINE_STATIC_SRCU(srcu_ctl_perf);
> > +static struct srcu_struct *srcu_ctlp = &srcu_ctl_perf;
> >
> > static int srcu_perf_read_lock(void) __acquires(srcu_ctlp)
> > {
> >
^ permalink raw reply
* Re: next boot: 564 boots: 59 failed, 448 passed with 57 offline (next-20160107)
From: Mark Brown @ 2016-01-08 2:47 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Thierry Reding, Stephen Warren, Alexandre Courbot, Jiri Slaby,
Arnd Bergmann, kernel-build-reports, linux-next, linux-arm-kernel,
linux-tegra
In-Reply-To: <20160107185739.GA29951@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 906 bytes --]
On Thu, Jan 07, 2016 at 10:57:39AM -0800, Greg Kroah-Hartman wrote:
> On Thu, Jan 07, 2016 at 05:28:10PM +0100, Thierry Reding wrote:
> > On Thu, Jan 07, 2016 at 03:59:58PM +0000, Mark Brown wrote:
> > I think this is merely waiting to be picked up into the tty tree. I
> > suspect the reason why there's output in the first place is because
> > of earlyprintk. I've seen recent linux-next work properly, with the
> > serial console hanging at some point (fbcon shows login prompt). If
> > I apply the above patch things are back to normal.
> I'll go queue that up later, but how is this suddenly showing up in
> -next? The tty tree has been pretty quiet for a while now..
There were some memory management issues which broke booting on almost
all ARM platforms for most of this week so nothing else was really
visible and relatively few -next builds over the Christmas vacation (as
one would expect).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the rcu tree
From: Boqun Feng @ 2016-01-08 1:37 UTC (permalink / raw)
To: Paul E. McKenney
Cc: Stephen Rothwell, linux-next, linux-kernel, Tejun Heo,
Christoph Lameter
In-Reply-To: <20160107205220.GU3818@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 4738 bytes --]
On Thu, Jan 07, 2016 at 12:52:20PM -0800, Paul E. McKenney wrote:
> On Fri, Jan 08, 2016 at 07:19:32AM +1100, Stephen Rothwell wrote:
> > Hi Paul,
> >
> > On Thu, 7 Jan 2016 10:02:44 -0800 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> > >
> > > On Thu, Jan 07, 2016 at 07:57:25PM +1100, Stephen Rothwell wrote:
> > > > Hi Paul,
> > > >
> > > > [I found this a few days ago, but I think I forgot to send the email,
> > > > sorry.]
> > > >
> > > > After merging the rcu tree, today's linux-next build (powerpc
> > > > allyesconfig) failed like this:
> > > >
> > > > kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
> > > > kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
> > > >
> > > > Caused by commit
> > > >
> > > > abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
> > > >
> > > > I have reverted that commit for today.
> > >
> > > Hello, Stephen,
> > >
> > > Very strange. The "static" keyword does not mean anything here?
> > > Easy enough to use different symbols in the two different files,
> > > but this situation is not so good for information hiding.
> > >
> > > Happy to update rcuperf.c to use a different name, but in the
> > > immortal words of MSDOS, "Are you sure?" :-)
> >
> > I have no idea why it happens, but I do get the error above unless I
> > revert that commit. So, yes, I am sure :-)
> >
> > OK, I looked further and
> >
> > DEFINE_STATIC_SRCU(srcu_ctl);
> >
> > becomes this (NLs added for clarity):
> >
> > static __attribute__((section(".discard"), unused)) char __pcpu_scope_srcu_ctl_srcu_array;
> > extern __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> > __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> > extern __attribute__((section(".data..percpu" ""))) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> > __attribute__((section(".data..percpu" ""))) __attribute__((weak)) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> > static struct srcu_struct srcu_ctl = {
> > .
> > .
> > };
> >
> > So, the "static" is not very effective :-(
>
> Oddly enough, this appears to be toolchain dependent. No idea why.
>
Maybe the reason is because "static" doesn't work well with
DEFINE_PER_CPU sometimes?
The definition of __DEFINE_STATIC_SRCU is:
#define __DEFINE_SRCU(name, is_static) \
static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
whereas DEFINE_PER_CPU(which calls DEFINE_PER_CPU_SECTION) *could*
consists of *several* definitions:
#if defined(ARCH_NEEDS_WEAK_PER_CPU) || defined(CONFIG_DEBUG_FORCE_WEAK_PER_CPU)
...
#define DEFINE_PER_CPU_SECTION(type, name, sec) \
__PCPU_DUMMY_ATTRS char __pcpu_scope_##name; \
extern __PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
__PCPU_DUMMY_ATTRS char __pcpu_unique_##name; \
extern __PCPU_ATTRS(sec) __typeof__(type) name; \
__PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES __weak \
__typeof__(type) name
#else
...
#define DEFINE_PER_CPU_SECTION(type, name, sec) \
__PCPU_ATTRS(sec) PER_CPU_DEF_ATTRIBUTES \
__typeof__(type) name
#endif
So if ARCH_NEEDS_WEAK_PER_CPU=y or CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y,
the "static" keyword only has effects on the first definition i.e.
__pcpu_scope_##name.
Mind to check your config options, Stephen?
IOW, DEFINE_PER_CPU is not designed to work with "static", maybe we
should add STATIC_DEFINE_PER_CPU for that purpose?
Cc Tejun and Christoph for their opinions.
Regards,
Boqun
> Here is a patch that I will be merging in.
>
> Thanx, Paul
>
> ------------------------------------------------------------------------
>
> commit d81f900405de0dc6152692a2088258b8b35d740d
> Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Date: Thu Jan 7 12:39:10 2016 -0800
>
> Merge with abcd7ec0808e (rcutorture: Add RCU grace-period performance tests)
>
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
>
> diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
> index eef82a9460d8..4c8d99aa4f5e 100644
> --- a/kernel/rcu/rcuperf.c
> +++ b/kernel/rcu/rcuperf.c
> @@ -188,8 +188,8 @@ static struct rcu_perf_ops rcu_bh_ops = {
> * Definitions for srcu perf testing.
> */
>
> -DEFINE_STATIC_SRCU(srcu_ctl);
> -static struct srcu_struct *srcu_ctlp = &srcu_ctl;
> +DEFINE_STATIC_SRCU(srcu_ctl_perf);
> +static struct srcu_struct *srcu_ctlp = &srcu_ctl_perf;
>
> static int srcu_perf_read_lock(void) __acquires(srcu_ctlp)
> {
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the nfs tree
From: Trond Myklebust @ 2016-01-08 0:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Benjamin Coddington
In-Reply-To: <20160108111427.0b435d4d@canb.auug.org.au>
Hi Stephen,
On Thu, Jan 7, 2016 at 7:14 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> write.c:(.text+0xa60): multiple definition of `nfs_wait_atomic_killable'
> fs/nfs/inode.o:inode.c:(.text+0x20a4): first defined here
>
> Caused by commit
>
> fa5cca9f3334 ("NFS: Use wait_on_atomic_t() for unlock after readahead")
>
> I have used the nfs tree from next-20160107 for today.
>
I just finished fixing that up. :-) Apologies for not catching it
earlier. It was an integration issue in my own tree.
Cheers
Trond
^ permalink raw reply
* linux-next: build failure after merge of the nfs tree
From: Stephen Rothwell @ 2016-01-08 0:14 UTC (permalink / raw)
To: Trond Myklebust; +Cc: linux-next, linux-kernel, Benjamin Coddington
Hi Trond,
After merging the nfs tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
write.c:(.text+0xa60): multiple definition of `nfs_wait_atomic_killable'
fs/nfs/inode.o:inode.c:(.text+0x20a4): first defined here
Caused by commit
fa5cca9f3334 ("NFS: Use wait_on_atomic_t() for unlock after readahead")
I have used the nfs tree from next-20160107 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the rcu tree
From: Paul E. McKenney @ 2016-01-07 20:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160108071932.060a9bcc@canb.auug.org.au>
On Fri, Jan 08, 2016 at 07:19:32AM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> On Thu, 7 Jan 2016 10:02:44 -0800 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
> >
> > On Thu, Jan 07, 2016 at 07:57:25PM +1100, Stephen Rothwell wrote:
> > > Hi Paul,
> > >
> > > [I found this a few days ago, but I think I forgot to send the email,
> > > sorry.]
> > >
> > > After merging the rcu tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > >
> > > kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
> > > kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
> > >
> > > Caused by commit
> > >
> > > abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
> > >
> > > I have reverted that commit for today.
> >
> > Hello, Stephen,
> >
> > Very strange. The "static" keyword does not mean anything here?
> > Easy enough to use different symbols in the two different files,
> > but this situation is not so good for information hiding.
> >
> > Happy to update rcuperf.c to use a different name, but in the
> > immortal words of MSDOS, "Are you sure?" :-)
>
> I have no idea why it happens, but I do get the error above unless I
> revert that commit. So, yes, I am sure :-)
>
> OK, I looked further and
>
> DEFINE_STATIC_SRCU(srcu_ctl);
>
> becomes this (NLs added for clarity):
>
> static __attribute__((section(".discard"), unused)) char __pcpu_scope_srcu_ctl_srcu_array;
> extern __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
> extern __attribute__((section(".data..percpu" ""))) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> __attribute__((section(".data..percpu" ""))) __attribute__((weak)) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
> static struct srcu_struct srcu_ctl = {
> .
> .
> };
>
> So, the "static" is not very effective :-(
Oddly enough, this appears to be toolchain dependent. No idea why.
Here is a patch that I will be merging in.
Thanx, Paul
------------------------------------------------------------------------
commit d81f900405de0dc6152692a2088258b8b35d740d
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Date: Thu Jan 7 12:39:10 2016 -0800
Merge with abcd7ec0808e (rcutorture: Add RCU grace-period performance tests)
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index eef82a9460d8..4c8d99aa4f5e 100644
--- a/kernel/rcu/rcuperf.c
+++ b/kernel/rcu/rcuperf.c
@@ -188,8 +188,8 @@ static struct rcu_perf_ops rcu_bh_ops = {
* Definitions for srcu perf testing.
*/
-DEFINE_STATIC_SRCU(srcu_ctl);
-static struct srcu_struct *srcu_ctlp = &srcu_ctl;
+DEFINE_STATIC_SRCU(srcu_ctl_perf);
+static struct srcu_struct *srcu_ctlp = &srcu_ctl_perf;
static int srcu_perf_read_lock(void) __acquires(srcu_ctlp)
{
^ permalink raw reply related
* Re: linux-next: build failure after merge of the rcu tree
From: Stephen Rothwell @ 2016-01-07 20:19 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next, linux-kernel
In-Reply-To: <20160107180244.GR3818@linux.vnet.ibm.com>
Hi Paul,
On Thu, 7 Jan 2016 10:02:44 -0800 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> On Thu, Jan 07, 2016 at 07:57:25PM +1100, Stephen Rothwell wrote:
> > Hi Paul,
> >
> > [I found this a few days ago, but I think I forgot to send the email,
> > sorry.]
> >
> > After merging the rcu tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
> > kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
> >
> > Caused by commit
> >
> > abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
> >
> > I have reverted that commit for today.
>
> Hello, Stephen,
>
> Very strange. The "static" keyword does not mean anything here?
> Easy enough to use different symbols in the two different files,
> but this situation is not so good for information hiding.
>
> Happy to update rcuperf.c to use a different name, but in the
> immortal words of MSDOS, "Are you sure?" :-)
I have no idea why it happens, but I do get the error above unless I
revert that commit. So, yes, I am sure :-)
OK, I looked further and
DEFINE_STATIC_SRCU(srcu_ctl);
becomes this (NLs added for clarity):
static __attribute__((section(".discard"), unused)) char __pcpu_scope_srcu_ctl_srcu_array;
extern __attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
__attribute__((section(".discard"), unused)) char __pcpu_unique_srcu_ctl_srcu_array;
extern __attribute__((section(".data..percpu" ""))) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
__attribute__((section(".data..percpu" ""))) __attribute__((weak)) __typeof__(struct srcu_struct_array) srcu_ctl_srcu_array;
static struct srcu_struct srcu_ctl = {
.
.
};
So, the "static" is not very effective :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell @ 2016-01-07 20:03 UTC (permalink / raw)
To: Aneesh Kumar K.V
Cc: Andrew Morton, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev, linux-next, linux-kernel
In-Reply-To: <87ziwhpazc.fsf@linux.vnet.ibm.com>
Hi Aneesh,
On Thu, 07 Jan 2016 22:45:19 +0530 "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
>
> > This merge fix up patch now looks like this:
>
>
> What about the #define pfn_pte part ? We don't need that now ?
That is done as part of the merge conflict resolution. This is an
extra needed merge resolution patch due to code being moved between
files. You can see the entire merge resolution using
git diff-tree --cc 5a028bd9b7de
in next-20160107.
The #defines are there in
arch/powerpc/include/asm/book3s/32/pgtable.h
arch/powerpc/include/asm/book3s/64/hash.h
arch/powerpc/include/asm/nohash/pgtable.h
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: next boot: 564 boots: 59 failed, 448 passed with 57 offline (next-20160107)
From: Greg Kroah-Hartman @ 2016-01-07 18:57 UTC (permalink / raw)
To: Thierry Reding
Cc: Mark Brown, Stephen Warren, Alexandre Courbot, Jiri Slaby,
Arnd Bergmann, kernel-build-reports, linux-next, linux-arm-kernel,
linux-tegra
In-Reply-To: <20160107162810.GA25177@ulmo>
On Thu, Jan 07, 2016 at 05:28:10PM +0100, Thierry Reding wrote:
> On Thu, Jan 07, 2016 at 03:59:58PM +0000, Mark Brown wrote:
> > On Thu, Jan 07, 2016 at 07:41:52AM -0800, kernelci.org bot wrote:
> >
> > > Tree: next
> > > Branch: local/master
> > > Git Describe: next-20160107
> > > Git Commit: 0f023a298a7d2a8e99c54913f7277b3c08c1f5c9
> > > Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> > > Tested: 95 unique boards, 25 SoC families, 28 builds out of 135
> > >
> > > Boot Failures Detected: https://kernelci.org/boot/?next-20160107&fail
> >
> > For the past couple of days -next has been failing to boot on various
> > Tegra platforms, there are failures involving either no kernel output or
> > (with tegra_defconfig) backtraces during CMA allocation from USB, for
> > example:
> >
> > http://storage.kernelci.org/next/next-20160107/arm-tegra_defconfig/lab-khilman/boot-tegra30-beaver.html
> >
> > > multi_v7_defconfig+CONFIG_THUMB2_KERNEL=y:
> > > tegra124-jetson-tk1: 2 failed labs
> > > tegra30-beaver: 1 failed lab
> > >
> > > tegra_defconfig:
> > > tegra124-jetson-tk1: 2 failed labs
> > > tegra124-jetson-tk1_rootfs:nfs: 1 failed lab
> > > tegra124-nyan-big: 1 failed lab
> > > tegra30-beaver: 1 failed lab
> > >
> > > multi_v7_defconfig+CONFIG_ARM_LPAE=y:
> > > tegra124-jetson-tk1: 1 failed lab
> > > tegra124-nyan-big: 1 failed lab
> > >
> > > multi_v7_defconfig:
> > > tegra124-jetson-tk1: 2 failed labs
> > > tegra30-beaver: 1 failed lab
> > >
> > > multi_v7_defconfig+CONFIG_LKDTM=y:
> > > tegra124-jetson-tk1: 2 failed labs
> > > tegra30-beaver: 1 failed lab
> > >
> > > multi_v7_defconfig+CONFIG_PROVE_LOCKING=y:
> > > tegra124-jetson-tk1: 2 failed labs
> > > tegra30-beaver: 1 failed lab
> >
> > I did bisects yesterday but they were a bit inconclusive, showing a
> > series of skipped commits in the TTY tree as being the culprits:
> >
> > afd7f88f157796e586fc99d62da13a54024e0731 serial: 8250: move of_serial code to 8250 directory
> > 4e33870b3bb691996354a8f9e8f69458b4fc34d9 serial: of: CONFIG_SERIAL_8250 is always set
> > d1b5c87fa8058a3f477ae05555916dd1cea934ad serial: remove NWP serial support
> >
> > which seems more than a little surprising and like they might be false
> > positives, especially in the cases that do produce output. The errors
> > today look the same. I've not investigated further than the bisects.
> >
> > Full bisect logs:
> >
> > https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/140/console
> > https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/141/console
>
> These should all be fixed by this patch:
>
> serial: 8250: of: Fix the driver and actually compile the 8250_of
>
> which can be found in patchwork here:
>
> https://patchwork.kernel.org/patch/7883541/
>
> I think this is merely waiting to be picked up into the tty tree. I
> suspect the reason why there's output in the first place is because
> of earlyprintk. I've seen recent linux-next work properly, with the
> serial console hanging at some point (fbcon shows login prompt). If
> I apply the above patch things are back to normal.
I'll go queue that up later, but how is this suddenly showing up in
-next? The tty tree has been pretty quiet for a while now..
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for Jan 7 (regulator/max8973)
From: Randy Dunlap @ 2016-01-07 18:38 UTC (permalink / raw)
To: Stephen Rothwell, linux-next; +Cc: linux-kernel, Liam Girdwood, Mark Brown
In-Reply-To: <20160107212131.69b44a5d@canb.auug.org.au>
On 01/07/16 02:21, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20160106:
>
on i386:
when CONFIG_THERMAL=m
and CONFIG_REGULATOR_MAX8973=y:
drivers/built-in.o: In function `max8973_remove':
max8973-regulator.c:(.text+0x170bbb): undefined reference to `thermal_zone_of_sensor_unregister'
drivers/built-in.o: In function `max8973_thermal_irq':
max8973-regulator.c:(.text+0x1713ec): undefined reference to `thermal_zone_device_update'
drivers/built-in.o: In function `max8973_probe':
max8973-regulator.c:(.text+0x172227): undefined reference to `thermal_zone_of_sensor_register'
max8973-regulator.c:(.text+0x17238f): undefined reference to `thermal_zone_of_sensor_unregister'
--
~Randy
^ permalink raw reply
* Re: linux-next: build failure after merge of the rcu tree
From: Paul E. McKenney @ 2016-01-07 18:02 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160107195725.3a130b4d@canb.auug.org.au>
On Thu, Jan 07, 2016 at 07:57:25PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> [I found this a few days ago, but I think I forgot to send the email,
> sorry.]
>
> After merging the rcu tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
> kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
>
> Caused by commit
>
> abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
>
> I have reverted that commit for today.
Hello, Stephen,
Very strange. The "static" keyword does not mean anything here?
Easy enough to use different symbols in the two different files,
but this situation is not so good for information hiding.
Happy to update rcuperf.c to use a different name, but in the
immortal words of MSDOS, "Are you sure?" :-)
Thanx, Paul
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Aneesh Kumar K.V @ 2016-01-07 17:15 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton, Michael Ellerman,
Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel
In-Reply-To: <20160107201503.6d5ec159@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> This merge fix up patch now looks like this:
What about the #define pfn_pte part ? We don't need that now ?
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Dec 2015 16:50:42 +1100
> Subject: [PATCH] merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 ------------
> arch/powerpc/include/asm/book3s/64/hash.h | 11 +++--------
> arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ----
> 3 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
> index 9e55e3b1fef0..849bbec80f7b 100644
> --- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
> @@ -256,13 +256,6 @@ static inline int pmd_trans_huge(pmd_t pmd)
> (_PAGE_PTE | _PAGE_THP_HUGE));
> }
>
> -static inline int pmd_trans_splitting(pmd_t pmd)
> -{
> - if (pmd_trans_huge(pmd))
> - return pmd_val(pmd) & _PAGE_SPLITTING;
> - return 0;
> -}
> -
> static inline int pmd_large(pmd_t pmd)
> {
> return !!(pmd_val(pmd) & _PAGE_PTE);
> @@ -273,11 +266,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd)
> return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT);
> }
>
> -static inline pmd_t pmd_mksplitting(pmd_t pmd)
> -{
> - return __pmd(pmd_val(pmd) | _PAGE_SPLITTING);
> -}
> -
> #define __HAVE_ARCH_PMD_SAME
> static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
> {
> diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
> index 9e861b4378bd..b6827603e613 100644
> --- a/arch/powerpc/include/asm/book3s/64/hash.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash.h
> @@ -36,11 +36,6 @@
> #define _PAGE_SOFT_DIRTY 0x20000 /* software: software dirty tracking */
>
> /*
> - * THP pages can't be special. So use the _PAGE_SPECIAL
> - */
> -#define _PAGE_SPLITTING _PAGE_SPECIAL
> -
> -/*
> * We need to differentiate between explicit huge page and THP huge
> * page, since THP huge page also need to track real subpage details
> */
> @@ -49,9 +44,9 @@
> /*
> * set of bits not changed in pmd_modify.
> */
> -#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \
> - _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \
> - _PAGE_THP_HUGE | _PAGE_PTE | _PAGE_SOFT_DIRTY)
> +#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
> + _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \
> + _PAGE_SOFT_DIRTY)
>
> #ifdef CONFIG_PPC_64K_PAGES
> #include <asm/book3s/64/hash-64k.h>
> diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
> index 03c1a5a21c0c..04022fad3708 100644
> --- a/arch/powerpc/include/asm/book3s/64/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
> @@ -258,10 +258,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
> extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
> unsigned long addr, pmd_t *pmdp);
>
> -#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
> -extern void pmdp_splitting_flush(struct vm_area_struct *vma,
> - unsigned long address, pmd_t *pmdp);
> -
> extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
> unsigned long address, pmd_t *pmdp);
> #define pmdp_collapse_flush pmdp_collapse_flush
>
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: next boot: 564 boots: 59 failed, 448 passed with 57 offline (next-20160107)
From: Mark Brown @ 2016-01-07 16:56 UTC (permalink / raw)
To: Thierry Reding
Cc: Stephen Warren, Alexandre Courbot, Greg Kroah-Hartman, Jiri Slaby,
Arnd Bergmann, kernel-build-reports, linux-next, linux-arm-kernel,
linux-tegra
In-Reply-To: <20160107162810.GA25177@ulmo>
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
On Thu, Jan 07, 2016 at 05:28:10PM +0100, Thierry Reding wrote:
> These should all be fixed by this patch:
> serial: 8250: of: Fix the driver and actually compile the 8250_of
> which can be found in patchwork here:
> https://patchwork.kernel.org/patch/7883541/
> I think this is merely waiting to be picked up into the tty tree. I
Ah, good - hopefully that'll get picked up quickly, I suspect it's going
to turn out to be responsible for a bunch of the other failures we're
seeing at the minute.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next boot: 564 boots: 59 failed, 448 passed with 57 offline (next-20160107)
From: Thierry Reding @ 2016-01-07 16:28 UTC (permalink / raw)
To: Mark Brown
Cc: Stephen Warren, Alexandre Courbot, Greg Kroah-Hartman, Jiri Slaby,
Arnd Bergmann, kernel-build-reports, linux-next, linux-arm-kernel,
linux-tegra
In-Reply-To: <20160107155958.GG6588@sirena.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3140 bytes --]
On Thu, Jan 07, 2016 at 03:59:58PM +0000, Mark Brown wrote:
> On Thu, Jan 07, 2016 at 07:41:52AM -0800, kernelci.org bot wrote:
>
> > Tree: next
> > Branch: local/master
> > Git Describe: next-20160107
> > Git Commit: 0f023a298a7d2a8e99c54913f7277b3c08c1f5c9
> > Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> > Tested: 95 unique boards, 25 SoC families, 28 builds out of 135
> >
> > Boot Failures Detected: https://kernelci.org/boot/?next-20160107&fail
>
> For the past couple of days -next has been failing to boot on various
> Tegra platforms, there are failures involving either no kernel output or
> (with tegra_defconfig) backtraces during CMA allocation from USB, for
> example:
>
> http://storage.kernelci.org/next/next-20160107/arm-tegra_defconfig/lab-khilman/boot-tegra30-beaver.html
>
> > multi_v7_defconfig+CONFIG_THUMB2_KERNEL=y:
> > tegra124-jetson-tk1: 2 failed labs
> > tegra30-beaver: 1 failed lab
> >
> > tegra_defconfig:
> > tegra124-jetson-tk1: 2 failed labs
> > tegra124-jetson-tk1_rootfs:nfs: 1 failed lab
> > tegra124-nyan-big: 1 failed lab
> > tegra30-beaver: 1 failed lab
> >
> > multi_v7_defconfig+CONFIG_ARM_LPAE=y:
> > tegra124-jetson-tk1: 1 failed lab
> > tegra124-nyan-big: 1 failed lab
> >
> > multi_v7_defconfig:
> > tegra124-jetson-tk1: 2 failed labs
> > tegra30-beaver: 1 failed lab
> >
> > multi_v7_defconfig+CONFIG_LKDTM=y:
> > tegra124-jetson-tk1: 2 failed labs
> > tegra30-beaver: 1 failed lab
> >
> > multi_v7_defconfig+CONFIG_PROVE_LOCKING=y:
> > tegra124-jetson-tk1: 2 failed labs
> > tegra30-beaver: 1 failed lab
>
> I did bisects yesterday but they were a bit inconclusive, showing a
> series of skipped commits in the TTY tree as being the culprits:
>
> afd7f88f157796e586fc99d62da13a54024e0731 serial: 8250: move of_serial code to 8250 directory
> 4e33870b3bb691996354a8f9e8f69458b4fc34d9 serial: of: CONFIG_SERIAL_8250 is always set
> d1b5c87fa8058a3f477ae05555916dd1cea934ad serial: remove NWP serial support
>
> which seems more than a little surprising and like they might be false
> positives, especially in the cases that do produce output. The errors
> today look the same. I've not investigated further than the bisects.
>
> Full bisect logs:
>
> https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/140/console
> https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/141/console
These should all be fixed by this patch:
serial: 8250: of: Fix the driver and actually compile the 8250_of
which can be found in patchwork here:
https://patchwork.kernel.org/patch/7883541/
I think this is merely waiting to be picked up into the tty tree. I
suspect the reason why there's output in the first place is because
of earlyprintk. I've seen recent linux-next work properly, with the
serial console hanging at some point (fbcon shows login prompt). If
I apply the above patch things are back to normal.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: next boot: 564 boots: 59 failed, 448 passed with 57 offline (next-20160107)
From: Mark Brown @ 2016-01-07 15:59 UTC (permalink / raw)
To: Stephen Warren, Thierry Reding, Alexandre Courbot,
Greg Kroah-Hartman, Jiri Slaby, Arnd Bergmann
Cc: kernel-build-reports-cunTk1MwBs8s++Sfvej+rw,
linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-tegra-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <568e8740.01941c0a.31072.ffffb67b-ATjtLOhZ0NVl57MIdRCFDg@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 2417 bytes --]
On Thu, Jan 07, 2016 at 07:41:52AM -0800, kernelci.org bot wrote:
> Tree: next
> Branch: local/master
> Git Describe: next-20160107
> Git Commit: 0f023a298a7d2a8e99c54913f7277b3c08c1f5c9
> Git URL: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
> Tested: 95 unique boards, 25 SoC families, 28 builds out of 135
>
> Boot Failures Detected: https://kernelci.org/boot/?next-20160107&fail
For the past couple of days -next has been failing to boot on various
Tegra platforms, there are failures involving either no kernel output or
(with tegra_defconfig) backtraces during CMA allocation from USB, for
example:
http://storage.kernelci.org/next/next-20160107/arm-tegra_defconfig/lab-khilman/boot-tegra30-beaver.html
> multi_v7_defconfig+CONFIG_THUMB2_KERNEL=y:
> tegra124-jetson-tk1: 2 failed labs
> tegra30-beaver: 1 failed lab
>
> tegra_defconfig:
> tegra124-jetson-tk1: 2 failed labs
> tegra124-jetson-tk1_rootfs:nfs: 1 failed lab
> tegra124-nyan-big: 1 failed lab
> tegra30-beaver: 1 failed lab
>
> multi_v7_defconfig+CONFIG_ARM_LPAE=y:
> tegra124-jetson-tk1: 1 failed lab
> tegra124-nyan-big: 1 failed lab
>
> multi_v7_defconfig:
> tegra124-jetson-tk1: 2 failed labs
> tegra30-beaver: 1 failed lab
>
> multi_v7_defconfig+CONFIG_LKDTM=y:
> tegra124-jetson-tk1: 2 failed labs
> tegra30-beaver: 1 failed lab
>
> multi_v7_defconfig+CONFIG_PROVE_LOCKING=y:
> tegra124-jetson-tk1: 2 failed labs
> tegra30-beaver: 1 failed lab
I did bisects yesterday but they were a bit inconclusive, showing a
series of skipped commits in the TTY tree as being the culprits:
afd7f88f157796e586fc99d62da13a54024e0731 serial: 8250: move of_serial code to 8250 directory
4e33870b3bb691996354a8f9e8f69458b4fc34d9 serial: of: CONFIG_SERIAL_8250 is always set
d1b5c87fa8058a3f477ae05555916dd1cea934ad serial: remove NWP serial support
which seems more than a little surprising and like they might be false
positives, especially in the cases that do produce output. The errors
today look the same. I've not investigated further than the bisects.
Full bisect logs:
https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/140/console
https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/141/console
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* next-20160107 build: 0 failures 9 warnings (next-20160107)
From: Build bot for Mark Brown @ 2016-01-07 14:00 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160107
Git describe: next-20160107
Commit: 0f023a298a Add linux-next specific files for 20160107
Build Time: 73 min 34 sec
Passed: 9 / 9 (100.00 %)
Failed: 0 / 9 ( 0.00 %)
Errors: 0
Warnings: 9
Section Mismatches: 0
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allmodconfig
3 warnings 0 mismatches : arm-multi_v5_defconfig
7 warnings 0 mismatches : arm-multi_v7_defconfig
5 warnings 0 mismatches : arm-allmodconfig
1 warnings 0 mismatches : arm-allnoconfig
1 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Warnings Summary: 9
7 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
2 ../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
1 arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
1 ../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../fs/ext4/ioctl.c:426:1: warning: control reaches end of non-void function [-Wreturn-type]
../net/bluetooth/mgmt.c:5493:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5493:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches
Warnings:
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Jan 6 (clocksource/fsl_ftm_timer.c)
From: Daniel Lezcano @ 2016-01-07 11:01 UTC (permalink / raw)
To: Randy Dunlap, Stephen Rothwell, linux-next
Cc: linux-kernel, Thomas Gleixner, Xiubo Li
In-Reply-To: <568D4E51.9030606@infradead.org>
On 01/06/2016 06:26 PM, Randy Dunlap wrote:
> On 01/06/16 00:01, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20160105:
>>
>
> on i386:
> when CLKSRC_MMIO is not enabled:
>
> drivers/built-in.o: In function `ftm_timer_init':
> fsl_ftm_timer.c:(.init.text+0x6842): undefined reference to `clocksource_mmio_readl_up'
> fsl_ftm_timer.c:(.init.text+0x6855): undefined reference to `clocksource_mmio_init'
>
>
> Looks like FSL_FTM_TIMER needs to select CLKSRC_MMIO.
Noted.
Thanks for the head up.
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply
* Re: linux-next: build failure after merge of the powerpc tree
From: Michael Ellerman @ 2016-01-07 10:30 UTC (permalink / raw)
To: Stephen Rothwell, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Michael Neuling
In-Reply-To: <20160107191613.0228560b@canb.auug.org.au>
On Thu, 2016-01-07 at 19:16 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the powerpc tree, today's linux-next build (powerpc64
> allnoconfig) failed like this:
>
> arch/powerpc/mm/hash_utils_64.c: In function 'get_paca_psize':
> arch/powerpc/mm/hash_utils_64.c:869:19: error: 'struct paca_struct' has no member named 'context'
> return get_paca()->context.user_psize;
> ^
> arch/powerpc/mm/hash_utils_64.c:870:1: error: control reaches end of non-void function [-Werror=return-type]
> }
> ^
>
> Caused by commit
>
> 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
Well that's rather embarrassing, for Mikey ;D
> This build has CONFIG_PPC_MM_SLICES not set ...
Ugh, but it would seem none of our defconfigs do :/
> I have applied the following patch for today:
Thanks.
I'll merge it or something similar once I get a chance to test it.
cheers
^ permalink raw reply
* linux-next: Tree for Jan 7
From: Stephen Rothwell @ 2016-01-07 10:21 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160106:
Undropped tree: rdma
The powerpc tree gained a build failure for which I applied a fix patch.
I used a supplied merge resolution to fix the rdma tree merge conflicts.
The drm tree still had its build failure for which I added a fix patch.
The spi tree lost its build failure.
The rcu tree still had its build failure for which I reverted a commit.
The target-updates tree gained conflicts against the rdma tree.
The akpm tree lost a patch that turned up elsewhere, but still had its
build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 9286
8926 files changed, 428893 insertions(+), 164514 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 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 powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc,
sparc64 and arm defconfig.
Below is a summary of the state of the merge.
I am currently merging 238 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (ee9a7d2cb0cf Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed)
Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (036592fbbe75 powerpc/opal-irqchip: Fix deadlock introduced by "Fix double endian conversion")
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging net/master (8b8a321ff72c tcp: fix zero cwnd in tcp_cwnd_reduction)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings)
Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (cf1e05c63642 mac80211: handle width changes from opmode notification IE in beacon)
Merging sound-current/for-linus (3f37b26f8d57 Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
Merging pci-current/for-linus (1dbe162d53e1 PCI: hisi: Fix hisi_pcie_cfg_read() 32-bit reads)
Merging driver-core.current/driver-core-linus (4ef7675344d6 Linux 4.4-rc6)
Merging tty.current/tty-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb.current/usb-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set)
Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging input-current/for-linus (dd0d0d4de582 Input: i8042 - add Fujitsu Lifebook U745 to the nomux list)
Merging crypto-current/master (9f47e11b9e31 crypto: algif_skcipher - Require setkey before accept(2))
Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (168309855a7d Linux 4.4-rc8)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next)
Merging arm-perf/for-next/perf (5d7ee87708d4 arm64: perf: add support for Cortex-A72)
Merging arm-soc/for-next (4909c459092b Merge branches 'next/drivers' and 'next/multiplatform' into for-next)
Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.)
Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836)
Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver)
Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (c6abe665c94f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (12bd4032ea2f Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (06cdbbe9902d Merge tag 'omap-for-v4.5/81xx-fix-signed' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs)
Merging renesas/next (23a0d0a54a30 Merge branch 'heads/dt-fixes-for-v4.5' into next)
Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next)
Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (5e7d4e401029 Merge remote-tracking branch 'origin/master' into h8300-next)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (ea8d65ad6958 m68k/defconfig: Update defconfigs for v4.4-rc1)
Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (9f84a5f9ae3a Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3)
Merging powerpc/next (7b8ad495d592 cxl: Fix DSI misses when the context owning task exits)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9236b4dd6bfa s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (544f7d5a408e numa: remove stale node_has_online_mem() define)
Merging uml/linux-next (887a9853092c um: fix returns without va_end)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (511711af91f2 btrfs: don't run delayed references while we are creating the free space tree)
Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only)
Merging cifs/for-next (181a15048df3 [SMB3] Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.)
Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0)
Merging ext4/dev (880cec3449e0 fs: clean up the flags definition in uapi/linux/fs.h)
Merging f2fs/dev (90d43c31be5a f2fs: read isize while holding i_mutex in fiemap)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (a93a99838248 gfs2: fix flock panic issue)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (614bdee254f8 Merge branch 'bugfixes')
Merging nfsd/nfsd-next (12f39c3d96f8 nfsd: Fix nfsd leaks sunrpc module references)
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing)
Merging ubifs/linux-next (6b238de189f6 mtd: ubi: don't leak e if schedule_erase() fails)
Merging xfs/for-next (4922be51ef1a Merge branch 'xfs-dax-fixes-for-4.5' into for-next)
Merging file-locks/linux-next (9189922675ec fs: make locks.c explicitly non-modular)
Merging vfs/for-next (e3d994cc0636 Merge branches 'work.misc', 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in drivers/s390/char/zcore.c
Applying: orangfs: update for follow_link to get_link change
Merging pci/next (c6123e06042d Merge branches 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-rcar' into next)
Merging hid/for-next (817b1df9945e Merge branch 'for-4.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (d9794cfe8c46 Merge branch 'i2c/for-4.5' into i2c/for-next)
Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (afac06294288 firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (449278d92442 hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures)
Merging v4l-dvb/master (e27bc2ab8e77 Merge ../mc_dvb into to_next)
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c
Merging kbuild/for-next (e03445d23fdc Merge branch 'kbuild/misc' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (101f6dbe1444 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (2b617d112c90 Merge branches 'pm-opp' and 'pm-cpufreq' into linux-next)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (1d296eb7260a Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
Applying: thermal: fix for thermal_zone_device_update() API change
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (382bb0da83da Merge branch 'for-linus' into next)
Merging net-next/master (c7f5d105495a net: Add eth_platform_get_mac_address() helper.)
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning)
Merging wireless-drivers-next/master (00ce3a15d811 soreuseport: change consume_skb to kfree_skb in error case)
Merging bluetooth/master (8cf60cf238ce Bluetooth: btmrvl: don't send data to firmware while processing suspend)
Merging mac80211-next/master (c45932df5612 regulatory: fix world regulatory domain data)
Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception)
CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h
CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
CONFLICT (content): Merge conflict in include/linux/mlx5/device.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c
Applying: fixup! Merge remote-tracking branch 'gerrit/ib-next' into HEAD
Merging mtd/master (a32d5b726ff8 mtd: spi-nor: fix stm_is_locked_sr() parameters)
Merging l2-mtd/master (e57633003393 mtd: merge MTD development from v4.4 into for-v4.5 development)
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (c11b89896351 Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Applying: drm/amdgpu/powerplay: include asm/div64.h for do_div()
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (d5f384de5bf1 drm/i915: Move Braswell stop_machine GGTT insertion workaround)
Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC)
Merging drm-misc/topic/drm-misc (14de6c44d149 drm/atomic: Remove drm_atomic_connectors_for_crtc.)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (2651f437261f MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.)
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging sound/for-next (9d9938854efc Merge branch 'for-linus' into for-next)
Merging sound-asoc/for-next (54d7fb784293 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next)
CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl.h
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (fa68e2777cbc Input: pcap_ts - use to_delayed_work)
Merging block/for-next (d49ed8e45ac0 Merge branch 'for-4.5/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c
CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile
Applying: nvme: merge fix up for ns code movement
Merging device-mapper/for-next (1c8996aded91 dm thin: bump thin and thin-pool target versions)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (01a999e48995 mmc: dw_mmc: remove the unused quirks)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (fc46fcaabedf raid5-cache: use rcu api to access r5conf->log)
Merging mfd/for-mfd-next (526c0ab13672 mfd: syscon: Add a DT property to set value width)
Merging backlight/for-backlight-next (ee65ad0e2a9e backlight: pwm_bl: Avoid backlight flicker when probed from DT)
Merging battery/master (f96576bd63e5 power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (e35c4335ab07 Merge remote-tracking branches 'regulator/topic/tps65218' and 'regulator/topic/wm831x' into regulator-next)
Merging security/next (aa98b942cbf3 Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next)
Merging integrity/next (6427e6c71c8b ima: ima_write_policy() limit locking)
Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (3b8d058cfe6a hwmon: (sch56xx) Drop watchdog driver data reference count callbacks)
Merging iommu/next (d5ffaf1db92c Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
Merging jc_docs/docs-next (9daacf51b428 Documentation/kernel-parameters: update KMG units)
Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static)
Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (fcd71d9cc6e3 of: fix declaration of of_io_request_and_map)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (3ad7865919be Merge remote-tracking branches 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next)
Merging tip/auto-latest (5852b88267ad Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/h8300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (05a724bd44a6 tracing: Fix comment to use tracing_on over tracing_enable)
Merging rcu/rcu/next (ed1b0a24d7c4 rcu: Migrate grace-period kthread off of outgoing CPU)
Merging kvm/linux-next (da3f7ca3e856 Merge tag 'kvm-s390-next-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (696066f875bc KVM: PPC: Increase memslots to 512)
Merging kvms390/next (32e6b236d269 KVM: s390: consider system MHA for guest storage)
Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (82607adcf9cd workqueue: implement lockup detector)
Merging drivers-x86/for-next (c9abbe63aa08 asus-wmi: drop to_platform_driver macro)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (6cb07abcc318 Merge remote-tracking branches 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/seq' into regmap-next)
Merging hsi/for-next (403c5c065081 HSI: Remove struct hsi_client private fields from kernel-doc)
Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358)
Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.)
Merging driver-core/driver-core-next (4ef7675344d6 Linux 4.4-rc6)
Merging tty/tty-next (462a1196a578 Merge 4.4-rc6 into tty-next)
Merging usb/usb-next (48346892ff2a Merge tag 'usb-serial-4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next)
Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM)
Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages)
Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry)
Merging staging/staging-next (02c34ccc1d2d Merge tag 'iio-for-4.5c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/symlink.c
Merging char-misc/char-misc-next (d7a26beb6fe6 Merge tag 'extcon-next-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (75e6107a60a2 Merge branch 'for-4.5' into for-next)
Merging scsi/for-next (3196a8641050 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (beccdd6ac780 qla2xxx: Check for online flag instead of active reset when transmitting responses)
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_memory.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_initiator.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iscsi_iser.h
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (c9f294ff6584 pinctrl: lantiq: 2 pins have the wrong mux list)
Merging vhost/linux-next (675358982eae checkpatch: add virt barriers)
CONFLICT (content): Merge conflict in include/asm-generic/barrier.h
CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (446f59acb70b Revert "pinctrl: lantiq: Implement gpio_chip.to_irq")
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (074726402b82 pwm: omap-dmtimer: Potential NULL dereference on error)
Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (b360ada3f153 Merge tag 'tegra-for-4.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (ed2d26d7cbcc tools, testing, add test for intel_pstate driver)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (8735f8e16a70 selftests/x86: Add tests for UC_SIGCONTEXT_SS and UC_STRICT_RESTORE_SS)
Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (5dc5f4089332 Merge branch 'for-4.5/core' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c
Merging coresight/next (d2b29c2f35a2 coresight: Fix a typo in Kconfig)
Merging rtc/rtc-next (cab572b82c4b rtc: fix overflow and incorrect calculation in rtc_time64_to_tm)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (d23a0e707dd6 Merge branch 'for-4.5/pfn' into for-4.5/libnvdimm)
Applying: powerpc: restore the user_psize member of the mm_context_t in the paca
Applying: Revert "rcutorture: Add RCU grace-period performance tests"
Merging akpm-current/current (055bd02ec563 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in scripts/tags.sh
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in include/linux/memblock.h
CONFLICT (content): Merge conflict in fs/block_dev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable_64.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
Applying: merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs"
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/hash.h
Applying: mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t
Applying: mm, dax: convert vmf_insert_pfn_pmd() to pfn_t fix
Applying: fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/overlayfs/super.c needs pagemap.h
Applying: fs/adfs/adfs.h: tidy up comments
Applying: iio: core: fix ptr_ret.cocci warnings
Applying: dma-mapping: make the generic coherent dma mmap implementation optional
Applying: arc: convert to dma_map_ops
Applying: arc: dma mapping fixes
Applying: ARC: dma mapping fixes #2
Applying: avr32: convert to dma_map_ops
Applying: blackfin: convert to dma_map_ops
Applying: c6x: convert to dma_map_ops
Applying: C6X: fix build breakage
Applying: c6x: dma mapping fixes
Applying: cris: convert to dma_map_ops
Applying: nios2: convert to dma_map_ops
Applying: nios2: dma mapping fixes
Applying: frv: convert to dma_map_ops
Applying: parisc: convert to dma_map_ops
Applying: mn10300: convert to dma_map_ops
Applying: m68k: convert to dma_map_ops
Applying: metag: convert to dma_map_ops
Applying: sparc: use generic dma_set_mask
Applying: tile: uninline dma_set_mask
Applying: dma-mapping: always provide the dma_map_ops based implementation
Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig
Applying: dma-mapping: remove <asm-generic/dma-coherent.h>
Applying: dma-mapping: use offset_in_page macro
Applying: memstick: use sector_div instead of do_div
Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem
Applying: mm: memcontrol: remove double kmem page_counter init
Applying: mm: memcontrol: give the kmem states more descriptive names
Applying: mm: memcontrol: group kmem init and exit functions together
Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code
Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix
Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2
Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET
Applying: net: drop tcp_memcontrol.c
Applying: net-drop-tcp_memcontrolc-fix
Applying: mm: memcontrol: rein in the CONFIG space madness
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix
Applying: mm: memcontrol: flatten struct cg_proto
Applying: mm: memcontrol: clean up alloc, online, offline, free functions
Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix
Applying: memcg: fix SLOB build regression
Applying: mm: memcontrol: charge swap to cgroup2
Applying: mm: vmscan: pass memcg to get_scan_count()
Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
Applying: swap.h: move memcg related stuff to the end of the file
Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit
Applying: mm: free swap cache aggressively if memcg swap is full
Applying: Documentation: cgroup: add memory.swap.{current,max} description
Applying: MAINTAINERS: add git URL for APM driver
Applying: MAINTAINERS: add git URL for at91
Applying: MAINTAINERS: add git URL for Rockchip
Applying: MAINTAINERS: add git URL for ARM64
Applying: MAINTAINERS: update git URL for ath6kl
Applying: MAINTAINERS: add git URL for backlight
Applying: MAINTAINERS: add git URL for chrome
Applying: MAINTAINERS: add git URL for cris
Applying: MAINTAINERS: add git URL for cryptodev
Applying: MAINTAINERS: add git URL for devfreq
Applying: MAINTAINERS: update git URL for DLM
Applying: MAINTAINERS: add git URL for eCryptfs
Applying: MAINTAINERS: add git URL for ext4
Applying: MAINTAINERS: add git URL for hwspinlock
Applying: MAINTAINERS: add git URL for integrity
Applying: MAINTAINERS: add git URL for IPVS
Applying: MAINTAINERS: add git URL for nfsd
Applying: MAINTAINERS: add git URL for KVM/s390
Applying: MAINTAINERS: add git URL for kgdb
Applying: MAINTAINERS: add git URL for nvdimm
Applying: MAINTAINERS: add git URL for metag
Applying: MAINTAINERS: add git URL for wireless drivers
Applying: MAINTAINERS: add git URL for devicetree
Applying: MAINTAINERS: update git URL for PCMCIA
Applying: MAINTAINERS: update git URL for pstore
Applying: MAINTAINERS: update git URL for ath10k
Applying: MAINTAINERS: add git URL for hexagon
Applying: MAINTAINERS: add git URL for reset
Applying: MAINTAINERS: add git URL for s390
Applying: MAINTAINERS: fix tree format for SAMSUNG thermal
Applying: MAINTAINERS: add git URL for md
Applying: MAINTAINERS: add git URL for squashfs
Applying: MAINTAINERS: add git URL for swiotlb
Applying: MAINTAINERS: add git URL for xtensa
Applying: MAINTAINERS: fix tree format for TPM
Applying: MAINTAINERS: add git URL for UML
Applying: MAINTAINERS: add git URL for VFIO
Applying: MAINTAINERS: add git URL for vhost
Applying: MAINTAINERS: update git URL for XFS
Applying: pmem: add wb_cache_pmem() to the PMEM API
Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6
Applying: dax: support dirty DAX entries in radix tree
Applying: dax-support-dirty-dax-entries-in-radix-tree-v6
Applying: mm: add find_get_entries_tag()
Applying: dax: add support for fsync/sync
Applying: dax-add-support-for-fsync-sync-v6
Applying: dax: fix dax_pmd_dbg build warning
Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync
Merging akpm/master (f572ad48c00d xfs: call dax_pfn_mkwrite() for DAX fsync/msync)
^ permalink raw reply
* Re: linux-next: manual merge of the target-updates tree with the rdma tree
From: Nicholas A. Bellinger @ 2016-01-07 10:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Doug Ledford, linux-next, linux-kernel, Christoph Hellwig,
Sagi Grimberg, Jenny Derzhavetz, Or Gerlitz
In-Reply-To: <20160107164212.4cfbbe02@canb.auug.org.au>
On Thu, 2016-01-07 at 16:42 +1100, Stephen Rothwell wrote:
> Hi Nicholas,
>
> Today's linux-next merge of the target-updates tree got conflicts in:
>
> drivers/infiniband/ulp/iser/iscsi_iser.h
> drivers/infiniband/ulp/iser/iser_initiator.c
> drivers/infiniband/ulp/iser/iser_memory.c
> drivers/infiniband/ulp/iser/iser_verbs.c
> drivers/infiniband/ulp/isert/ib_isert.c
>
> between commits:
>
> 4a061b287b1e ("IB/ulps: Avoid calling ib_query_device")
> cfeb91b375ad ("IB/iser: Convert to CQ abstraction")
> 2392a4cdcb8d ("IB/iser: constify iser_reg_ops structure")
> 422bd0acb062 ("IB/isert: Support the remote invalidation exception")
> 59caaed7a72a ("IB/iser: Support the remote invalidation exception")
>
> from the rdma tree and commit:
>
> ddca7d44ccd2 ("iser: Have initiator and target to share protocol structures and definitions")
> 6d2cb3ad4bc2 ("iser-target: Support the remote invalidation exception")
> c37c810bae45 ("IB/iser: Increment the rkey when registering and not when invalidating")
> 9a4a71456262 ("IB/iser: Support the remote invalidation exception")
>
> from the target-updates tree.
>
> I fixed it up (hopefully - mainly taking one of the other side (usually
> the rdma tree version, so please check the result when I release it)
> and can carry the fix as necessary (no action is required).
>
> Seom of these patches are very similar ...
>
Thanks SFR.
Sagi & Or, to confirm the iser/iser-target changes currently queued in
Doug's rdma.git for-next branch means the -v2 series introducing
remote invalidation support here:
http://www.spinics.net/lists/target-devel/msg11289.html
can now be safely dropped from target-pending/for-next, yes..?
^ permalink raw reply
* Re: linux-next: manual merge of the akpm-current tree with the powerpc tree
From: Stephen Rothwell @ 2016-01-07 9:15 UTC (permalink / raw)
To: Andrew Morton, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Aneesh Kumar K.V
In-Reply-To: <20151218163351.5bfd2def@canb.auug.org.au>
Hi all,
On Fri, 18 Dec 2015 16:33:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/powerpc/include/asm/pgtable.h
>
> between commit:
>
> ee4889c7bc2a ("powerpc/mm: Don't have generic headers introduce functions touching pte bits")
>
> from the powerpc tree and commit:
>
> e0e8474c0d55 ("mm, dax, gpu: convert vm_insert_mixed to pfn_t")
>
> from the akpm-current tree.
>
> I fixed it up (the code being changed was moved from this file - I added
> the fix up patch below) and can carry the fix as necessary (no action
> is required).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 18 Dec 2015 16:30:47 +1100
> Subject: [PATCH] mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/include/asm/book3s/32/pgtable.h | 1 +
> arch/powerpc/include/asm/book3s/64/hash.h | 1 +
> arch/powerpc/include/asm/nohash/pgtable.h | 1 +
> 3 files changed, 3 insertions(+)
>
> diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
> index 38b33dcfcc9d..3ed3303c1295 100644
> --- a/arch/powerpc/include/asm/book3s/32/pgtable.h
> +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h
> @@ -313,6 +313,7 @@ static inline int pte_present(pte_t pte)
> * Even if PTEs can be unsigned long long, a PFN is always an unsigned
> * long for now.
> */
> +#define pfn_pte pfn_pte
> static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
> {
> return __pte(((pte_basic_t)(pfn) << PTE_RPN_SHIFT) |
> diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
> index 9e861b4378bd..6ab967d0da00 100644
> --- a/arch/powerpc/include/asm/book3s/64/hash.h
> +++ b/arch/powerpc/include/asm/book3s/64/hash.h
> @@ -410,6 +410,7 @@ static inline int pte_present(pte_t pte)
> * Even if PTEs can be unsigned long long, a PFN is always an unsigned
> * long for now.
> */
> +#define pfn_pte pfn_pte
> static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot)
> {
> return __pte(((pte_basic_t)(pfn) << PTE_RPN_SHIFT) |
> diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
> index 1263c22d60d8..11e3767216c0 100644
> --- a/arch/powerpc/include/asm/nohash/pgtable.h
> +++ b/arch/powerpc/include/asm/nohash/pgtable.h
> @@ -49,6 +49,7 @@ static inline int pte_present(pte_t pte)
> * Even if PTEs can be unsigned long long, a PFN is always an unsigned
> * long for now.
> */
> +#define pfn_pte pfn_pte
> static inline pte_t pfn_pte(unsigned long pfn, pgprot_t pgprot) {
> return __pte(((pte_basic_t)(pfn) << PTE_RPN_SHIFT) |
> pgprot_val(pgprot)); }
> --
> 2.6.2
This merge fix up patch now looks like this:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Dec 2015 16:50:42 +1100
Subject: [PATCH] merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/book3s/64/hash-64k.h | 12 ------------
arch/powerpc/include/asm/book3s/64/hash.h | 11 +++--------
arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ----
3 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/64/hash-64k.h b/arch/powerpc/include/asm/book3s/64/hash-64k.h
index 9e55e3b1fef0..849bbec80f7b 100644
--- a/arch/powerpc/include/asm/book3s/64/hash-64k.h
+++ b/arch/powerpc/include/asm/book3s/64/hash-64k.h
@@ -256,13 +256,6 @@ static inline int pmd_trans_huge(pmd_t pmd)
(_PAGE_PTE | _PAGE_THP_HUGE));
}
-static inline int pmd_trans_splitting(pmd_t pmd)
-{
- if (pmd_trans_huge(pmd))
- return pmd_val(pmd) & _PAGE_SPLITTING;
- return 0;
-}
-
static inline int pmd_large(pmd_t pmd)
{
return !!(pmd_val(pmd) & _PAGE_PTE);
@@ -273,11 +266,6 @@ static inline pmd_t pmd_mknotpresent(pmd_t pmd)
return __pmd(pmd_val(pmd) & ~_PAGE_PRESENT);
}
-static inline pmd_t pmd_mksplitting(pmd_t pmd)
-{
- return __pmd(pmd_val(pmd) | _PAGE_SPLITTING);
-}
-
#define __HAVE_ARCH_PMD_SAME
static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)
{
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
index 9e861b4378bd..b6827603e613 100644
--- a/arch/powerpc/include/asm/book3s/64/hash.h
+++ b/arch/powerpc/include/asm/book3s/64/hash.h
@@ -36,11 +36,6 @@
#define _PAGE_SOFT_DIRTY 0x20000 /* software: software dirty tracking */
/*
- * THP pages can't be special. So use the _PAGE_SPECIAL
- */
-#define _PAGE_SPLITTING _PAGE_SPECIAL
-
-/*
* We need to differentiate between explicit huge page and THP huge
* page, since THP huge page also need to track real subpage details
*/
@@ -49,9 +44,9 @@
/*
* set of bits not changed in pmd_modify.
*/
-#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | \
- _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_SPLITTING | \
- _PAGE_THP_HUGE | _PAGE_PTE | _PAGE_SOFT_DIRTY)
+#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \
+ _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \
+ _PAGE_SOFT_DIRTY)
#ifdef CONFIG_PPC_64K_PAGES
#include <asm/book3s/64/hash-64k.h>
diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h
index 03c1a5a21c0c..04022fad3708 100644
--- a/arch/powerpc/include/asm/book3s/64/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/64/pgtable.h
@@ -258,10 +258,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
extern pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,
unsigned long addr, pmd_t *pmdp);
-#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
-extern void pmdp_splitting_flush(struct vm_area_struct *vma,
- unsigned long address, pmd_t *pmdp);
-
extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
unsigned long address, pmd_t *pmdp);
#define pmdp_collapse_flush pmdp_collapse_flush
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* linux-next: build failure after merge of the rcu tree
From: Stephen Rothwell @ 2016-01-07 8:57 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: linux-next, linux-kernel
Hi Paul,
[I found this a few days ago, but I think I forgot to send the email,
sorry.]
After merging the rcu tree, today's linux-next build (powerpc
allyesconfig) failed like this:
kernel/rcu/rcuperf.o:(.discard+0x0): multiple definition of `__pcpu_unique_srcu_ctl_srcu_array'
kernel/rcu/rcutorture.o:(.discard+0x0): first defined here
Caused by commit
abcd7ec0808e ("rcutorture: Add RCU grace-period performance tests")
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* linux-next: build failure after merge of the powerpc tree
From: Stephen Rothwell @ 2016-01-07 8:16 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel, Michael Neuling
Hi all,
After merging the powerpc tree, today's linux-next build (powerpc64
allnoconfig) failed like this:
arch/powerpc/mm/hash_utils_64.c: In function 'get_paca_psize':
arch/powerpc/mm/hash_utils_64.c:869:19: error: 'struct paca_struct' has no member named 'context'
return get_paca()->context.user_psize;
^
arch/powerpc/mm/hash_utils_64.c:870:1: error: control reaches end of non-void function [-Werror=return-type]
}
^
Caused by commit
2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
This build has CONFIG_PPC_MM_SLICES not set ...
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 7 Jan 2016 19:07:18 +1100
Subject: [PATCH] powerpc: restore the user_psize member of the mm_context_t in
the paca
It is used when CONFIG_PPC_MM_SLICES is not set.
Fixes: 2fc251a8dda5 ("powerpc: Copy only required pieces of the mm_context_t to the paca")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/include/asm/paca.h | 2 ++
arch/powerpc/mm/hash_utils_64.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index ef78c288c712..546540b91095 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -138,6 +138,7 @@ struct paca_struct {
u64 mm_ctx_low_slices_psize;
unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE];
#else
+ u16 mm_ctx_user_psize;
u16 mm_ctx_sllp;
#endif
#endif
@@ -212,6 +213,7 @@ static inline void copy_mm_to_paca(mm_context_t *context)
memcpy(&get_paca()->mm_ctx_high_slices_psize,
&context->high_slices_psize, SLICE_ARRAY_SIZE);
#else
+ get_paca()->mm_ctx_user_psize = context->user_psize;
get_paca()->mm_ctx_sllp = context->sllp;
#endif
}
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index db744576d730..ba59d5977f34 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -866,7 +866,7 @@ static unsigned int get_paca_psize(unsigned long addr)
#else
unsigned int get_paca_psize(unsigned long addr)
{
- return get_paca()->context.user_psize;
+ return get_paca()->mm_ctx_user_psize;
}
#endif
--
2.6.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* Re: linux-next: error while fetching the microblaze tree
From: Stephen Rothwell @ 2016-01-07 8:13 UTC (permalink / raw)
To: Michal Simek; +Cc: linux-next, linux-kernel
In-Reply-To: <568E0F7E.8080208@monstr.eu>
Hi Michal,
On Thu, 7 Jan 2016 08:10:54 +0100 Michal Simek <monstr@monstr.eu> wrote:
>
> git server in under maintenance. Hopefully it will be solved soon.
> Sorry for trouble.
No trouble, just making sure it was not an oversight.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: error while fetching the microblaze tree
From: Michal Simek @ 2016-01-07 7:10 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160107093856.779af583@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 709 bytes --]
Hi,
On 6.1.2016 23:38, Stephen Rothwell wrote:
> Hi Michal,
>
> Fetching the microblaze tree
> (git://git.monstr.eu/linux-2.6-microblaze.git#next) produces this error.
>
> fatal: read error: Connection reset by peer
>
> I will use the previously fetched version for today.
git server in under maintenance. Hopefully it will be solved soon.
Sorry for trouble.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ 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