* Runtime warning due to commit 'ARM: OMAP: Catch callers of revision information prior to it being populated' in -next
From: Guenter Roeck @ 2016-04-19 4:37 UTC (permalink / raw)
To: Nishanth Menon
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tony Lindgren
Hi,
commit 'ARM: OMAP: Catch callers of revision information prior to it
being populated' results in a runtime warning on various non-OMAP
architectures. I have seen it with the following qemu tests.
arm:vexpress-a9:multi_v7_defconfig:vexpress-v2p-ca9
arm:vexpress-a15:multi_v7_defconfig:vexpress-v2p-ca15-tc1
arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc702
arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zc706
arm:xilinx-zynq-a9:multi_v7_defconfig:zynq-zed
arm:midway:multi_v7_defconfig:ecx-2000
arm:smdkc210:multi_v7_defconfig:exynos4210-smdkv310
It is also reported by kernelci.org in at least one boot test for imx6q-cm-fx6.
The warning is as follows.
------------[ cut here ]------------
WARNING: CPU: 0 PID: 1 at arch/arm/mach-omap2/id.c:49 omap_rev+0x3c/0x50
Modules linked in:
CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.6.0-rc2-next-20160411 #1
Hardware name: SAMSUNG EXYNOS (Flattened Device Tree)
[<c030f970>] (unwind_backtrace) from [<c030b094>] (show_stack+0x10/0x14)
[<c030b094>] (show_stack) from [<c0585424>] (dump_stack+0x84/0xa4)
[<c0585424>] (dump_stack) from [<c0341774>] (__warn+0xd4/0x100)
[<c0341774>] (__warn) from [<c03417c0>] (warn_slowpath_null+0x20/0x28)
[<c03417c0>] (warn_slowpath_null) from [<c0324024>] (omap_rev+0x3c/0x50)
[<c0324024>] (omap_rev) from [<c1114a18>] (__omap4_sar_ram_init+0x8/0x88)
[<c1114a18>] (__omap4_sar_ram_init) from [<c0301e5c>] (do_one_initcall+0x3c/0x16c)
[<c0301e5c>] (do_one_initcall) from [<c1100ccc>] (kernel_init_freeable+0x70/0x1ec)
[<c1100ccc>] (kernel_init_freeable) from [<c0b495e4>] (kernel_init+0x8/0x110)
[<c0b495e4>] (kernel_init) from [<c0307f78>] (ret_from_fork+0x14/0x3c)
---[ end trace cb88537fdc8fa200 ]---
Please have a look.
Thanks,
Guenter
^ permalink raw reply
* Re: linux-next: build warning after merge of the ipvs-next tree
From: Simon Horman @ 2016-04-19 3:44 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160418090921.GB2807@salvia>
On Mon, Apr 18, 2016 at 11:09:21AM +0200, Pablo Neira Ayuso wrote:
> On Fri, Apr 15, 2016 at 10:38:14PM +1000, Simon Horman wrote:
> > On Fri, Apr 15, 2016 at 11:56:07AM +0200, Pablo Neira Ayuso wrote:
> > > On Fri, Apr 15, 2016 at 10:57:48AM +1000, Stephen Rothwell wrote:
> > > > Hi Simon,
> > > >
> > > > After merging the ipvs-next tree, today's linux-next build (powerpc
> > > > ppc64_defconfig) produced this warning:
> > > >
> > > > net/netfilter/nf_conntrack_netlink.c:529:15: warning: 'ctnetlink_proto_size' defined but not used [-Wunused-function]
> > > > static size_t ctnetlink_proto_size(const struct nf_conn *ct)
> > > > ^
> > > > net/netfilter/nf_conntrack_netlink.c:546:15: warning: 'ctnetlink_acct_size' defined but not used [-Wunused-function]
> > > > static size_t ctnetlink_acct_size(const struct nf_conn *ct)
> > > > ^
> > > > net/netfilter/nf_conntrack_netlink.c:556:12: warning: 'ctnetlink_secctx_size' defined but not used [-Wunused-function]
> > > > static int ctnetlink_secctx_size(const struct nf_conn *ct)
> > > > ^
> > > > net/netfilter/nf_conntrack_netlink.c:572:15: warning: 'ctnetlink_timestamp_size' defined but not used [-Wunused-function]
> > > > static size_t ctnetlink_timestamp_size(const struct nf_conn *ct)
> > > > ^
> > > > Introduced by commit
> > > >
> > > > 4054ff45454a ("netfilter: ctnetlink: remove unnecessary inlining")
> > > >
> > > > This build does not set CONFIG_NF_CONNTRACK_EVENTS or
> > > > CONFIG_NETFILTER_NETLINK_GLUE_CT.
> > >
> > > This is my fault, will fix this asap. Thanks for reporting.
> >
> > Pablo,
> >
> > can you let me know when it is fixed in nf-next so I can rebase ipvs-next
> > accordingly?
>
> No need to rebase, will push an incremental fix for this.
Thanks, understood.
^ permalink raw reply
* linux-next: manual merge of the tip tree with the pm tree
From: Stephen Rothwell @ 2016-04-19 2:59 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Rafael J. Wysocki
Cc: linux-next, linux-kernel, Borislav Petkov, Joe Perches
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/cpufreq/longhaul.c
between commit:
b49c22a6ca36 ("cpufreq: Convert printk(KERN_<LEVEL> to pr_<level>")
from the pm tree and commit:
93984fbd4e33 ("x86/cpufeature: Replace cpu_has_apic with boot_cpu_has() usage")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/cpufreq/longhaul.c
index beae5cf5c62c,247bfa8eaddb..000000000000
--- a/drivers/cpufreq/longhaul.c
+++ b/drivers/cpufreq/longhaul.c
@@@ -932,8 -945,9 +932,8 @@@ static int __init longhaul_init(void
}
#endif
#ifdef CONFIG_X86_IO_APIC
- if (cpu_has_apic) {
+ if (boot_cpu_has(X86_FEATURE_APIC)) {
- printk(KERN_ERR PFX "APIC detected. Longhaul is currently "
- "broken in this configuration.\n");
+ pr_err("APIC detected. Longhaul is currently broken in this configuration.\n");
return -ENODEV;
}
#endif
^ permalink raw reply
* Re: linux-next: manual merge of the livepatching tree with Linus' tree
From: Michael Ellerman @ 2016-04-19 1:57 UTC (permalink / raw)
To: Stephen Rothwell, Jiri Kosina
Cc: linux-next, linux-kernel, Li Zhang, Andrew Morton
In-Reply-To: <20160418142323.26fa9ae1@canb.auug.org.au>
On Mon, 2016-04-18 at 14:23 +1000, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the livepatching tree got a conflict in:
>
> arch/powerpc/Kconfig
>
> between commit:
>
> 7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")
>
> from Linus' tree and commit:
>
> 85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")
>
> from the livepatching 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.
>
> Maybe the selects under config PPC should be sorted ...
Hmm maybe. I guess it reduces the likelyhood of two new additions clashing
slightly.
cheers
^ permalink raw reply
* Re: linux-next: manual merge of the livepatching tree with the powerpc tree
From: Michael Ellerman @ 2016-04-19 1:56 UTC (permalink / raw)
To: Stephen Rothwell, Jiri Kosina, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Daniel Axtens
In-Reply-To: <20160418142749.3a5910c6@canb.auug.org.au>
On Mon, 2016-04-18 at 14:27 +1000, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the livepatching tree got a conflict in:
>
> arch/powerpc/kernel/process.c
>
> between commit:
>
> 7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols")
>
> from the powerpc tree and commit:
>
> 5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to struct thread_info")
>
> from the livepatching 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.
Thanks.
This should go away tomorrow because then my next will have the topic branch
merged.
cheers
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Jiri Olsa @ 2016-04-18 13:28 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Stephen Rothwell,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160418132402.GA3677@kernel.org>
On Mon, Apr 18, 2016 at 10:24:02AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Sun, Apr 17, 2016 at 03:04:05PM +0200, Jiri Olsa escreveu:
> > On Sun, Apr 17, 2016 at 02:12:07PM +0200, Jiri Olsa wrote:
> > > On Fri, Apr 15, 2016 at 06:28:31PM -0300, Arnaldo Carvalho de Melo wrote:
> > > > Em Fri, Apr 15, 2016 at 06:15:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> > > > > Em Thu, Apr 14, 2016 at 12:14:18PM +1000, Stephen Rothwell escreveu:
> > > > > > Hi all,
> > > > > >
> > > > > > After merging the tip tree, today's linux-next build (powerpc64le perf)
> > > > > > failed like this:
> > > > > >
> > > > > > make[3]: *** No rule to make target '/home/sfr/next/perf/arch/x86/include/generated/asm/syscalls_64.c', needed by '/home/sfr/next/perf/util/syscalltbl.o'. Stop.
> > > > > >
> > > > > > (I build in /home/sfr/next/next with objects in /home/sfr/next/perf.)
> > > > > >
> > > > > > Presumably caused by commit
> > > > > >
> > > > > > 1b700c997500 ("perf tools: Build syscall table .c header from kernel's syscall_64.tbl")
> > > > > >
> > > > > > I have reverted that commit for today (which fixes my build problem but
> > > > > > may not be overall correct).
> > > > >
> > > > > Right, I'm trying to figure out how to bet fix that, one way would be to
> > > > > do:
> > > >
> > > > Jiri, I think this is enough, i.e. I think we make sure, just like the
> > > > kernel, that the archheaders target in tools/perf/arch/*/Makefile is
> > > > called before doing all the other build, no?
> > > >
> > > > I.e. when we get to build syscalltbl.o the syscalls_64.c file will be
> > > > built already, limited testing seems to agree with this :-)
> > > >
> > > > - Arnaldo
> > > >
> > > > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> > > > > index 85a9ab62e23f..7fc4ac304ed6 100644
> > > > > --- a/tools/perf/util/Build
> > > > > +++ b/tools/perf/util/Build
> > > > > @@ -150,7 +150,7 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> > > > > CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> > > > > CFLAGS_parse-events.o += -Wno-redundant-decls
> > > > >
> > > > > -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> > > > > +$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c FORCE
> > >
> > > yep, having arch specific target in generic Build file is wrong
> > > I'll have ppc64le available later today, I'll check on that
> >
> > it looks ok, you can also now remove the whole syscalltbl.o override
>
> Ok, so I'll add this and your Tested-by, ok?
ook ;-)
jirka
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Arnaldo Carvalho de Melo @ 2016-04-18 13:24 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Stephen Rothwell,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160417130405.GD31336@krava.brq.redhat.com>
Em Sun, Apr 17, 2016 at 03:04:05PM +0200, Jiri Olsa escreveu:
> On Sun, Apr 17, 2016 at 02:12:07PM +0200, Jiri Olsa wrote:
> > On Fri, Apr 15, 2016 at 06:28:31PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Fri, Apr 15, 2016 at 06:15:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> > > > Em Thu, Apr 14, 2016 at 12:14:18PM +1000, Stephen Rothwell escreveu:
> > > > > Hi all,
> > > > >
> > > > > After merging the tip tree, today's linux-next build (powerpc64le perf)
> > > > > failed like this:
> > > > >
> > > > > make[3]: *** No rule to make target '/home/sfr/next/perf/arch/x86/include/generated/asm/syscalls_64.c', needed by '/home/sfr/next/perf/util/syscalltbl.o'. Stop.
> > > > >
> > > > > (I build in /home/sfr/next/next with objects in /home/sfr/next/perf.)
> > > > >
> > > > > Presumably caused by commit
> > > > >
> > > > > 1b700c997500 ("perf tools: Build syscall table .c header from kernel's syscall_64.tbl")
> > > > >
> > > > > I have reverted that commit for today (which fixes my build problem but
> > > > > may not be overall correct).
> > > >
> > > > Right, I'm trying to figure out how to bet fix that, one way would be to
> > > > do:
> > >
> > > Jiri, I think this is enough, i.e. I think we make sure, just like the
> > > kernel, that the archheaders target in tools/perf/arch/*/Makefile is
> > > called before doing all the other build, no?
> > >
> > > I.e. when we get to build syscalltbl.o the syscalls_64.c file will be
> > > built already, limited testing seems to agree with this :-)
> > >
> > > - Arnaldo
> > >
> > > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> > > > index 85a9ab62e23f..7fc4ac304ed6 100644
> > > > --- a/tools/perf/util/Build
> > > > +++ b/tools/perf/util/Build
> > > > @@ -150,7 +150,7 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> > > > CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> > > > CFLAGS_parse-events.o += -Wno-redundant-decls
> > > >
> > > > -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> > > > +$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c FORCE
> >
> > yep, having arch specific target in generic Build file is wrong
> > I'll have ppc64le available later today, I'll check on that
>
> it looks ok, you can also now remove the whole syscalltbl.o override
Ok, so I'll add this and your Tested-by, ok?
- Arnaldo
> and archheaders needs to be called before the build starts,
> which is the case right now
>
> thanks,
> jirka
>
>
> ---
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 85a9ab62e23f..90229a88f969 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -150,10 +150,6 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> CFLAGS_parse-events.o += -Wno-redundant-decls
>
> -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> - $(call rule_mkdir)
> - $(call if_changed_dep,cc_o_c)
> -
> $(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c FORCE
> $(call rule_mkdir)
> $(call if_changed_dep,cc_o_c)
^ permalink raw reply
* IMPORTANT MAIL TO YOU
From: verifelaw @ 2016-04-18 11:09 UTC (permalink / raw)
I am Capt. Lawrence Tyman, an officer in US Army,and also a West Point
Graduate, serving in the Military with the 82nd Air Borne Division
Peace keeping force deployed from Afganistan to Syria.
We were moved to Syria from Iraq as the last batch just left,and i
really need your help in assisting me with the safe keeping of 1 military
trunk box contain funds amount of $10.2M which i secured on a raiding we carried out in
January in one of the chief Syrian IsIs base which i headed the squard as the
Captain. With every possible arrangement to lift this box out, is intended to arrive
Belgium from there a diplomat will deliver it to your designated location
I hope you can be trusted? You will be rewarded handsomely if you could help
me secure the funds until I conclude my service here in 3 month to meet you while we can
plan head to head on a good and profitable business or company i can invest my funds in your country.
If you can be trusted and willing to support me in securing this safely kindly indicate
by Letting me know this (1) Your name (2) Your address (3) Age (4) Occupation and
i will explain further when i get a response from you
kindly contact me in this my private email address below: lawrencetyman@gmx.com
Regards,
Capt. Lawrence Tyman
^ permalink raw reply
* Re: linux-next: build warning after merge of the regulator tree
From: Mark Brown @ 2016-04-18 9:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel
In-Reply-To: <20160418134351.087823c5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
On Mon, Apr 18, 2016 at 01:43:51PM +1000, Stephen Rothwell wrote:
> In the future, please fix up all the current users of an interface
> *before* marking it deprecated. All these extra warnings just muddy the
> "real" warnings ...
Ideally but sadly all the issues are in the graphics stack and while
they seem relatively responsive to build issues there seems to be some
strange way of working there which means that getting changes integrated
or responses when issues like this come up has always been extremely
difficult and unfortunately cut'n'paste also seems to be quite common
(most of these look like they came from one place) so something to try
to at least give people pause for thought when they introduce new
issues seems sensible.
I really wish I could figure out what's going on there.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build warning after merge of the ipvs-next tree
From: Pablo Neira Ayuso @ 2016-04-18 9:09 UTC (permalink / raw)
To: Simon Horman; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20160415123811.GA16196@verge.net.au>
On Fri, Apr 15, 2016 at 10:38:14PM +1000, Simon Horman wrote:
> On Fri, Apr 15, 2016 at 11:56:07AM +0200, Pablo Neira Ayuso wrote:
> > On Fri, Apr 15, 2016 at 10:57:48AM +1000, Stephen Rothwell wrote:
> > > Hi Simon,
> > >
> > > After merging the ipvs-next tree, today's linux-next build (powerpc
> > > ppc64_defconfig) produced this warning:
> > >
> > > net/netfilter/nf_conntrack_netlink.c:529:15: warning: 'ctnetlink_proto_size' defined but not used [-Wunused-function]
> > > static size_t ctnetlink_proto_size(const struct nf_conn *ct)
> > > ^
> > > net/netfilter/nf_conntrack_netlink.c:546:15: warning: 'ctnetlink_acct_size' defined but not used [-Wunused-function]
> > > static size_t ctnetlink_acct_size(const struct nf_conn *ct)
> > > ^
> > > net/netfilter/nf_conntrack_netlink.c:556:12: warning: 'ctnetlink_secctx_size' defined but not used [-Wunused-function]
> > > static int ctnetlink_secctx_size(const struct nf_conn *ct)
> > > ^
> > > net/netfilter/nf_conntrack_netlink.c:572:15: warning: 'ctnetlink_timestamp_size' defined but not used [-Wunused-function]
> > > static size_t ctnetlink_timestamp_size(const struct nf_conn *ct)
> > > ^
> > > Introduced by commit
> > >
> > > 4054ff45454a ("netfilter: ctnetlink: remove unnecessary inlining")
> > >
> > > This build does not set CONFIG_NF_CONNTRACK_EVENTS or
> > > CONFIG_NETFILTER_NETLINK_GLUE_CT.
> >
> > This is my fault, will fix this asap. Thanks for reporting.
>
> Pablo,
>
> can you let me know when it is fixed in nf-next so I can rebase ipvs-next
> accordingly?
No need to rebase, will push an incremental fix for this.
^ permalink raw reply
* next-20160418 build: 1 failures 20 warnings (next-20160418)
From: Build bot for Mark Brown @ 2016-04-18 8:38 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160418
Git describe: next-20160418
Commit: 1bd7a2081d Add linux-next specific files for 20160418
Build Time: 87 min 10 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 20
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
2 warnings 0 mismatches : arm64-allnoconfig
11 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
4 warnings 0 mismatches : x86_64-defconfig
14 warnings 0 mismatches : arm-allmodconfig
6 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 20
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../net/netfilter/nf_conntrack_netlink.c:572:15: warning: 'ctnetlink_timestamp_size' defined but not used [-Wunused-function]
1 ../net/netfilter/nf_conntrack_netlink.c:556:12: warning: 'ctnetlink_secctx_size' defined but not used [-Wunused-function]
1 ../net/netfilter/nf_conntrack_netlink.c:546:15: warning: 'ctnetlink_acct_size' defined but not used [-Wunused-function]
1 ../net/netfilter/nf_conntrack_netlink.c:529:15: warning: 'ctnetlink_proto_size' defined but not used [-Wunused-function]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../kernel/trace/bpf_trace.c:372:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../kernel/trace/bpf_trace.c:354:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 11 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
../net/netfilter/nf_conntrack_netlink.c:529:15: warning: 'ctnetlink_proto_size' defined but not used [-Wunused-function]
../net/netfilter/nf_conntrack_netlink.c:546:15: warning: 'ctnetlink_acct_size' defined but not used [-Wunused-function]
../net/netfilter/nf_conntrack_netlink.c:556:12: warning: 'ctnetlink_secctx_size' defined but not used [-Wunused-function]
../net/netfilter/nf_conntrack_netlink.c:572:15: warning: 'ctnetlink_timestamp_size' defined but not used [-Wunused-function]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 14 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../kernel/trace/bpf_trace.c:354:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../kernel/trace/bpf_trace.c:372:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
^ permalink raw reply
* linux-next: Tree for Apr 18
From: Stephen Rothwell @ 2016-04-18 5:32 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160415:
The net-next tree gained conflicts against the net tree.
The tip tree still had its build failure for which I reverted a commit
and gained another for which I applied a build fix.
The gpio tree gained a build failure so I used the version from
next-20160415.
The livepatching tree gained conflicts against Linus' and the powerpc
trees.
The akpm-current tree still had its build failure for which I applied
a patch.
Non-merge commits (relative to Linus' tree): 4344
3992 files changed, 163277 insertions(+), 92002 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (9d090d01e3ef Merge tag 'dm-4.6-fix-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (d01ebf06e305 ARCv2: Enable LOCKDEP)
Merging arm-current/fixes (9c18fcf7ae0e ARM: 8551/2: DMA: Fix kzalloc flags in __dma_alloc)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (ab2ed0171a50 macsec: fix crypto Kconfig dependency)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (bcf493428840 netfilter: ebtables: Fix extension lookup with identical name)
Merging wireless-drivers/master (de478a61389c ath9k: ar5008_hw_cmn_spur_mitigate: add missing mask_m & mask_p initialisation)
Merging mac80211/master (8f815cdde3e5 nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (c44da62b55bb ALSA: hda - Fix inconsistent monitor_present state until repoll)
Merging pci-current/for-linus (67e658794ca1 cxgb4: Set VPD size so we can read both VPD structures)
Merging driver-core.current/driver-core-linus (dea5c24a1404 lib: lz4: cleanup unaligned access efficiency detection)
Merging tty.current/tty-linus (bf1620068911 Linux 4.6-rc3)
Merging usb.current/usb-linus (e86103a75705 usb: hcd: out of bounds access in for_each_companion)
Merging usb-gadget-fixes/fixes (bf1620068911 Linux 4.6-rc3)
Merging usb-serial-fixes/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (bf1620068911 Linux 4.6-rc3)
Merging char-misc.current/char-misc-linus (053f78d35995 Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus)
Merging input-current/for-linus (eda5ecc0a6b8 Input: pmic8xxx-pwrkey - fix algorithm for converting trigger delay)
Merging crypto-current/master (f709b45ec461 crypto: ccp - Prevent information leakage on export)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (42bf7b46a5de drm/i915: fix deadlock on lid open)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (e4863ecc1b9d ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (b8dafd7fde6c Merge branches 'fixes', 'kexec-for-next' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (7dde46570e4b ARM: SoC: Document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
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 (7a3cdfe98cc6 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig
Merging omap/for-next (edc590ce8a30 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (28c3334242a9 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (de76f48a7764 Merge branch 'heads/rcar-sysc-for-v4.7' into next)
Merging rockchip/for-next (670939f6a0eb Merge branch 'v4.7-armsoc/dts32' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (e51318a1aa52 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (bee573cd1dec Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (561662301eb6 arm64, mm, numa: Add NUMA balancing support for arm64.)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (d2a2bc721cef m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (3f315fa1f5d6 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (1ef27c516c24 parisc: Add ARCH_TRACEHOOK and regset support)
Merging powerpc/next (1050e689a63b cxl: Delete an unnecessary check before the function call "kfree")
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (c7d4d259b747 s390/crypto: cleanup and move the header with the cpacf definitions)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (90de6800c240 Merge tag 'sh-fixes-4.6-rc1' of git://git.libc.org/linux-sh)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (86cf0011caf3 ext4: allow readdir()'s of large empty directories to be interrupted)
Merging f2fs/dev (4da7bf5a4345 f2fs: remove redundant condition check)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (e97321fa095f GFS2: Don't dereference inode in gfs2_inode_lookup until it's valid)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (bf1620068911 Linux 4.6-rc3)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (96ee96e16f9f Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (cd5d37e83267 Merge branch 'i2c/for-4.7' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (5b3af0edd8db hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (c5cf484d03f1 Merge branch 'for-4.6-fixes' into for-next)
Merging pm/linux-next (171912fdeb21 Merge branch 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (39eac57e1b80 Merge branch 'topic/bcm' into next)
Merging net-next/master (ccd37cffe39d Merge branch 'dsa-mv88e6xxx-switch-factorization')
CONFLICT (content): Merge conflict in net/ipv4/udp.c
CONFLICT (content): Merge conflict in drivers/net/dsa/mv88e6xxx.c
Applying: Revert "soreuseport: fix ordering for mixed v4/v6 sockets"
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (5a504528f28f ipvs: don't alter conntrack in OPS mode)
Merging wireless-drivers-next/master (171a900c4eb7 rtl8xxxu: MAINTAINERS: Update to point to the active devel branch)
Merging bluetooth/master (edc73417d8f3 6lowpan: move mac802154 header)
Merging mac80211-next/master (81948527fce5 cfg80211: Add option to report the bss entry in connect result)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (a3fd27e69422 Merge branch 'mtd-nand-trigger' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds into nand/next)
Merging crypto/master (5f575efea79c crypto: lzo - get rid of superfluous __GFP_REPEAT)
Merging drm/drm-next (f9fd2adaacd8 Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next)
Merging drm-panel/drm/panel/for-next (1f697e426ebe drm/panel: simple: Add timings for the Olimex LCD-OLinuXino-4.3TS)
Merging drm-intel/for-linux-next (be19b10d24e3 drm/i915: Show pin mapped counts and sizes in debugfs)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (1652fce65f70 drm/dp/mst: Restore primary hub guid on resume)
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 (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (5883980313af drm/vc4: Fix NULL deref in HDMI init error path)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (4cdd8b9b9fc9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (3aa02cb664c5 ALSA: pcm : Call kill_fasync() in stream lock)
Merging sound-asoc/for-next (307f3cba8b6a Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (13771c666003 module: Issue warnings when tainting kernel)
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (06fde609f0bd Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (3ff6a535b994 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (c1c92cdb08c5 Merge branch 'fixes' into next)
Merging md/for-next (7dedd15dd252 md/raid0: fix uninitialized variable bug)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (c122edda19cf Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-spmi', 'regulator/topic/s2mps11', 'regulator/topic/sysfs-init' and 'regulator/topic/twl' into regulator-next)
Merging security/next (3c9d6296b7ae security: drop the unused hook skb_owned_by)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (0fd71a620be8 selinux: Change bool variable name to index.)
Merging tpmdd/next (0c61500a7f09 tpm/st33zp24: Remove unneeded tpm_reg in get_burstcount)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (78f3873decad Documentation: HOWTO: update git home URL in translations)
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (81232927a807 Merge remote-tracking branches 'spi/topic/pic32', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (0db6774ba37d Merge branch 'x86/cleanups')
Applying: Revert "perf tools: Build syscall table .c header from kernel's syscall_64.tbl"
Applying: perf: trace: fix build when HAVE_DWARF_UNWIND_SUPPORT is not set
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (4530d62e04e3 documentation: State purpose of memory-barriers.txt)
Merging kvm/linux-next (316314cae15f KVM: x86: mask CPUID(0xD,0x1).EAX against host value)
Merging kvm-arm/next (06a71a24bae5 arm64: KVM: unregister notifiers in hyp mode teardown path)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (4f62568c1fcf fujitsu-laptop: Support radio LED)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (4a91c45ea57c leds: tca6507: silence an uninitialized variable warning)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (522566376a3f devcoredump: add scatterlist support)
Merging tty/tty-next (bf1620068911 Linux 4.6-rc3)
Merging usb/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-gadget/next (7a0debee7db3 usb: dwc3: omap: get rid of dma_status)
Merging usb-serial/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-next/ci-for-usb-next (4e332df63487 usb: otg-fsm: support multiple instances)
Merging staging/staging-next (4145ba76b1f7 staging: unisys: visornic: prevent double-unlock of priv_lock)
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (af59836135bf extcon: usb-gpio: Don't miss event during suspend/resume)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (0237d1ea51f0 pm80xx: Remove bogus address masking in pm8001_ioremap())
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (1d4cd60a13be Merge branch 'devel' into for-next)
$ git reset --hard HEAD^
Merging next-20160415 version of gpio
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (5eda83ab215e clk: ti: dra7-atl-clock: Fix of_node reference counting)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (4fe83e63352a Merge branch 'for-4.7/livepatching-ppc64' into for-next)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/process.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Merging coresight/next (27268ed3d169 coresight: etm4x: modify q_support type)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (45f78c9a6c54 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* linux-next: manual merge of the livepatching tree with the powerpc tree
From: Stephen Rothwell @ 2016-04-18 4:27 UTC (permalink / raw)
To: Jiri Kosina, Michael Ellerman, Benjamin Herrenschmidt,
linuxppc-dev
Cc: linux-next, linux-kernel, Daniel Axtens
Hi Jiri,
Today's linux-next merge of the livepatching tree got a conflict in:
arch/powerpc/kernel/process.c
between commit:
7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols")
from the powerpc tree and commit:
5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to struct thread_info")
from the livepatching 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/kernel/process.c
index 4695088e7dd2,a290ee374aa0..000000000000
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@@ -56,7 -55,8 +56,9 @@@
#include <asm/firmware.h>
#endif
#include <asm/code-patching.h>
+#include <asm/exec.h>
+ #include <asm/livepatch.h>
+
#include <linux/kprobes.h>
#include <linux/kdebug.h>
^ permalink raw reply
* linux-next: manual merge of the livepatching tree with Linus' tree
From: Stephen Rothwell @ 2016-04-18 4:23 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Michael Ellerman, Li Zhang,
Andrew Morton
Hi Jiri,
Today's linux-next merge of the livepatching tree got a conflict in:
arch/powerpc/Kconfig
between commit:
7f2bd0063342 ("powerpc/mm: enable page parallel initialisation")
from Linus' tree and commit:
85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le")
from the livepatching 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.
Maybe the selects under config PPC should be sorted ...
--
Cheers,
Stephen Rothwell
diff --cc arch/powerpc/Kconfig
index fbebde0771c8,944a79a2768f..000000000000
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -159,7 -159,7 +159,8 @@@ config PP
select ARCH_HAS_DEVMEM_IS_ALLOWED
select HAVE_ARCH_SECCOMP_FILTER
select ARCH_HAS_UBSAN_SANITIZE_ALL
+ select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT
+ select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS
config GENERIC_CSUM
def_bool CPU_LITTLE_ENDIAN
^ permalink raw reply
* linux-next: build failure after merge of the gpio tree
From: Stephen Rothwell @ 2016-04-18 4:10 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-next, linux-kernel
Hi Linus,
After merging the gpio tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpio/gpio-f7188x.c: In function 'f7188x_gpio_set_single_ended':
drivers/gpio/gpio-f7188x.c:331:26: error: implicit declaration of function 'gpio_data_mode' [-Werror=implicit-function-declaration]
superio_outb(sio->addr, gpio_data_mode(bank->regbase), data);
^
Caused by commit
f90c6bdb690b ("gpio: f7188x: use the new open drain callback")
I have used the gpio tree from next-20160415 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning after merge of the regulator tree
From: Stephen Rothwell @ 2016-04-18 3:43 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel
Hi all,
After merging the regulator tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:
drivers/gpu/drm/msm/dsi/dsi_host.c: In function 'dsi_regulator_init':
drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
if (regulator_can_change_voltage(s[i].consumer)) {
^
and several more ...
Introduced by commit
6a0028b3dd67 ("regulator: Deprecate regulator_can_change_voltage()")
In the future, please fix up all the current users of an interface
*before* marking it deprecated. All these extra warnings just muddy the
"real" warnings ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2016-04-18 3:03 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Arnaldo Carvalho de Melo
Hi all,
After merging the tip tree, today's linux-next build (powerpc64le perf)
failed like this:
builtin-trace.c: In function 'cmd_trace':
builtin-trace.c:3112:7: error: variable 'max_stack_user_set' set but not used [-Werror=unused-but-set-variable]
bool max_stack_user_set = true;
^
Caused by commit
056149932602 ("perf trace: Make --(min,max}-stack imply "--call-graph dwarf"")
I added the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Apr 2016 12:56:48 +1000
Subject: [PATCH] perf: trace: fix build when HAVE_DWARF_UNWIND_SUPPORT is not set
Fixes: 056149932602 ("perf trace: Make --(min,max}-stack imply "--call-graph dwarf"")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
tools/perf/builtin-trace.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 026ec0c749b0..48dc23a4f405 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3109,7 +3109,9 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
"per thread proc mmap processing timeout in ms"),
OPT_END()
};
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
bool max_stack_user_set = true;
+#endif
bool mmap_pages_user_set = true;
const char * const trace_subcommands[] = { "record", NULL };
int err;
@@ -3149,7 +3151,9 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
if (trace.max_stack == UINT_MAX) {
trace.max_stack = PERF_MAX_STACK_DEPTH;
+#ifdef HAVE_DWARF_UNWIND_SUPPORT
max_stack_user_set = false;
+#endif
}
#ifdef HAVE_DWARF_UNWIND_SUPPORT
--
2.7.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: binary execution from DAX mount hang since next-20160407
From: Xiong Zhou @ 2016-04-18 2:50 UTC (permalink / raw)
To: Hugh Dickins
Cc: Linux-Next, linux-nvdimm, linux-kernel@vger.kernel.org,
Linux-Fsdevel, linux-mm
In-Reply-To: <alpine.LSU.2.11.1604150104350.5801@eggly.anvils>
On Fri, Apr 15, 2016 at 4:38 PM, Hugh Dickins <hughd@google.com> wrote:
> On Fri, 15 Apr 2016, Xiong Zhou wrote:
>
>> Hi, all
>>
>> Since tag next-20160407 in linux-next repo, executing binary
>> from/in DAX mount hangs.
>>
>> It does not hang if mount without dax option.
>> It hangs with both xfs and ext4.
>> It does not hang if execute from a -t tmpfs mount.
>> It does not hang on next-20160406 and still hangs on 0414 tree.
>>
>> # ps -axjf
>> ...
>> S+ 0 0:00 | \_ sh -x thl.sh
>> R+ 0 42:33 | \_ [hl]
>> ..
>> # cat thl.sh
>> mkfs.ext4 /dev/pmem0
>> mount -o dax /dev/pmem0 /daxmnt
>> cp hl /daxmnt
>> /daxmnt/hl
>> # cat hl.c
>> void main()
>> {
>> printf("ok\n");
>> }
>> # cc hl.c -o hl
>>
>> Bisecting commits between 0406 and 0407 tag, points to this:
>>
>> d7c7d56ca61aec18e5e0cb3a64e50073c42195f7 is the first bad commit
>> commit d7c7d56ca61aec18e5e0cb3a64e50073c42195f7
>> Author: Hugh Dickins <hughd@google.com>
>> Date: Thu Apr 7 14:00:12 2016 +1000
>>
>> huge tmpfs: avoid premature exposure of new pagetable
>>
>> Bisect log and config are attatched.
>
> Excellent and very helpful bug report: thank you very much for taking
> the trouble to make such a good report.
>
> I see why this happens now: I've not been paying enough attention
> to the DAX changes.
>
> The fix requires a repositioning of where I allocate the new page
> table: which is a change we knew we had to make for other reasons,
> but it did not appear to be a high priority compared with other things
> - until your bug report showing that I have broken DAX rather badly.
>
> In return for your excellent bug report, I can immediately offer
> the most shameful patch I have ever posted: which has the virtue of
> simplicity, and will work so long as you have plenty of free memory;
> but might deadlock if it has to go into page reclaim (or maybe not:
> perhaps the DAXness would leave it as merely a lockdep violation).
>
> Maybe not so much worse than the current hang, but still shameful:
> I'm appending it here just in case you're in a hurry to see your "ok"
> program working on DAX; but I think I'd better rearrange priorities
> and try to provide a proper fix as soon as possible.
No hurry, :) Take your time.
>
> Never-to-be-Signed-off-by: an anonymous hacker
>
> --- 4.6-rc2-mm1/mm/memory.c 2016-04-10 10:12:06.167769232 -0700
> +++ linux/mm/memory.c 2016-04-15 00:54:06.427085026 -0700
> @@ -2874,7 +2874,7 @@ static int __do_fault(struct vm_area_str
> ret = VM_FAULT_HWPOISON;
> goto err;
> }
> -
> + out:
> /*
> * Use pte_alloc instead of pte_alloc_map, because we can't
> * run pte_offset_map on the pmd, if an huge pmd could
> @@ -2892,7 +2892,7 @@ static int __do_fault(struct vm_area_str
> ret = VM_FAULT_NOPAGE;
> goto err;
> }
> - out:
> +
> *page = vmf.page;
> return ret;
> err:
Yes, "ok" is printed ok!
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* Re: linux-next: manual merge of the net-next tree with the net tree
From: Eric Dumazet @ 2016-04-18 1:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Craig Gallek,
Eric Dumazet
In-Reply-To: <20160418113116.6f7f8740@canb.auug.org.au>
On Mon, 2016-04-18 at 11:31 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/ipv4/udp.c
>
> between commit:
>
> d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets")
>
> from the net tree and commit:
>
> ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
>
> from the net-next tree.
>
> I tried to fixed it up (see below). Unfortunately,
> hlist_add_tail_rcu() does not exist. So instead I have reverted commit
> d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") for
> today.
Hi Stephen
Craig warned that this would happen indeed, and provided a net-next
patch, to help David with this conflict.
https://patchwork.ozlabs.org/patch/611093/
Thanks
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-04-18 1:31 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Craig Gallek, Eric Dumazet
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/udp.c
between commit:
d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets")
from the net tree and commit:
ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU")
from the net-next tree.
I tried to fixed it up (see below). Unfortunately,
hlist_add_tail_rcu() does not exist. So instead I have reverted commit
d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") for
today.
--
Cheers,
Stephen Rothwell
diff --cc net/ipv4/udp.c
index a2e7f55a1f61,f1863136d3e4..000000000000
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@@ -339,13 -336,8 +336,13 @@@ found
hslot2 = udp_hashslot2(udptable, udp_sk(sk)->udp_portaddr_hash);
spin_lock(&hslot2->lock);
- hlist_add_head_rcu(&udp_sk(sk)->udp_portaddr_node,
- &hslot2->head);
+ if (IS_ENABLED(CONFIG_IPV6) && sk->sk_reuseport &&
+ sk->sk_family == AF_INET6)
- hlist_nulls_add_tail_rcu(&udp_sk(sk)->udp_portaddr_node,
- &hslot2->head);
++ hlist_add_tail_rcu(&udp_sk(sk)->udp_portaddr_node,
++ &hslot2->head);
+ else
- hlist_nulls_add_head_rcu(&udp_sk(sk)->udp_portaddr_node,
- &hslot2->head);
++ hlist_add_head_rcu(&udp_sk(sk)->udp_portaddr_node,
++ &hslot2->head);
hslot2->count++;
spin_unlock(&hslot2->lock);
}
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2016-04-18 1:30 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Vivien Didelot
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/dsa/mv88e6xxx.c
between commit:
207afda1b503 ("net: dsa: mv88e6xxx: share the same default FDB")
from the net tree and commit:
009a2b9843bf ("net: dsa: mv88e6xxx: add number of ports to info")
from the net-next tree.
I fixed it up (the former removed some of the code updated by the latter)
and can carry the fix as necessary. This is now fixed as far as linux-next
is concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Jiri Olsa @ 2016-04-17 13:04 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Stephen Rothwell,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160417121207.GC31336@krava.brq.redhat.com>
On Sun, Apr 17, 2016 at 02:12:07PM +0200, Jiri Olsa wrote:
> On Fri, Apr 15, 2016 at 06:28:31PM -0300, Arnaldo Carvalho de Melo wrote:
> > Em Fri, Apr 15, 2016 at 06:15:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> > > Em Thu, Apr 14, 2016 at 12:14:18PM +1000, Stephen Rothwell escreveu:
> > > > Hi all,
> > > >
> > > > After merging the tip tree, today's linux-next build (powerpc64le perf)
> > > > failed like this:
> > > >
> > > > make[3]: *** No rule to make target '/home/sfr/next/perf/arch/x86/include/generated/asm/syscalls_64.c', needed by '/home/sfr/next/perf/util/syscalltbl.o'. Stop.
> > > >
> > > > (I build in /home/sfr/next/next with objects in /home/sfr/next/perf.)
> > > >
> > > > Presumably caused by commit
> > > >
> > > > 1b700c997500 ("perf tools: Build syscall table .c header from kernel's syscall_64.tbl")
> > > >
> > > > I have reverted that commit for today (which fixes my build problem but
> > > > may not be overall correct).
> > >
> > > Right, I'm trying to figure out how to bet fix that, one way would be to
> > > do:
> >
> > Jiri, I think this is enough, i.e. I think we make sure, just like the
> > kernel, that the archheaders target in tools/perf/arch/*/Makefile is
> > called before doing all the other build, no?
> >
> > I.e. when we get to build syscalltbl.o the syscalls_64.c file will be
> > built already, limited testing seems to agree with this :-)
> >
> > - Arnaldo
> >
> > > diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> > > index 85a9ab62e23f..7fc4ac304ed6 100644
> > > --- a/tools/perf/util/Build
> > > +++ b/tools/perf/util/Build
> > > @@ -150,7 +150,7 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> > > CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> > > CFLAGS_parse-events.o += -Wno-redundant-decls
> > >
> > > -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> > > +$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c FORCE
>
> yep, having arch specific target in generic Build file is wrong
> I'll have ppc64le available later today, I'll check on that
it looks ok, you can also now remove the whole syscalltbl.o override
and archheaders needs to be called before the build starts,
which is the case right now
thanks,
jirka
---
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 85a9ab62e23f..90229a88f969 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -150,10 +150,6 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
CFLAGS_parse-events.o += -Wno-redundant-decls
-$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
- $(call rule_mkdir)
- $(call if_changed_dep,cc_o_c)
-
$(OUTPUT)util/kallsyms.o: ../lib/symbol/kallsyms.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
^ permalink raw reply related
* Re: linux-next: build failure after merge of the tip tree
From: Jiri Olsa @ 2016-04-17 12:12 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Stephen Rothwell,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel
In-Reply-To: <20160415212831.GT9056@kernel.org>
On Fri, Apr 15, 2016 at 06:28:31PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, Apr 15, 2016 at 06:15:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Thu, Apr 14, 2016 at 12:14:18PM +1000, Stephen Rothwell escreveu:
> > > Hi all,
> > >
> > > After merging the tip tree, today's linux-next build (powerpc64le perf)
> > > failed like this:
> > >
> > > make[3]: *** No rule to make target '/home/sfr/next/perf/arch/x86/include/generated/asm/syscalls_64.c', needed by '/home/sfr/next/perf/util/syscalltbl.o'. Stop.
> > >
> > > (I build in /home/sfr/next/next with objects in /home/sfr/next/perf.)
> > >
> > > Presumably caused by commit
> > >
> > > 1b700c997500 ("perf tools: Build syscall table .c header from kernel's syscall_64.tbl")
> > >
> > > I have reverted that commit for today (which fixes my build problem but
> > > may not be overall correct).
> >
> > Right, I'm trying to figure out how to bet fix that, one way would be to
> > do:
>
> Jiri, I think this is enough, i.e. I think we make sure, just like the
> kernel, that the archheaders target in tools/perf/arch/*/Makefile is
> called before doing all the other build, no?
>
> I.e. when we get to build syscalltbl.o the syscalls_64.c file will be
> built already, limited testing seems to agree with this :-)
>
> - Arnaldo
>
> > diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> > index 85a9ab62e23f..7fc4ac304ed6 100644
> > --- a/tools/perf/util/Build
> > +++ b/tools/perf/util/Build
> > @@ -150,7 +150,7 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> > CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> > CFLAGS_parse-events.o += -Wno-redundant-decls
> >
> > -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> > +$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c FORCE
yep, having arch specific target in generic Build file is wrong
I'll have ppc64le available later today, I'll check on that
jirka
^ permalink raw reply
* Re: linux-next: build failure after merge of the net-next tree
From: Arnd Bergmann @ 2016-04-17 9:47 UTC (permalink / raw)
To: kernel-build-reports
Cc: David Miller, sfr, andrewx.bowers, linaro-kernel, netdev,
linux-kernel, linux-next, jeffrey.t.kirsher, mark.d.rustad
In-Reply-To: <20160413.111513.295841881765244758.davem@davemloft.net>
On Wednesday 13 April 2016 11:15:13 David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 13 Apr 2016 17:50:28 +1000
>
> > After merging the net-next tree, today's linux-next build (arm
> > allmodconfig) failed like thisi (this has actually been failing for a
> > few days, now):
> >
> > ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
> >
> > Caused by commit
> >
> > 49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
> >
> > arm only allows udelay()s up to 2 milliseconds. This commit
> > adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
> > drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
>
> Jeff, please have your folks look into this. Probably just a simple
> conversion to mdelay().
>
I sent a patch, pretty sure we can use msleep() here rather than
a wasteful mdelay().
Arnd
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Arnaldo Carvalho de Melo @ 2016-04-15 21:28 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Jiri Olsa, Stephen Rothwell, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin, Peter Zijlstra, linux-next, linux-kernel
In-Reply-To: <20160415211542.GF2439@redhat.com>
Em Fri, Apr 15, 2016 at 06:15:42PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Thu, Apr 14, 2016 at 12:14:18PM +1000, Stephen Rothwell escreveu:
> > Hi all,
> >
> > After merging the tip tree, today's linux-next build (powerpc64le perf)
> > failed like this:
> >
> > make[3]: *** No rule to make target '/home/sfr/next/perf/arch/x86/include/generated/asm/syscalls_64.c', needed by '/home/sfr/next/perf/util/syscalltbl.o'. Stop.
> >
> > (I build in /home/sfr/next/next with objects in /home/sfr/next/perf.)
> >
> > Presumably caused by commit
> >
> > 1b700c997500 ("perf tools: Build syscall table .c header from kernel's syscall_64.tbl")
> >
> > I have reverted that commit for today (which fixes my build problem but
> > may not be overall correct).
>
> Right, I'm trying to figure out how to bet fix that, one way would be to
> do:
Jiri, I think this is enough, i.e. I think we make sure, just like the
kernel, that the archheaders target in tools/perf/arch/*/Makefile is
called before doing all the other build, no?
I.e. when we get to build syscalltbl.o the syscalls_64.c file will be
built already, limited testing seems to agree with this :-)
- Arnaldo
> diff --git a/tools/perf/util/Build b/tools/perf/util/Build
> index 85a9ab62e23f..7fc4ac304ed6 100644
> --- a/tools/perf/util/Build
> +++ b/tools/perf/util/Build
> @@ -150,7 +150,7 @@ CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ET
> CFLAGS_hweight.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
> CFLAGS_parse-events.o += -Wno-redundant-decls
>
> -$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c arch/x86/entry/syscalls/syscall_64.tbl $(OUTPUT)arch/x86/include/generated/asm/syscalls_64.c FORCE
> +$(OUTPUT)util/syscalltbl.o: util/syscalltbl.c FORCE
> $(call rule_mkdir)
> $(call if_changed_dep,cc_o_c)
>
>
> --------------------------------------------
>
> Now trying to figure out how to, just for x86 to add a dep for those
> files, but a arch specific thing shouldn't be in tools/perf/util/Build
> anyway...
>
> In the end I want this syscalltbl.c thing to know about all arches,
> to remove the dependency on audit-libs as the way to map syscall ID to
> name and vice-versa.
>
> So I'll need all arches to generate that
> arch/$(ARCH)/include/generated/asm/syscalls_64.c file, etc. Doing that
> by copying from the kernel the files where such info is kept and having
> a diff check as part of the perf build process, so that we can get
> notified when it drifts while not tying tools/perf/ to anything outside
> that can end up breaking the tools/ build when changes happen outside.
>
> - Arnaldo
^ 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