* Re: linux-next: error fetching the y2038 tree
From: Arnd Bergmann @ 2016-07-22 19:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20160722100159.72aa6476@canb.auug.org.au>
On Friday, July 22, 2016 10:01:59 AM CEST Stephen Rothwell wrote:
> Hi Arnd,
>
> Fetching the y2038
> (git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038)
> this morning produces this error:
>
> fatal: Couldn't find remote ref refs/heads/y2038
>
> I am still using the last version of this tree I fetched which contains:
>
> 4b277763c5b3 vfs: Add support to document max and min inode times
> 0b38aceef3f3 vfs: Add vfs_time accessors
> df5999b78b01 fs: Add current_fs_time_sec() function
> 549eb7b22e24 AFS: Correctly use 64-bit time for UUID
Hi Stephen,
my mistake, I wanted to remove the contents since Deepa has done
a replacement series that obsolete three of the four patches
(Linus didn't take the branch last time).
I'll push a mainline commit to the branch instead, to make the
contents disappear from -next.
Thanks for letting me know about the problem.
Arnd
^ permalink raw reply
* [PATCH resend v3 3/5] libata-scsi: use u8 array to store mode page copy
From: tom.ty89 @ 2016-07-22 18:34 UTC (permalink / raw)
To: tj, hare, sergei.shtylyov, arnd
Cc: sfr, linux-ide, linux-scsi, linux-kernel, linux-next, Tom Yan
In-Reply-To: <CAGnHSEmTC06_NKrBDVyFkLSqx4qDRy+OhXvpcySk6HHYLSRsuw@mail.gmail.com>
From: Tom Yan <tom.ty89@gmail.com>
ata_mselect_*() would initialize a char array for storing a copy of
the current mode page. However, char could be signed char. In that
case, bytes larger than 127 would be converted to negative number.
For example, 0xff from def_control_mpage[] would become -1. This
prevented ata_mselect_control() from working at all, since when it
did the read-only bits check, there would always be a mismatch.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 4a4e6f1..5cfcb4b 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3610,7 +3610,7 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
{
struct ata_taskfile *tf = &qc->tf;
struct ata_device *dev = qc->dev;
- char mpage[CACHE_MPAGE_LEN];
+ u8 mpage[CACHE_MPAGE_LEN];
u8 wce, mask;
int i;
@@ -3668,7 +3668,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc,
const u8 *buf, int len, u16 *fp)
{
struct ata_device *dev = qc->dev;
- char mpage[CONTROL_MPAGE_LEN];
+ u8 mpage[CONTROL_MPAGE_LEN];
u8 d_sense, mask;
int i;
--
2.9.0
^ permalink raw reply related
* Re: [PATCH resend v2 3/5] libata-scsi: use u8 array to store mode page copy
From: Tom Yan @ 2016-07-22 18:22 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Tejun Heo, Hannes Reinecke, Arnd Bergmann, Stephen Rothwell,
linux-ide, linux-scsi, linux-kernel, linux-next
In-Reply-To: <65ee2deb-200c-a467-1eb8-ed2eb5f14a70@cogentembedded.com>
Strange. I merely changed the two "char" to "u8". I wonder how the tab
became spaces. Anyway, sorry about that, resending soon.
On 22 July 2016 at 17:59, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 7/22/2016 2:29 AM, tom.ty89@gmail.com wrote:
>
>> From: Tom Yan <tom.ty89@gmail.com>
>>
>> ata_mselect_*() would initialize a char array for storing a copy of
>> the current mode page. However, char could be signed char. In that
>> case, bytes larger than 127 would be converted to negative number.
>>
>> For example, 0xff from def_control_mpage[] would become -1. This
>> prevented ata_mselect_control() from working at all, since when it
>> did the read-only bits check, there would always be a mismatch.
>>
>> Signed-off-by: Tom Yan <tom.ty89@gmail.com>
>>
>> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
>> index 4a4e6f1..a28e2ea94 100644
>> --- a/drivers/ata/libata-scsi.c
>> +++ b/drivers/ata/libata-scsi.c
>> @@ -3610,7 +3610,7 @@ static int ata_mselect_caching(struct ata_queued_cmd
>> *qc,
>> {
>> struct ata_taskfile *tf = &qc->tf;
>> struct ata_device *dev = qc->dev;
>> - char mpage[CACHE_MPAGE_LEN];
>> + u8 mpage[CACHE_MPAGE_LEN];
>> u8 wce, mask;
>> int i;
>>
>> @@ -3668,7 +3668,7 @@ static int ata_mselect_control(struct ata_queued_cmd
>> *qc,
>> const u8 *buf, int len, u16 *fp)
>> {
>> struct ata_device *dev = qc->dev;
>> - char mpage[CONTROL_MPAGE_LEN];
>> + u8 mpage[CONTROL_MPAGE_LEN];
>
>
> Indent with tabs please, as above.
>
> [...]
>
> MBR, Sergei
>
^ permalink raw reply
* Re: [PATCH -next] pinctrl: fix build, PINCTRL_CYGNUS_MUX depends on OF
From: Randy Dunlap @ 2016-07-22 18:17 UTC (permalink / raw)
To: Ray Jui, linux-next@vger.kernel.org
Cc: Ray Jui, bcm-kernel-feedback-list, linux-arm-kernel,
Linus Walleij, linux-gpio, LKML
In-Reply-To: <e8bd2919-53f1-6fe9-0188-c52d44fdc54b@broadcom.com>
On 07/22/16 11:09, Ray Jui wrote:
> Hi Randy,
>
> On 7/22/2016 11:06 AM, Randy Dunlap wrote:
>> From: Randy Dunlap <rdunlap@infradead.org>
>>
>> Fix pinctrl-cygnus-mux.c build when ARCH_BCM_CYGNUS is not enabled
>> but COMPILE_TEST is enabled by making the driver depend on OF.
>>
>> ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error: 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a function)
>> .dt_node_to_map = pinconf_generic_dt_node_to_map_group,
>>
>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>> Cc: Ray Jui <rjui@broadcom.com>
>> Cc: bcm-kernel-feedback-list@broadcom.com
>> Cc: linux-arm-kernel@lists.infradead.org
>> Cc: Linus Walleij <linus.walleij@linaro.org>
>> Cc: linux-gpio@vger.kernel.org
>> ---
>> drivers/pinctrl/bcm/Kconfig | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> --- linux-next-20160722.orig/drivers/pinctrl/bcm/Kconfig
>> +++ linux-next-20160722/drivers/pinctrl/bcm/Kconfig
>> @@ -60,6 +60,7 @@ config PINCTRL_IPROC_GPIO
>> config PINCTRL_CYGNUS_MUX
>> bool "Broadcom Cygnus IOMUX driver"
>> depends on (ARCH_BCM_CYGNUS || COMPILE_TEST)
>> + depends on OF
>> select PINMUX
>> select GENERIC_PINCONF
>> default ARCH_BCM_CYGNUS
>>
>
> Thanks, but a fix was already submitted by Arnd and picked up by Linus: https://lkml.org/lkml/2016/7/15/649
OK, it's just not in linux-next yet.
Thanks.
--
~Randy
^ permalink raw reply
* Re: [PATCH -next] pinctrl: fix build, PINCTRL_CYGNUS_MUX depends on OF
From: Ray Jui @ 2016-07-22 18:09 UTC (permalink / raw)
To: Randy Dunlap, linux-next@vger.kernel.org
Cc: Ray Jui, bcm-kernel-feedback-list, linux-arm-kernel,
Linus Walleij, linux-gpio, LKML
In-Reply-To: <fbda11e7-273c-c91a-777d-5eaa61c86b82@infradead.org>
Hi Randy,
On 7/22/2016 11:06 AM, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix pinctrl-cygnus-mux.c build when ARCH_BCM_CYGNUS is not enabled
> but COMPILE_TEST is enabled by making the driver depend on OF.
>
> ../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error: 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a function)
> .dt_node_to_map = pinconf_generic_dt_node_to_map_group,
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Ray Jui <rjui@broadcom.com>
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Linus Walleij <linus.walleij@linaro.org>
> Cc: linux-gpio@vger.kernel.org
> ---
> drivers/pinctrl/bcm/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20160722.orig/drivers/pinctrl/bcm/Kconfig
> +++ linux-next-20160722/drivers/pinctrl/bcm/Kconfig
> @@ -60,6 +60,7 @@ config PINCTRL_IPROC_GPIO
> config PINCTRL_CYGNUS_MUX
> bool "Broadcom Cygnus IOMUX driver"
> depends on (ARCH_BCM_CYGNUS || COMPILE_TEST)
> + depends on OF
> select PINMUX
> select GENERIC_PINCONF
> default ARCH_BCM_CYGNUS
>
Thanks, but a fix was already submitted by Arnd and picked up by Linus:
https://lkml.org/lkml/2016/7/15/649
Ray
^ permalink raw reply
* [PATCH -next] pinctrl: fix build, PINCTRL_CYGNUS_MUX depends on OF
From: Randy Dunlap @ 2016-07-22 18:06 UTC (permalink / raw)
To: linux-next@vger.kernel.org
Cc: Ray Jui, bcm-kernel-feedback-list, linux-arm-kernel,
Linus Walleij, linux-gpio, LKML
From: Randy Dunlap <rdunlap@infradead.org>
Fix pinctrl-cygnus-mux.c build when ARCH_BCM_CYGNUS is not enabled
but COMPILE_TEST is enabled by making the driver depend on OF.
../drivers/pinctrl/bcm/pinctrl-cygnus-mux.c:739:20: error: 'pinconf_generic_dt_node_to_map_group' undeclared here (not in a function)
.dt_node_to_map = pinconf_generic_dt_node_to_map_group,
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Ray Jui <rjui@broadcom.com>
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org
---
drivers/pinctrl/bcm/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20160722.orig/drivers/pinctrl/bcm/Kconfig
+++ linux-next-20160722/drivers/pinctrl/bcm/Kconfig
@@ -60,6 +60,7 @@ config PINCTRL_IPROC_GPIO
config PINCTRL_CYGNUS_MUX
bool "Broadcom Cygnus IOMUX driver"
depends on (ARCH_BCM_CYGNUS || COMPILE_TEST)
+ depends on OF
select PINMUX
select GENERIC_PINCONF
default ARCH_BCM_CYGNUS
^ permalink raw reply
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Arnaldo Carvalho de Melo @ 2016-07-22 14:37 UTC (permalink / raw)
To: Josh Poimboeuf
Cc: Stephen Rothwell, Andy Lutomirski, Arnaldo Carvalho de Melo,
Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <20160722034118.guckaniobf3f7czc@treble>
Em Thu, Jul 21, 2016 at 10:41:18PM -0500, Josh Poimboeuf escreveu:
> On Fri, Jul 22, 2016 at 09:23:02AM +1000, Stephen Rothwell wrote:
> > It just looks like objtool was not written with cross compilation in
> > mind?
> I don't know yet what the specific problem is, but objtool should work
> fine in a cross-compiled environment. It needs to be compiled with the
> host (powerpc) compiler, but then it needs to disassemble target (x86)
> files. It worked fine before the bitsperlong.h files were merged.
So, trying to summarize from the various messages in this thread:
In Tue, Jul 19, 2016 at 01:26:08PM +1000, Stephen Rothwell wrote:
> It produces these errors (from the x86_64 allmodconfig build):
>
> In file included from
> /home/sfr/next/next/tools/arch/x86/include/uapi/asm/bitsperlong.h:10:0,
> from /usr/include/asm-generic/int-ll64.h:11,
> from /usr/include/powerpc64le-linux-gnu/asm/types.h:27,
> from /home/sfr/next/next/tools/include/linux/types.h:9,
> from /home/sfr/next/next/tools/include/linux/list.h:4,
> from elf.h:23,
> from elf.c:30:
> /home/sfr/next/next/tools/include/asm-generic/bitsperlong.h:13:2:
> error: #error Inconsistent word size. Check asm/bitsperlong.h
> #error Inconsistent word size. Check asm/bitsperlong.h
> ^
So it starts at tools/arch/x86/include/uapi/asm/bitsperlong.h, and as
you mention, this should've instead be using the host headers, i.e.:
tools/arch/powerpc/include/uapi/asm/bitsperlong.h
Which it will if it uses HOSTARCH in tools/objtool/Makefile when setting
up the header search path, I have two csets in my perf/core branch that
fixes this, and that are equivalent to the last patch Stephen tried:
$ git log --oneline -2
87f7dc54366a objtool: Use tools/scripts/Makefile.arch to get ARCH and HOSTARCH
0eec6770ab60 tools build: Add HOSTARCH Makefile variable
$
Ok, so now it uses the right file, see the whole sequence at the end of this
e-mail, but it boils down to:
-----------------------------------------------------------------------------
#if defined(__powerpc64__)
# define __BITS_PER_LONG 64
#else
# define __BITS_PER_LONG 32
#endif
#ifdef __SIZEOF_LONG__
#define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)
#else
#define BITS_PER_LONG __WORDSIZE
#endif
#if BITS_PER_LONG != __BITS_PER_LONG
#error Inconsistent word size. Check asm/bitsperlong.h
#endif
-----------------------------------------------------------------------------
Which I think has no problems, right? The last problem reported ty Stephen now is:
In Fri, 22 Jul 2016 09:23:02 +1000, Stephen Rothwell wrote:
> That gets me this errors from the x86_64 allmodconfig build:
> tools/objtool/objtool-in.o: In function `decode_instructions':
> tools/objtool/builtin-check.c:276: undefined reference to `arch_decode_instruction'
Should work, since ARCH should be x86 and then tools/objtool/Build will have
this:
objtool-y += arch/$(ARCH)/
Turned into:
objtool-y += arch/x86/
Which will build tools/objtool/arch/x86/decode.c, that will provide that
arch_decode_instruction() function :-\
I.e. with the two patches I mentioned, that are equivalent to the last patch I
sent to Stephen for testing, we would end up with HOSTARCH=powerpc and
ARCH=x86, no?
- Arnaldo
Full sequence:
[acme@jouet linux]$ cat tools/arch/powerpc/include/uapi/asm/bitsperlong.h
#ifndef __ASM_POWERPC_BITSPERLONG_H
#define __ASM_POWERPC_BITSPERLONG_H
#if defined(__powerpc64__)
# define __BITS_PER_LONG 64
#else
# define __BITS_PER_LONG 32
#endif
#include <asm-generic/bitsperlong.h>
#endif /* __ASM_POWERPC_BITSPERLONG_H */
[acme@jouet linux]$
It, like the kernel, where these files come from, has:
[acme@jouet linux]$ cat tools/include/asm-generic/bitsperlong.h
#ifndef __ASM_GENERIC_BITS_PER_LONG
#define __ASM_GENERIC_BITS_PER_LONG
#include <uapi/asm-generic/bitsperlong.h>
#ifdef __SIZEOF_LONG__
#define BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)
#else
#define BITS_PER_LONG __WORDSIZE
#endif
#if BITS_PER_LONG != __BITS_PER_LONG
#error Inconsistent word size. Check asm/bitsperlong.h
#endif
#endif /* __ASM_GENERIC_BITS_PER_LONG */
[acme@jouet linux]$
And finally:
[acme@jouet linux]$ cat tools/include/uapi/asm-generic/bitsperlong.h
#ifndef _UAPI__ASM_GENERIC_BITS_PER_LONG
#define _UAPI__ASM_GENERIC_BITS_PER_LONG
/*
* There seems to be no way of detecting this automatically from user
* space, so 64 bit architectures should override this in their
* bitsperlong.h. In particular, an architecture that supports
* both 32 and 64 bit user space must not rely on CONFIG_64BIT
* to decide it, but rather check a compiler provided macro.
*/
#ifndef __BITS_PER_LONG
#define __BITS_PER_LONG 32
#endif
#endif /* _UAPI__ASM_GENERIC_BITS_PER_LONG */
[acme@jouet linux]$
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Fengguang Wu @ 2016-07-22 12:16 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Steve Muckle, Stephen Rothwell, linux-next, linux-kernel,
kbuild-all
In-Reply-To: <4317240.GoBAVxA9mF@vostro.rjw.lan>
On Fri, Jul 22, 2016 at 02:08:35PM +0200, Rafael J. Wysocki wrote:
>On Thursday, July 21, 2016 07:26:28 PM Steve Muckle wrote:
>> On Fri, Jul 22, 2016 at 11:56:20AM +1000, Stephen Rothwell wrote:
>> > Hi Rafael,
>> >
>> > After merging the pm tree, today's linux-next build (arm
>> > multi_v7_defconfig) failed like this:
>> >
>> > ERROR: "cpufreq_driver_resolve_freq" [kernel/sched/cpufreq_schedutil.ko] undefined!
>> >
>> > Caused by commit
>> >
>> > 5cbea46984d6 ("cpufreq: schedutil: map raw required frequency to driver frequency")
>> >
>> > I used the pm tree from next-20160721 for today.
>>
>> Sorry - I have just sent a patch to address this.
>
>OK, thanks!
>
>Interestingly enough, that hasn't been caught by 0-day.
Sorry it's bisected to a merge commit, hence not reported..
It should be better handled in future.
tree: git://internal_merge_and_test_tree devel-catchup-201607140443
head: 5f2b635268c560fa7a531e0bdc7765800287ab0f
commit: a868e9fc557aa84ea307d1a394a161420ac20498 [2/12] Merge 'linux-review/Steve-Muckle/cpufreq-avoid-redundant-driver-calls-in-schedutil/20160714-042907' into devel-catchup-201607140443
config: i386-randconfig-s1-201628 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430
reproduce:
git checkout a868e9fc557aa84ea307d1a394a161420ac20498
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
>> ERROR: "cpufreq_driver_resolve_freq" [kernel/sched/cpufreq_schedutil.ko] undefined!
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Rafael J. Wysocki @ 2016-07-22 12:08 UTC (permalink / raw)
To: Steve Muckle
Cc: Stephen Rothwell, linux-next, linux-kernel, Fengguang Wu,
kbuild-all
In-Reply-To: <20160722022628.GE27987@graphite.smuckle.net>
On Thursday, July 21, 2016 07:26:28 PM Steve Muckle wrote:
> On Fri, Jul 22, 2016 at 11:56:20AM +1000, Stephen Rothwell wrote:
> > Hi Rafael,
> >
> > After merging the pm tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > ERROR: "cpufreq_driver_resolve_freq" [kernel/sched/cpufreq_schedutil.ko] undefined!
> >
> > Caused by commit
> >
> > 5cbea46984d6 ("cpufreq: schedutil: map raw required frequency to driver frequency")
> >
> > I used the pm tree from next-20160721 for today.
>
> Sorry - I have just sent a patch to address this.
OK, thanks!
Interestingly enough, that hasn't been caught by 0-day.
Thanks,
Rafael
^ permalink raw reply
* Re: next-20160722 build: 1 failures 5 warnings (next-20160722)
From: Dave Chinner @ 2016-07-22 11:58 UTC (permalink / raw)
To: Mark Brown
Cc: Matthew Wilcox, Christoph Hellwig, Dave Chinner, xfs,
linaro-kernel, linux-next, linux-arm-kernel, kernel-build-reports
In-Reply-To: <20160722103829.GY6509@sirena.org.uk>
On Fri, Jul 22, 2016 at 11:38:29AM +0100, Mark Brown wrote:
> On Fri, Jul 22, 2016 at 11:13:41AM +0100, Build bot for Mark Brown wrote:
>
> Today's -next fails to build an ARM allmodconfig due to:
>
> > arm-allmodconfig
> > ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
Already fixed.
https://git.kernel.org/cgit/linux/kernel/git/dgc/linux-xfs.git/commit/?h=for-next&id=f021bd071f06b545926b1031348873b05442139f
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply
* Re: next-20160722 build: 1 failures 5 warnings (next-20160722)
From: Robin Murphy @ 2016-07-22 11:29 UTC (permalink / raw)
To: Mark Brown, Matthew Wilcox, Christoph Hellwig, Dave Chinner
Cc: xfs, linaro-kernel, linux-next, linux-arm-kernel,
kernel-build-reports
In-Reply-To: <20160722103829.GY6509@sirena.org.uk>
On 22/07/16 11:38, Mark Brown wrote:
[...]
> DAX is explicitly disabled on
> 32 bit ARM due to problems with virtual aliasing caches (it's not clear
> to me that it shouldn't also be disabled for arm64 for the same reason).
>From ARMv7 onwards, data caches have to behave as if PIPT, so I wouldn't
expect there to be a problem for arm64.
Robin.
^ permalink raw reply
* Re: next-20160722 build: 1 failures 5 warnings (next-20160722)
From: Mark Brown @ 2016-07-22 10:38 UTC (permalink / raw)
To: Matthew Wilcox, Christoph Hellwig, Dave Chinner
Cc: kernel-build-reports, linaro-kernel, linux-next, xfs,
linux-arm-kernel
In-Reply-To: <E1bQXSf-0008Uu-Ej@optimist>
[-- Attachment #1: Type: text/plain, Size: 491 bytes --]
On Fri, Jul 22, 2016 at 11:13:41AM +0100, Build bot for Mark Brown wrote:
Today's -next fails to build an ARM allmodconfig due to:
> arm-allmodconfig
> ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
due to 16d4d43595b47 (xfs: split direct I/O and DAX path) which added an
unconditional reference to dax_do_io(). DAX is explicitly disabled on
32 bit ARM due to problems with virtual aliasing caches (it's not clear
to me that it shouldn't also be disabled for arm64 for the same reason).
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* next-20160722 build: 1 failures 5 warnings (next-20160722)
From: Build bot for Mark Brown @ 2016-07-22 10:13 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160722
Git describe: next-20160722
Commit: 13123042d0 Add linux-next specific files for 20160722
Build Time: 86 min 57 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 5
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
2 warnings 0 mismatches : arm-multi_v7_defconfig
2 warnings 0 mismatches : x86_64-defconfig
5 warnings 0 mismatches : arm-allmodconfig
2 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
Warnings Summary: 5
6 ../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
6 ../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
2 ../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
1 ../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
x86_64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 5 warnings, 0 section mismatches
Errors:
ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/misc/lkdtm_usercopy.c:52:15: warning: 'bad_stack' may be used uninitialized in this function [-Wmaybe-uninitialized]
../include/linux/dynamic_debug.h:134:3: warning: 'carrier_offset' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/8250/8250_fintek.c:34:0: warning: "IRQ_MODE" redefined
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/ata/libata-scsi.c:3637:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
../drivers/ata/libata-scsi.c:3702:28: warning: suggest parentheses around comparison in operand of '&' [-Wparentheses]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
arm-allnoconfig
^ permalink raw reply
* Re: [PATCH resend v2 3/5] libata-scsi: use u8 array to store mode page copy
From: Sergei Shtylyov @ 2016-07-22 9:59 UTC (permalink / raw)
To: tom.ty89, tj, hare, arnd
Cc: sfr, linux-ide, linux-scsi, linux-kernel, linux-next
In-Reply-To: <8d3cb878e86e0e4be2212f05ce47ff60cbfd3e10.1469143747.git.tom.ty89@gmail.com>
Hello.
On 7/22/2016 2:29 AM, tom.ty89@gmail.com wrote:
> From: Tom Yan <tom.ty89@gmail.com>
>
> ata_mselect_*() would initialize a char array for storing a copy of
> the current mode page. However, char could be signed char. In that
> case, bytes larger than 127 would be converted to negative number.
>
> For example, 0xff from def_control_mpage[] would become -1. This
> prevented ata_mselect_control() from working at all, since when it
> did the read-only bits check, there would always be a mismatch.
>
> Signed-off-by: Tom Yan <tom.ty89@gmail.com>
>
> diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
> index 4a4e6f1..a28e2ea94 100644
> --- a/drivers/ata/libata-scsi.c
> +++ b/drivers/ata/libata-scsi.c
> @@ -3610,7 +3610,7 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
> {
> struct ata_taskfile *tf = &qc->tf;
> struct ata_device *dev = qc->dev;
> - char mpage[CACHE_MPAGE_LEN];
> + u8 mpage[CACHE_MPAGE_LEN];
> u8 wce, mask;
> int i;
>
> @@ -3668,7 +3668,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc,
> const u8 *buf, int len, u16 *fp)
> {
> struct ata_device *dev = qc->dev;
> - char mpage[CONTROL_MPAGE_LEN];
> + u8 mpage[CONTROL_MPAGE_LEN];
Indent with tabs please, as above.
[...]
MBR, Sergei
^ permalink raw reply
* linux-next: Tree for Jul 22
From: Stephen Rothwell @ 2016-07-22 7:10 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160721:
The powerpc tree gained a build failure for which I applied a fix patch.
The fuse tree gained a build failure due to an interaction with the
btrfs-kdave tree, so I applied a merge fix patch.
The pm tree gained a build failure, so I used the version from
next-20160721.
The nvdimm tree lost its build failure but gained another due to an
interaction with the device-mapper tree. I applied a merge fix patch.
Non-merge commits (relative to Linus' tree): 10807
9936 files changed, 548899 insertions(+), 195049 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 239 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 (47ef4ad2684d Merge tag 'for-linus-20160715' of git://git.infradead.org/linux-mtd)
Merging fixes/master (5edb56491d48 Linux 4.7-rc3)
Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables)
Merging arc-current/for-curr (9bd54517ee86 arc: unwind: warn only once if DW2_UNWIND is disabled)
Merging arm-current/fixes (f6492164ecb1 ARM: 8577/1: Fix Cortex-A15 798181 errata initialization)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (bfa37087aa04 powerpc: Initialise pci_io_base as early as possible)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging net/master (882b0f2fba83 net/mlx5e: Fix del vxlan port command buffer memset)
Merging ipsec/master (1ba5bf993c6a xfrm: fix crash in XFRM_MSG_GETSA netlink handler)
Merging netfilter/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging ipvs/master (3777ed688fba ipvs: fix bind to link-local mcast IPv6 address in backup)
Merging wireless-drivers/master (034fdd4a17ff Merge ath-current from ath.git)
Merging mac80211/master (16a910a6722b cfg80211: handle failed skb allocation)
Merging sound-current/for-linus (76df52969711 ALSA: usb-audio: Fix quirks code is not called)
Merging pci-current/for-linus (ef0dab4aae14 PCI: Fix unaligned accesses in VC code)
Merging driver-core.current/driver-core-linus (92d21ac74a9e Linux 4.7-rc7)
Merging tty.current/tty-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb.current/usb-linus (a99cde438de0 Linux 4.7-rc6)
Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command)
Merging usb-serial-fixes/usb-linus (4c2e07c6a29e Linux 4.7-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (ea1d39a31d3b usb: common: otg-fsm: add license to usb-otg-fsm)
Merging staging.current/staging-linus (a99cde438de0 Linux 4.7-rc6)
Merging char-misc.current/char-misc-linus (33688abb2802 Linux 4.7-rc4)
Merging input-current/for-linus (e9003c9cfaa1 Input: tsc200x - report proper input_dev name)
Merging crypto-current/master (81dc0365cfa7 crypto: qat - make qat_asym_algs.o depend on asn1 headers)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read)
Merging kselftest-fixes/fixes (f80eb4289491 selftests/exec: Makefile is a run-time dependency, add it to the install list)
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 (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
Merging drm-intel-fixes/for-linux-next-fixes (ed2eebbd61af drm/i915: add missing condition for committing planes on crtc)
Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list)
Merging arc/for-next (b4dff2874006 ARC: dma: fix address translation in arc_dma_free)
Merging arm/for-next (bf9cb4359182 Merge branches 'component', 'cpuidle', 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (1a695a905c18 Linux 4.7-rc1)
Merging arm-soc/for-next (9914c2a60844 arm-soc: document merge)
Merging amlogic/for-next (4d9b3db03bd4 Merge remote-tracking branch 'clk/clk-s905' into tmp/aml-rebuild)
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
Merging bcm2835/for-next (aa5c0a1e15c2 Merge branch anholt/bcm2835-dt-64-next into for-next)
Merging berlin/berlin/for-next (d433580f3b4e Merge branches 'berlin64/dt' and 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (63a404a3f177 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (eef6bb9fc17a Merge branch 'for_4.8/keystone' into next)
Merging mvebu/for-next (feaf6b0beba8 Merge branch 'mvebu/defconfig64' into mvebu/for-next)
Merging omap/for-next (01eab0a3b919 Merge tag 'omap-for-v4.8/defconfig-v2-signed' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (289f9fb05d0c ARM: dts: msm8916: Add smsm and smp2p nodes)
Merging renesas/next (e1ebb0d1a9a8 Merge branch 'heads/dt-fixes-for-v4.8' into next)
Merging rockchip/for-next (ebbfb5d5627d Merge branch 'v4.8-armsoc/dts64' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
Merging samsung-krzk/for-next (253256f64294 Merge branch 'next/soc' into for-next)
CONFLICT (content): Merge conflict in arch/arm/boot/dts/exynos5420.dtsi
Merging tegra/for-next (6083e0f837ac Merge branch for-4.8/arm64/defconfig into for-next)
Merging arm64/for-next/core (a95b0644b38c Merge branch 'for-next/kprobes' into for-next/core)
CONFLICT (content): Merge conflict in arch/arm64/mm/fault.c
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 (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (70f4f9352317 ia64: efi: use timespec64 for persistent clock)
Merging m68k/for-next (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging m68knommu/for-next (33688abb2802 Linux 4.7-rc4)
Merging metag/for-next (fb2bb461e2d8 metag: Remove duplicate KERN_<LEVEL> prefix)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d117d8edaf68 Merge branch '4.7-fixes' into mips-for-linux-next)
Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target)
Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging powerpc/next (b1923caa6e64 powerpc: Merge 32-bit and 64-bit setup_arch())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (9f595fd8b548 powerpc/8xx: Force VIRT_IMMR_BASE to be a positive number)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (64a40c84001e s390/pci: Delete an unnecessary check before the function call "pci_dev_put")
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (893d66192c46 tile: support gcc 7 optimization to use __multi3)
Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support)
Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (701aa322c418 Fixup: fs_info/root cleanups and qgroups patches)
Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache)
Merging cifs/for-next (bd975d1eead2 cifs: fix crash due to race in hmac(md5) handling)
Merging configfs/for-next (3dc3afadeb04 configfs: don't set buffer_needs_fill to zero if show() returns error)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (e008bb6134a6 quota: use time64_t internally)
Merging ext4/dev (7bc949164511 ext4: verify extent header depth)
Merging f2fs/dev (363cad7f7e58 f2fs: avoid memory allocation failure due to a long length)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (4bb06282417f fuse: use filemap_check_errors())
Applying: btrfs: merge fix for "mm: export filemap_check_errors() to modules"
Merging gfs2/for-next (44f52122a220 GFS2: Check rs_free with rd_rsspin protection)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (3e36eaa4799f Merge branch 'nfs-rdma')
Merging nfsd/nfsd-next (96c35631204c SUNRPC: change UDP socket space reservation)
Merging orangefs/for-next (78fee0b6846f orangefs: fix namespace handling)
Merging overlayfs/overlayfs-next (86c0a6e33336 Revert "ovl: get_write_access() in truncate")
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (4ac1c17b2044 UBIFS: Implement ->migratepage())
Merging xfs/for-next (dc4113d2433e Merge branch 'xfs-4.8-dir2-sf-fixes' into for-next)
CONFLICT (content): Merge conflict in fs/xfs/xfs_ioctl.c
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (b223f4e215b3 Merge branch 'd_real' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs into work.misc)
CONFLICT (content): Merge conflict in fs/nfs/dir.c
Merging pci/next (e0af5a975e77 Merge branch 'pci/resource' into next)
CONFLICT (content): Merge conflict in drivers/pci/host/pci-tegra.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Merging pstore/for-next/pstore (35da60941e44 pstore/ram: add Device Tree bindings)
Merging hid/for-next (de1bcd764ea0 Merge branch 'for-4.8/upstream' into for-next)
Merging i2c/i2c/for-next (2c32e9ed5dcb Merge branch 'i2c/for-4.8' into i2c/for-next)
Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (b53893aae441 hwmon: (adt7411) set bit 3 in CFG1 register)
Merging v4l-dvb/master (7df7922fa649 Merge branch 'topic/docs-next' into to_next)
Merging pm/linux-next (b7e71ac2afdf Merge branch 'acpi-processor' into linux-next)
$ git reset --hard HEAD^
Merging next-20160721 version of pm
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (2c5ce98e1e83 thermal: sysfs: add comments describing locking strategy)
Merging thermal-soc/next (9a1d2bd3e7fd Merge branch 'work-fixes' into work-next)
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_sysfs.c
CONFLICT (add/add): Merge conflict in drivers/thermal/thermal_helpers.c
CONFLICT (content): Merge conflict in drivers/thermal/thermal_core.c
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (b1a4e336d500 Merge branch 'topic/dmaengine_cleanups' into next)
Merging net-next/master (276b8c77c3e4 Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next)
CONFLICT (content): Merge conflict in net/sctp/input.c
CONFLICT (content): Merge conflict in net/sched/sch_htb.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/i40e/i40e_main.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/freescale/fec.h
CONFLICT (content): Merge conflict in drivers/net/ethernet/cavium/liquidio/lio_main.c
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/broadcom/ns2-svk.dts
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging netfilter-next/master (6e1f760e13c7 netfilter: nf_tables: allow to filter out rules by table and chain)
Merging ipvs-next/master (be2cef49904b ipvs: count pre-established TCP states as active)
Merging wireless-drivers-next/master (cb6a11518850 wlcore: spi: fix build warning caused by redundant variable)
Merging bluetooth/master (276b8c77c3e4 Merge tag 'nfc-next-4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next)
Merging mac80211-next/master (7d27a0ba7adc cfg80211: Add mesh peer AID setting API)
Merging rdma/for-next (fb92d8fb1b9c Merge branches 'cxgb4-4.8', 'mlx5-4.8' and 'fw-version' into k.o/for-4.8)
Merging rdma-leon/rdma-next (4c2e07c6a29e Linux 4.7-rc5)
Merging rdma-leon-test/testing/rdma-next (92d21ac74a9e Linux 4.7-rc7)
Merging mtd/master (7ce9ea7e6b35 mtd: nand: omap2: Add check for old elm binding)
Merging l2-mtd/master (1dcff2e4ae72 mtd: spi-nor: don't build Cadence QuadSPI on non-ARM)
CONFLICT (content): Merge conflict in drivers/mtd/devices/Kconfig
Merging nand/nand/next (8490c03bd9d4 mtd: nand: jz4780: Update MODULE_AUTHOR email address)
Merging crypto/master (51b259bb01fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging drm/drm-next (0cf09031540c Merge branch 'drm_bridge_for_4.8' of https://github.com/boddob/linux into drm-next)
CONFLICT (content): Merge conflict in drivers/media/platform/omap/omap_voutdef.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/sti/sti_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/rockchip/rockchip_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c
CONFLICT (content): Merge conflict in Documentation/index.rst
Applying: drm/i915/opregion: fix up for argument change
Merging drm-panel/drm/panel/for-next (9bb34c4c730d drm/panel: simple: Add support for Starry KR122EA0SRA panel)
Merging drm-intel/for-linux-next (fa95986095e3 drm/i915: Set legacy properties when using legacy gamma set IOCTL. (v2))
Merging drm-tegra/drm/tegra/for-next (64ea25c3bc86 drm/tegra: sor: Reject HDMI 2.0 modes)
Merging drm-misc/topic/drm-misc (e8d3ef02787f GPU-DRM-Exynos: Delete an unnecessary check before the function call "vunmap")
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 (0a677125d0ff drm/msm: Delete an unnecessary check before drm_gem_object_unreference())
Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (25d6a931b3f3 Merge branches 'sunxi/clk-fixes-for-4.7', 'sunxi/defconfig-for-4.8', 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next)
Merging kbuild/for-next (8f59bd8c154e Merge branch 'kbuild/misc' into kbuild/for-next)
Applying: gcc-plugins: disable under COMPILE_TEST
Merging kspp/for-next/kspp (c802d8b16509 mm: SLUB hardened usercopy support)
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/include/asm/uaccess.h
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (efeb1a3ab91d Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic/iopoll', 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next)
Merging sound/for-next (275353bb684e ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members)
Merging sound-asoc/for-next (2b2bbb449c21 Merge remote-tracking branches 'asoc/topic/wm8753' and 'asoc/topic/wm8985' into asoc-next)
Merging modules/modules-next (9fc3d73bedc7 module: Do a WARN_ON_ONCE() for assert module mutex not held)
Merging input/next (0097ff3d5dad Input: tty/vt/keyboard - use memdup_user())
Merging block/for-next (b013517951a1 Merge branch 'for-4.8/core' into for-next)
CONFLICT (content): Merge conflict in fs/f2fs/segment.c
CONFLICT (content): Merge conflict in fs/f2fs/data.c
CONFLICT (modify/delete): fs/ext4/crypto.c deleted in HEAD and modified in block/for-next. Version block/for-next of fs/ext4/crypto.c left in tree.
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
CONFLICT (content): Merge conflict in fs/btrfs/compression.c
CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c
CONFLICT (content): Merge conflict in block/blk-lib.c
$ git rm -f fs/ext4/crypto.c
Merging lightnvm/for-next (191d684c5d4f Merge branch 'for-4.8/drivers' into for-next)
Merging device-mapper/for-next (b5ab4a9ba557 dm: allow bio-based table to be upgraded to bio-based with DAX support)
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (3e7aa4e78748 mmc: core: Extend sysfs with DSR register)
Merging md/for-next (0e5313e2d4ef raid10: improve random reads performance)
CONFLICT (content): Merge conflict in drivers/md/raid10.c
CONFLICT (content): Merge conflict in drivers/md/raid1.c
Merging mfd/for-mfd-next (f37be01e6dc6 mfd: qcom_rpm: Parametrize also ack selector size)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/master (4fcd504edbf7 power: reset: add reboot mode driver)
Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module)
Merging regulator/for-next (a485f5fc8c8e Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618', 'regulator/topic/tps65218' and 'regulator/topic/twl' into regulator-next)
Merging security/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging integrity/next (544e1cea03e6 ima: extend the measurement entry specific pcr)
Merging keys/keys-next (05638c9bc586 Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (3f09354ac84c netlabel: Implement CALIPSO config functions for SMACK.)
Merging tpmdd/next (82cc1a49b635 tpm: Add TPM 2.0 support to the Nuvoton i2c driver (NPCT6xx family))
Merging watchdog/master (e035d8f787b1 watchdog: sbsa: Drop status function)
Merging iommu/next (a9f890f46e6a Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm/rockchip', 'arm/smmu' and 'core' into next)
CONFLICT (content): Merge conflict in drivers/iommu/mtk_iommu.c
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (0991bbdbf5b8 vfio: platform: check reset call return code during release)
Merging jc_docs/docs-next (29310a50752d Revert "doc/sphinx: Enable keep_warnings")
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (43761473c254 audit: fix a double fetch in audit_log_single_execve_arg())
CONFLICT (content): Merge conflict in arch/s390/kernel/ptrace.c
Merging devicetree/for-next (1d1bde550ea3 of: fdt: mark unflattened tree as detached)
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-bcm/board_bcm21664.c
CONFLICT (content): Merge conflict in arch/arc/kernel/setup.c
Merging mailbox/mailbox-for-next (9ac3e85a5c5c mailbox: pl320: remove __raw IO)
Merging spi/for-next (d28f0dfdb432 Merge remote-tracking branches 'spi/topic/topcliff-pch', 'spi/topic/txx9' and 'spi/topic/xilinx' into spi-next)
Merging perf/perf/core (6c4d0b41ce3e perf tools: Add AVX-512 instructions to the new instructions test)
Applying: tools: Simplify __BITS_PER_LONG define
Merging tip/auto-latest (211f47a5cac5 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/x86/kernel/x86_init.c
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM"
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (a67adb32d941 ARM: dts: Add Arria10 Ethernet EDAC devicetree entry)
Merging irqchip/irqchip/for-next (77d50b17c990 Merge branch 'irqchip/misc' into irqchip/for-next)
Merging ftrace/for-next (78aebca2c955 printk, tracing: Avoiding unneeded blank lines)
Merging rcu/rcu/next (fbbede99476f rcu: don't use modular infrastructure in non-modular code)
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Merging kvm/linux-next (61f5dea17965 Merge tag 'kvm-s390-next-4.8-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into next)
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/s390/mm/gmap.c
CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
CONFLICT (content): Merge conflict in arch/powerpc/kernel/idle_book3s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/exceptions-64s.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/paca.h
Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c
Applying: s390: merge fix up for __diag204 move
Merging kvm-arm/next (3a88bded2035 KVM: arm64: vgic-its: Simplify MAPI error handling)
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
CONFLICT (modify/delete): virt/kvm/arm/vgic.c deleted in kvm-arm/next and modified in HEAD. Version HEAD of virt/kvm/arm/vgic.c left in tree.
CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h
CONFLICT (content): Merge conflict in include/linux/irqchip/arm-gic-v3.h
$ git rm -f virt/kvm/arm/vgic.c
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fd7bacbca47a KVM: PPC: Book3S HV: Fix TB corruption in guest exit path on HMI interrupt)
Merging kvms390/next (9acc317b183f KVM: s390: let ptff intercepts result in cc=3)
Merging xen-tip/linux-next (6ba286ad8457 xen: support runqueue steal time on xen)
CONFLICT (content): Merge conflict in drivers/acpi/scan.c
CONFLICT (content): Merge conflict in arch/arm/xen/enlighten.c
Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction)
Merging workqueues/for-next (d945b5e9f0e3 workqueue: Fix setting affinity of unbound worker threads)
Merging drivers-x86/for-next (df2294fb6428 intel_pmc_core: Convert to DEFINE_DEBUGFS_ATTRIBUTE)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (9c99e5e51988 HSI: omap_ssi: drop pm_runtime_irq_safe)
Merging leds/for-next (5706c01fcfb3 leds: is31fl32xx: define complete i2c_device_id table)
Merging ipmi/for-next (92cad0931b08 ipmi: remove trydefaults parameter and default init)
Merging driver-core/driver-core-next (92d21ac74a9e Linux 4.7-rc7)
Merging tty/tty-next (67417f9c262e Merge 4.7-rc6 into tty-next)
Merging usb/usb-next (a1ca2c6b2924 usb: musb: sunxi: Simplify dr_mode handling)
Applying: staging: emxx_udc: allow modular build
Merging usb-gadget/next (15e4292a2d21 usb: renesas_usbhs: protect the CFIFOSEL setting in usbhsg_ep_enable())
Merging usb-serial/usb-next (3161da970d38 USB: serial: use variable for status)
Merging usb-chipidea-next/ci-for-usb-next (229d43daf8ed usb: chipidea: imx: set over current polarity per dts setting)
Merging staging/staging-next (6c71ee3b6157 Merge tag 'iio-for-4.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree.
CONFLICT (modify/delete): drivers/staging/android/sync.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/android/sync.h left in tree.
$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c drivers/staging/android/sync.h
Applying: staging/android: merge fix up for sync.h renaming
Merging char-misc/char-misc-next (45c7d71e1675 Merge tag 'lkdtm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-testing)
Merging extcon/extcon-next (c2692f2dad4f extcon: Block the bit masking operation for cable state except for extcon core)
Merging cgroup/for-next (1cab4a96cab6 Merge branch 'for-4.8' into for-next)
CONFLICT (content): Merge conflict in kernel/cgroup.c
Merging scsi/for-next (fcbefc3b2bfb scsi: ufs: remove unnecessary goto label)
Merging target-updates/for-next (1a9b9846e904 target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (9e4bc77c45ba Merge branch 'for-4.8' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging pinctrl/for-next (25af8bfa9693 pinctrl: Add STM32F746 MCU support)
Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (e937b335a738 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (4287d2aea9bf MAINTAINERS: Add INTEL MERRIFIELD GPIO entry)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (9637e7e0403a Merge branch 'for-4.8/regulator' into for-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (81754357770e fs: Update i_[ug]id_(read|write) to translate relative to s_user_ns)
CONFLICT (content): Merge conflict in fs/proc/root.c
CONFLICT (content): Merge conflict in fs/posix_acl.c
Applying: proc: fixup for "prevent stacking filesystems on top"
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (d22527fed2f0 Merge branch 'clk-fixes' into clk-next)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (cde07f453bed selftests: media_tests - Add media_device_open to .gitignore)
Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next)
Merging coresight/next (7c844fbeb7ce coresight: etm4x: remove duplicated include from coresight-etm4x.c)
Merging rtc/rtc-next (bb9dbb01bef9 rtc: hym8563: in .read_alarm set .tm_sec to 0 to signal minute accuracy)
CONFLICT (content): Merge conflict in arch/x86/platform/efi/efi_64.c
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (eb3434aad386 Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next)
CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c
Applying: dm: merge fix for "pmem: kill __pmem address space"
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Applying: powerpc: fix for "Move MMU backend selection out of platform code"
Merging akpm-current/current (d8ed6a95f30d ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in include/linux/thread_info.h
CONFLICT (modify/delete): arch/arm/configs/bcm_defconfig deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/arm/configs/bcm_defconfig left in tree.
$ git rm -f arch/arm/configs/bcm_defconfig
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: drivers/fpga/Kconfig: fix build failure
Applying: tree-wide: replace config_enabled() with IS_ENABLED()
Applying: include/linux/bitmap.h: cleanup
Applying: powerpc: add explicit #include <asm/asm-compat.h> for jump label
Applying: sparc: support static_key usage in non-module __exit sections
Applying: tile: support static_key usage in non-module __exit sections
Applying: arm: jump label may reference text in __exit
Applying: jump_label: remove bug.h, atomic.h dependencies for HAVE_JUMP_LABEL
Applying: dynamic_debug: add jump label support
Applying: ipc/sem.c: fix complex_count vs. simple op race
Applying: ipc/sem.c: remove duplicated memory barriers
Applying: media: mtk-vcodec: remove unused dma_attrs
Applying: dma-mapping: use unsigned long for dma_attrs
Applying: alpha: dma-mapping: use unsigned long for dma_attrs
Applying: arc: dma-mapping: use unsigned long for dma_attrs
Applying: ARM: dma-mapping: use unsigned long for dma_attrs
Applying: arm64: dma-mapping: use unsigned long for dma_attrs
Applying: avr32: dma-mapping: use unsigned long for dma_attrs
Applying: blackfin: dma-mapping: use unsigned long for dma_attrs
Applying: c6x: dma-mapping: use unsigned long for dma_attrs
Applying: cris: dma-mapping: use unsigned long for dma_attrs
Applying: frv: dma-mapping: use unsigned long for dma_attrs
Applying: drm/exynos: dma-mapping: use unsigned long for dma_attrs
Applying: drm/mediatek: dma-mapping: use unsigned long for dma_attrs
Applying: drm/msm: dma-mapping: use unsigned long for dma_attrs
Applying: drm/nouveau: dma-mapping: use unsigned long for dma_attrs
Applying: drm/rockship: dma-mapping: use unsigned long for dma_attrs
Applying: infiniband: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: dma-mapping: use unsigned long for dma_attrs
Applying: media: dma-mapping: use unsigned long for dma_attrs
Applying: xen: dma-mapping: use unsigned long for dma_attrs
Applying: swiotlb: dma-mapping: use unsigned long for dma_attrs
Applying: powerpc: dma-mapping: use unsigned long for dma_attrs
Applying: video: dma-mapping: use unsigned long for dma_attrs
Applying: x86: dma-mapping: use unsigned long for dma_attrs
Applying: iommu: intel: dma-mapping: use unsigned long for dma_attrs
Applying: h8300: dma-mapping: use unsigned long for dma_attrs
Applying: hexagon: dma-mapping: use unsigned long for dma_attrs
Applying: ia64: dma-mapping: use unsigned long for dma_attrs
Applying: m68k: dma-mapping: use unsigned long for dma_attrs
Applying: metag: dma-mapping: use unsigned long for dma_attrs
Applying: microblaze: dma-mapping: use unsigned long for dma_attrs
Applying: mips: dma-mapping: use unsigned long for dma_attrs
Applying: mn10300: dma-mapping: use unsigned long for dma_attrs
Applying: nios2: dma-mapping: use unsigned long for dma_attrs
Applying: openrisc: dma-mapping: use unsigned long for dma_attrs
Applying: parisc: dma-mapping: use unsigned long for dma_attrs
Applying: misc: mic: dma-mapping: use unsigned long for dma_attrs
Applying: s390: dma-mapping: use unsigned long for dma_attrs
Applying: sh: dma-mapping: use unsigned long for dma_attrs
Applying: sparc: dma-mapping: use unsigned long for dma_attrs
Applying: tile: dma-mapping: use unsigned long for dma_attrs
Applying: unicore32: dma-mapping: use unsigned long for dma_attrs
Applying: xtensa: dma-mapping: use unsigned long for dma_attrs
Applying: remoteproc: qcom: use unsigned long for dma_attrs
Applying: dma-mapping: remove dma_get_attr
Applying: dma-mapping: document the DMA attributes next to the declaration
Merging akpm/master (1bbf1d06c249 dma-mapping: document the DMA attributes next to the declaration)
^ permalink raw reply
* linux-next: build failure after merge of the powerpc tree
From: Stephen Rothwell @ 2016-07-22 6:31 UTC (permalink / raw)
To: Michael Ellerman, Benjamin Herrenschmidt, linuxppc-dev
Cc: linux-next, linux-kernel
Hi all,
After merging the powerpc tree, today's linux-next build (powerpc64
allnoconfig) failed like this:
arch/powerpc/mm/built-in.o: In function `.hash__early_init_mmu':
(.init.text+0x7d8): undefined reference to `.hpte_init_native'
Caused by commit
166dd7d3fbf2 ("powerpc/64: Move MMU backend selection out of platform code")
hpte_init_native is in hash_native_64 which is only built for
CONFIG_PPC_NATIVE. I added the following fix patch (which is probably
not correct).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Jul 2016 16:28:00 +1000
Subject: [PATCH] powerpc: fix for "Move MMU backend selection out of platform
code"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/mm/hash_utils_64.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 341632471b9d..7c50b4b79c84 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -931,8 +931,10 @@ void __init hash__early_init_mmu(void)
ps3_early_mm_init();
else if (firmware_has_feature(FW_FEATURE_LPAR))
hpte_init_lpar();
+#ifdef CONFIG_PPC_NATIVE
else
hpte_init_native();
+#endif
/* Initialize the MMU Hash table and create the linear mapping
* of memory. Has to be done before SLB initialization as this is
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: build failure after merge of the nvdimm tree
From: Stephen Rothwell @ 2016-07-22 6:13 UTC (permalink / raw)
To: Dan Williams, Alasdair G Kergon, Mike Snitzer
Cc: linux-next, linux-kernel, Toshi Kani
Hi Dan,
After merging the nvdimm tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from drivers/md/dm.h:14:0,
from drivers/md/dm-uevent.c:27:
include/linux/device-mapper.h:134:22: error: expected ';', ',' or ')' before '*' token
void __pmem **kaddr, pfn_t *pfn, long size);
^
include/linux/device-mapper.h:182:2: error: unknown type name 'dm_direct_access_fn'
dm_direct_access_fn direct_access;
^
Caused by commit
7a9eb2066631 ("pmem: kill __pmem address space")
interacting with commit
545ed20e6df6 ("dm: add infrastructure for DAX support")
from the device-mapper tree.
I applied the following merge fix patch for today. Someone needs to
tell Linus about this when he merges the trees.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Jul 2016 16:01:02 +1000
Subject: [PATCH] dm: merge fix for "pmem: kill __pmem address space"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/md/dm-linear.c | 2 +-
drivers/md/dm-snap.c | 2 +-
drivers/md/dm-stripe.c | 2 +-
drivers/md/dm-target.c | 2 +-
drivers/md/dm.c | 2 +-
include/linux/device-mapper.h | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 6d35dd4e9efb..4788b0b989a9 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -142,7 +142,7 @@ static int linear_iterate_devices(struct dm_target *ti,
}
static long linear_direct_access(struct dm_target *ti, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
struct linear_c *lc = ti->private;
struct block_device *bdev = lc->dev->bdev;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 731e1f5bd895..ce2a910709f7 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -2303,7 +2303,7 @@ static int origin_map(struct dm_target *ti, struct bio *bio)
}
static long origin_direct_access(struct dm_target *ti, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
DMWARN("device does not support dax.");
return -EIO;
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 01bb9cf2a8c2..83f1d4667195 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -309,7 +309,7 @@ static int stripe_map(struct dm_target *ti, struct bio *bio)
}
static long stripe_direct_access(struct dm_target *ti, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
struct stripe_c *sc = ti->private;
uint32_t stripe;
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 6eecd6b36f76..710ae28fd618 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -149,7 +149,7 @@ static void io_err_release_clone_rq(struct request *clone)
}
static long io_err_direct_access(struct dm_target *ti, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
return -EIO;
}
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index ceb69fc0b10b..25d1d97154a8 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -906,7 +906,7 @@ int dm_set_target_max_io_len(struct dm_target *ti, sector_t len)
EXPORT_SYMBOL_GPL(dm_set_target_max_io_len);
static long dm_blk_direct_access(struct block_device *bdev, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size)
+ void **kaddr, pfn_t *pfn, long size)
{
struct mapped_device *md = bdev->bd_disk->private_data;
struct dm_table *map;
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index b0db857f334b..91acfce74a22 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -131,7 +131,7 @@ typedef int (*dm_busy_fn) (struct dm_target *ti);
* >= 0 : the number of bytes accessible at the address
*/
typedef long (*dm_direct_access_fn) (struct dm_target *ti, sector_t sector,
- void __pmem **kaddr, pfn_t *pfn, long size);
+ void **kaddr, pfn_t *pfn, long size);
void dm_error(const char *message);
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* Re: [PATCH/RFC] Re: linux-next: build failure after merge of the luto-misc tree
From: Josh Poimboeuf @ 2016-07-22 3:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnaldo Carvalho de Melo, Andy Lutomirski,
Arnaldo Carvalho de Melo, Peter Zijlstra, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20160722092302.5a0a1544@canb.auug.org.au>
On Fri, Jul 22, 2016 at 09:23:02AM +1000, Stephen Rothwell wrote:
> Hi Arnaldo,
>
> On Thu, 21 Jul 2016 10:12:48 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> >
> > Em Thu, Jul 21, 2016 at 09:29:50AM +1000, Stephen Rothwell escreveu:
> > > Hi Arnaldo,
> > >
> > > On Tue, 19 Jul 2016 23:52:02 -0300 Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > > >
> > > > Humm, it seems that the compiler used is not the cross one, but the
> > > > native, check if, say, __powerpc__ is defined.
> > >
> > > Yes, __powerpc__ is defined (unsuprisingly).
> >
> > Maybe this one?
> >
> > diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
> > index 1f75b0a046cc..3500fcf7bd47 100644
> > --- a/tools/objtool/Makefile
> > +++ b/tools/objtool/Makefile
> > @@ -1,10 +1,14 @@
> > include ../scripts/Makefile.include
> >
> > +HOSTARCH=$(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
> > + -e s/sun4u/sparc64/ \
> > + -e s/arm.*/arm/ -e s/sa110/arm/ \
> > + -e s/s390x/s390/ -e s/parisc64/parisc/ \
> > + -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
> > + -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ )
> > +
> > ifndef ($(ARCH))
> > -ARCH ?= $(shell uname -m)
> > -ifeq ($(ARCH),x86_64)
> > -ARCH := x86
> > -endif
> > +ARCH ?= $(HOSTARCH)
> > endif
> >
> > # always use the host compiler
> > @@ -26,7 +30,7 @@ OBJTOOL_IN := $(OBJTOOL)-in.o
> >
> > all: $(OBJTOOL)
> >
> > -INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(ARCH)/include/uapi
> > +INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi
> > CFLAGS += -Wall -Werror $(EXTRA_WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
> > LDFLAGS += -lelf $(LIBSUBCMD)
> >
>
> That gets me this errors from the x86_64 allmodconfig build:
>
> tools/objtool/objtool-in.o: In function `decode_instructions':
> tools/objtool/builtin-check.c:276: undefined reference to `arch_decode_instruction'
>
> It just looks like objtool was not written with cross compilation in
> mind?
I don't know yet what the specific problem is, but objtool should work
fine in a cross-compiled environment. It needs to be compiled with the
host (powerpc) compiler, but then it needs to disassemble target (x86)
files. It worked fine before the bitsperlong.h files were merged.
I can try to take a deeper look at it tomorrow.
> It seems to build and run OK when you remove the test that
> checks that BITS_PER_LONG and __BITS_PER_LONG are the same, but I have
> no idea if it getting the desired results.
--
Josh
^ permalink raw reply
* Re: linux-next: build failure after merge of the pm tree
From: Steve Muckle @ 2016-07-22 2:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rafael J. Wysocki, linux-next, linux-kernel, Steve Muckle
In-Reply-To: <20160722115620.086b28ca@canb.auug.org.au>
On Fri, Jul 22, 2016 at 11:56:20AM +1000, Stephen Rothwell wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> ERROR: "cpufreq_driver_resolve_freq" [kernel/sched/cpufreq_schedutil.ko] undefined!
>
> Caused by commit
>
> 5cbea46984d6 ("cpufreq: schedutil: map raw required frequency to driver frequency")
>
> I used the pm tree from next-20160721 for today.
Sorry - I have just sent a patch to address this.
thanks,
Steve
^ permalink raw reply
* linux-next: build failure after merge of the pm tree
From: Stephen Rothwell @ 2016-07-22 1:56 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Steve Muckle
Hi Rafael,
After merging the pm tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
ERROR: "cpufreq_driver_resolve_freq" [kernel/sched/cpufreq_schedutil.ko] undefined!
Caused by commit
5cbea46984d6 ("cpufreq: schedutil: map raw required frequency to driver frequency")
I used the pm tree from next-20160721 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build failure after merge of the fuse tree
From: Stephen Rothwell @ 2016-07-22 1:01 UTC (permalink / raw)
To: Miklos Szeredi
Cc: Chris Mason, Josef Bacik, David Sterba, linux-next, linux-kernel
Hi Miklos,
After merging the fuse tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/btrfs/file.c: In function 'btrfs_sync_file':
fs/btrfs/file.c:2043:9: error: implicit declaration of function 'btrfs_inode_check_errors' [-Werror=implicit-function-declaration]
ret = btrfs_inode_check_errors(inode);
^
Caused by commit
7b9885f4acb2 ("mm: export filemap_check_errors() to modules")
interacting with commit
52c7064bb62a ("Btrfs: add missing check for writeback errors on fsync")
from the btrfs-kdave tree.
I applied the following merge fix patch and can carry it as necessary.
Someone needs to let Linus know about this when he meregs these trees.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 22 Jul 2016 10:57:27 +1000
Subject: [PATCH] btrfs: merge fix for "mm: export filemap_check_errors() to
modules"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/btrfs/file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5842423f8f47..6c8b98cfee09 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2040,7 +2040,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
* flags for any errors that might have happened while doing
* writeback of file data.
*/
- ret = btrfs_inode_check_errors(inode);
+ ret = filemap_check_errors(inode->i_mapping);
inode_unlock(inode);
goto out;
}
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: error fetching the y2038 tree
From: Stephen Rothwell @ 2016-07-22 0:01 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-next, linux-kernel
Hi Arnd,
Fetching the y2038
(git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038)
this morning produces this error:
fatal: Couldn't find remote ref refs/heads/y2038
I am still using the last version of this tree I fetched which contains:
4b277763c5b3 vfs: Add support to document max and min inode times
0b38aceef3f3 vfs: Add vfs_time accessors
df5999b78b01 fs: Add current_fs_time_sec() function
549eb7b22e24 AFS: Correctly use 64-bit time for UUID
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Jul 21
From: Paul Gortmaker @ 2016-07-21 23:52 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next@vger.kernel.org, LKML
In-Reply-To: <20160721165631.6508756a@canb.auug.org.au>
On Thu, Jul 21, 2016 at 2:56 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Changes since 20160720:
>
> The xfs tree gained a conflict against Linus' tree.
A new xfs related fail in mips allmodconfig:
ERROR: "dax_do_io" [fs/xfs/xfs.ko] undefined!
make[2]: *** [__modpost] Error 1
make[1]: *** [modules] Error 2
http://kisskb.ellerman.id.au/kisskb/buildresult/12749968/
Sparc and sparc64 allmodconfig get the same error.
>
> The net-next tree gained a conflict against the net tree.
>
> The l2-mtd tree lost its build failure.
>
> The crypto tree lost its build failure.
A new crypto related fail appeared in sun3_defconfig:
crypto/rsa_helper.c:18:28: fatal error: rsapubkey-asn1.h: No such file
or directory
make[2]: *** [crypto/rsa_helper.o] Error 1
make[1]: *** [crypto] Error 2
http://kisskb.ellerman.id.au/kisskb/buildresult/12749771/
>
> The kspp tree gained a conflict against the arm64 tree.
>
> The block tree gained a conflict against Linus' tree.
>
> The device-mapper tree gained a conflict against the block tree.
>
> The kvm tree gained a conflict against the powerpc tree.
>
> The nvdimm tree gained a build failure so I used the version from
> next-20160720.
>
> The akpm tree lost a patch that turned up elsewhere.
>
> Non-merge commits (relative to Linus' tree): 10587
> 9749 files changed, 534253 insertions(+), 187882 deletions(-)
A new i386-allmodconfig fail showed up relating to VDSO:
I tried to reproduce it locally with x86-64 build host and could
not, so I wonder if it is a missing HOSTCC vs. CC since next
coverage is power host...
VDSO2C arch/x86/entry/vdso/vdso-image-32.c
Error: input is not a shared object
make[4]: *** [arch/x86/entry/vdso/vdso-image-32.c] Error 1
make[3]: *** [arch/x86/entry/vdso] Error 2
make[2]: *** [arch/x86/entry] Error 2
http://kisskb.ellerman.id.au/kisskb/buildresult/12749836/
Paul.
--
>
> ----------------------------------------------------------------------------
>
> 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 239 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
^ permalink raw reply
* [PATCH resend v2 3/5] libata-scsi: use u8 array to store mode page copy
From: tom.ty89 @ 2016-07-21 23:35 UTC (permalink / raw)
To: tj, hare, sergei.shtylyov, arnd
Cc: sfr, linux-ide, linux-scsi, linux-kernel, linux-next, Tom Yan
In-Reply-To: <20160721214202.GG23759@htj.duckdns.org>
From: Tom Yan <tom.ty89@gmail.com>
ata_mselect_*() would initialize a char array for storing a copy of
the current mode page. However, char could be signed char. In that
case, bytes larger than 127 would be converted to negative number.
For example, 0xff from def_control_mpage[] would become -1. This
prevented ata_mselect_control() from working at all, since when it
did the read-only bits check, there would always be a mismatch.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 4a4e6f1..a28e2ea94 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3610,7 +3610,7 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
{
struct ata_taskfile *tf = &qc->tf;
struct ata_device *dev = qc->dev;
- char mpage[CACHE_MPAGE_LEN];
+ u8 mpage[CACHE_MPAGE_LEN];
u8 wce, mask;
int i;
@@ -3668,7 +3668,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc,
const u8 *buf, int len, u16 *fp)
{
struct ata_device *dev = qc->dev;
- char mpage[CONTROL_MPAGE_LEN];
+ u8 mpage[CONTROL_MPAGE_LEN];
u8 d_sense, mask;
int i;
--
2.9.0
^ permalink raw reply related
* [PATCH resend v2 2/5] libata-scsi: fix read-only bits checking in ata_mselect_*()
From: tom.ty89 @ 2016-07-21 23:34 UTC (permalink / raw)
To: tj, hare, sergei.shtylyov, arnd
Cc: sfr, linux-ide, linux-scsi, linux-kernel, linux-next, Tom Yan
In-Reply-To: <CAGnHSE=-upJ7_Wj-mpaa_tfZ6vxAbx5xaGqe0eRjFrw6Rw+ttA@mail.gmail.com>
From: Tom Yan <tom.ty89@gmail.com>
Commit 7780081c1f04 ("libata-scsi: Set information sense field for
invalid parameter") changed how ata_mselect_*() make sure read-only
bits are not modified. The new implementation introduced a bug that
the read-only bits in the byte that has a changeable bit will not
be checked.
Made it check every byte but mask the changeable bit.
Signed-off-by: Tom Yan <tom.ty89@gmail.com>
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index eb5e8ff..4a4e6f1 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3611,7 +3611,7 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
struct ata_taskfile *tf = &qc->tf;
struct ata_device *dev = qc->dev;
char mpage[CACHE_MPAGE_LEN];
- u8 wce;
+ u8 wce, mask;
int i;
/*
@@ -3632,8 +3632,11 @@ static int ata_mselect_caching(struct ata_queued_cmd *qc,
ata_msense_caching(dev->id, mpage, false);
for (i = 0; i < CACHE_MPAGE_LEN - 2; i++) {
if (i == 0)
- continue;
- if (mpage[i + 2] != buf[i]) {
+ mask = 0xfb;
+ else
+ mask = 0xff;
+
+ if ((mpage[i + 2] & mask) != (buf[i] & mask)) {
*fp = i;
return -EINVAL;
}
@@ -3666,7 +3669,7 @@ static int ata_mselect_control(struct ata_queued_cmd *qc,
{
struct ata_device *dev = qc->dev;
char mpage[CONTROL_MPAGE_LEN];
- u8 d_sense;
+ u8 d_sense, mask;
int i;
/*
@@ -3687,8 +3690,11 @@ static int ata_mselect_control(struct ata_queued_cmd *qc,
ata_msense_control(dev, mpage, false);
for (i = 0; i < CONTROL_MPAGE_LEN - 2; i++) {
if (i == 0)
- continue;
- if (mpage[2 + i] != buf[i]) {
+ mask = 0xfb;
+ else
+ mask = 0xff;
+
+ if ((mpage[2 + i] & mask) != (buf[i] & mask)) {
*fp = i;
return -EINVAL;
}
--
2.9.0
^ permalink raw reply related
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