* Re: linux-next: manual merge of the tty tree with the v4l-dvb tree
From: Greg KH @ 2016-09-30 5:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mauro Carvalho Chehab, linux-next, linux-kernel, Songjun Wu,
Nicolas Ferre
In-Reply-To: <20160930133319.57ac11a3@canb.auug.org.au>
On Fri, Sep 30, 2016 at 01:33:19PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC")
>
> from the v4l-dvb tree and commit:
>
> 5615c3715749 ("MAINTAINERS: update entry for atmel_serial driver")
>
> from the tty tree.
Ick, MAINTAINERS is a tough thing to merge at times, sorry, patch looks
fine to me.
greg k-h
^ permalink raw reply
* linux-next: build failure after merge of the tty tree
From: Stephen Rothwell @ 2016-09-30 3:54 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Aleksey Makarov
Hi Greg,
After merging the tty tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
drivers/tty/serial/amba-pl011.c: In function 'pl011_console_match':
drivers/tty/serial/amba-pl011.c:2346:44: error: passing argument 3 of 'uart_parse_earlycon' from incompatible pointer type [-Werror=incompatible-pointer-types]
if (uart_parse_earlycon(options, &iotype, &addr, &options))
^
In file included from drivers/tty/serial/amba-pl011.c:45:0:
include/linux/serial_core.h:384:5: note: expected 'resource_size_t * {aka unsigned int *}' but argument is of type 'long unsigned int *'
int uart_parse_earlycon(char *p, unsigned char *iotype, resource_size_t *addr,
^
Caused by commit
8b8f347d3a48 ("serial: pl011: add console matching function")
interacting with commit
46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")
I have reverted commit 8b8f347d3a48 for today.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the tty tree with the pm tree
From: Stephen Rothwell @ 2016-09-30 3:42 UTC (permalink / raw)
To: Greg KH, Rafael J. Wysocki
Cc: linux-next, linux-kernel, Aleksey Makarov, Mika Westerberg
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
include/linux/acpi.h
between commit:
058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog")
from the pm tree and commit:
ad1696f6f09d ("ACPI: parse SPCR and enable matching console")
from the tty 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 include/linux/acpi.h
index 19e650c940b6,2353827731d2..000000000000
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -1093,10 -1074,10 +1093,16 @@@ void acpi_table_upgrade(void)
static inline void acpi_table_upgrade(void) { }
#endif
+#if defined(CONFIG_ACPI) && defined(CONFIG_ACPI_WATCHDOG)
+extern bool acpi_has_watchdog(void);
+#else
+static inline bool acpi_has_watchdog(void) { return false; }
+#endif
+
+ #ifdef CONFIG_ACPI_SPCR_TABLE
+ int parse_spcr(bool earlycon);
+ #else
+ static inline int parse_spcr(bool earlycon) { return 0; }
+ #endif
+
#endif /*_LINUX_ACPI_H*/
^ permalink raw reply
* linux-next: manual merge of the tty tree with the arm64 tree
From: Stephen Rothwell @ 2016-09-30 3:38 UTC (permalink / raw)
To: Greg KH, Catalin Marinas
Cc: linux-next, linux-kernel, Scott Wood, Will Deacon,
Aleksey Makarov
Hi Greg,
Today's linux-next merge of the tty tree got conflicts in:
arch/arm64/Kconfig
between commit:
1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso suitability")
from the arm64 tree and commit:
888125a71298 ("ARM64: ACPI: enable ACPI_SPCR_TABLE")
from the tty 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/arm64/Kconfig
index 17c14a1d9112,11a2d36b27ef..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -4,7 -4,7 +4,8 @@@ config ARM6
select ACPI_GENERIC_GSI if ACPI
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
select ACPI_MCFG if ACPI
+ select ACPI_SPCR_TABLE if ACPI
+ select ARCH_CLOCKSOURCE_DATA
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
^ permalink raw reply
* linux-next: manual merge of the tty tree with the v4l-dvb tree
From: Stephen Rothwell @ 2016-09-30 3:33 UTC (permalink / raw)
To: Greg KH, Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Songjun Wu, Nicolas Ferre
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
MAINTAINERS
between commit:
71fb2c74287d ("[media] MAINTAINERS: atmel-isc: add entry for Atmel ISC")
from the v4l-dvb tree and commit:
5615c3715749 ("MAINTAINERS: update entry for atmel_serial driver")
from the tty 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 MAINTAINERS
index 8c86c07409c8,4e2ae17c478e..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7848,14 -7745,12 +7843,20 @@@ T: git git://git.monstr.eu/linux-2.6-mi
S: Supported
F: arch/microblaze/
+ MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
+ M: Richard Genoud <richard.genoud@gmail.com>
+ S: Maintained
+ F: drivers/tty/serial/atmel_serial.c
+ F: include/linux/atmel_serial.h
+
+MICROCHIP / ATMEL ISC DRIVER
+M: Songjun Wu <songjun.wu@microchip.com>
+L: linux-media@vger.kernel.org
+S: Supported
+F: drivers/media/platform/atmel/atmel-isc.c
+F: drivers/media/platform/atmel/atmel-isc-regs.h
+F: devicetree/bindings/media/atmel-isc.txt
+
MICROSOFT SURFACE PRO 3 BUTTON DRIVER
M: Chen Yu <yu.c.chen@intel.com>
L: platform-driver-x86@vger.kernel.org
^ permalink raw reply
* Re: linux-next: Tree for Jul 21
From: Andy Lutomirski @ 2016-09-29 23:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Segher Boessenkool, Paul Gortmaker, linux-next@vger.kernel.org,
LKML, Andy Lutomirski, Ingo Molnar, Thomas Gleixner,
H. Peter Anvin, X86 ML
In-Reply-To: <20160930091456.0aacbbef@canb.auug.org.au>
On Thu, Sep 29, 2016 at 4:14 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Segher,
>
> [Adding more cc's]
>
> On Thu, 29 Sep 2016 14:34:42 -0500 Segher Boessenkool <segher@kernel.crashing.org> wrote:
>>
>> On Thu, Jul 21, 2016 at 07:52:43PM -0400, Paul Gortmaker wrote:
>> > 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
>>
>> This is caused by building on a BE (better-endian) host. See patch.
>>
>>
>> Segher
>>
>>
>> ===
>> From 7f098efa4d184ab1216c6cf8214c44a3abe50a14 Mon Sep 17 00:00:00 2001
>> Message-Id: <7f098efa4d184ab1216c6cf8214c44a3abe50a14.1475177310.git.segher@kernel.crashing.org>
>> From: Segher Boessenkool <segher@kernel.crashing.org>
>> Date: Thu, 29 Sep 2016 11:51:00 +0000
>> Subject: [PATCH] x86: Fix building on BE
>>
>> We need to call GET_LE to read hdr->e_type.
>>
>
> Fixes: 57f90c3dfc75 ("x86/vdso: Error out if the vDSO isn't a valid DSO")
>
>> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
>
> 57f90c3dfc75 was merged as part of the last merge window, so this is a
> fix for Linus' tree.
>
>> ---
>> arch/x86/entry/vdso/vdso2c.h | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h
>> index 4f74119..3dab75f 100644
>> --- a/arch/x86/entry/vdso/vdso2c.h
>> +++ b/arch/x86/entry/vdso/vdso2c.h
>> @@ -22,7 +22,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
>>
>> ELF(Phdr) *pt = (ELF(Phdr) *)(raw_addr + GET_LE(&hdr->e_phoff));
>>
>> - if (hdr->e_type != ET_DYN)
>> + if (GET_LE(&hdr->e_type) != ET_DYN)
>> fail("input is not a shared object\n");
Whoops!
Acked-by: Andy Lutomirski <luto@kernel.org>
>>
>> /* Walk the segment table. */
>> --
>> 1.9.3
>
> --
> Cheers,
> Stephen Rothwell
--
Andy Lutomirski
AMA Capital Management, LLC
^ permalink raw reply
* Re: linux-next: Tree for Jul 21
From: Stephen Rothwell @ 2016-09-29 23:14 UTC (permalink / raw)
To: Segher Boessenkool
Cc: Paul Gortmaker, linux-next@vger.kernel.org, LKML, Andy Lutomirski,
Ingo Molnar, Thomas Gleixner, H. Peter Anvin, x86
In-Reply-To: <20160929193442.GA16617@gate.crashing.org>
Hi Segher,
[Adding more cc's]
On Thu, 29 Sep 2016 14:34:42 -0500 Segher Boessenkool <segher@kernel.crashing.org> wrote:
>
> On Thu, Jul 21, 2016 at 07:52:43PM -0400, Paul Gortmaker wrote:
> > 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
>
> This is caused by building on a BE (better-endian) host. See patch.
>
>
> Segher
>
>
> ===
> From 7f098efa4d184ab1216c6cf8214c44a3abe50a14 Mon Sep 17 00:00:00 2001
> Message-Id: <7f098efa4d184ab1216c6cf8214c44a3abe50a14.1475177310.git.segher@kernel.crashing.org>
> From: Segher Boessenkool <segher@kernel.crashing.org>
> Date: Thu, 29 Sep 2016 11:51:00 +0000
> Subject: [PATCH] x86: Fix building on BE
>
> We need to call GET_LE to read hdr->e_type.
>
Fixes: 57f90c3dfc75 ("x86/vdso: Error out if the vDSO isn't a valid DSO")
> Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
57f90c3dfc75 was merged as part of the last merge window, so this is a
fix for Linus' tree.
> ---
> arch/x86/entry/vdso/vdso2c.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h
> index 4f74119..3dab75f 100644
> --- a/arch/x86/entry/vdso/vdso2c.h
> +++ b/arch/x86/entry/vdso/vdso2c.h
> @@ -22,7 +22,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
>
> ELF(Phdr) *pt = (ELF(Phdr) *)(raw_addr + GET_LE(&hdr->e_phoff));
>
> - if (hdr->e_type != ET_DYN)
> + if (GET_LE(&hdr->e_type) != ET_DYN)
> fail("input is not a shared object\n");
>
> /* Walk the segment table. */
> --
> 1.9.3
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: next-20160929 build: 2 failures 4 warnings (next-20160929)
From: Arnd Bergmann @ 2016-09-29 22:44 UTC (permalink / raw)
To: kernel-build-reports
Cc: Vishwanath Pai, Mark Brown, linaro-kernel, netdev, linux-next,
linux-arm-kernel, Joshua Hunt, Pablo Neira Ayuso
In-Reply-To: <57ED66CA.3090903@akamai.com>
On Thursday 29 September 2016, Vishwanath Pai wrote:
> I have sent a patch for this a couple of days ago to netdev, it hasn't
> made it to net-next yet. Here's the latest one:
>
> [PATCH net-next v3] netfilter: xt_hashlimit: Fix link error in 32bit
> arch because of 64bit division
>
> This should fix the link error.
I also did a patch (not submitted yet), but my solution used 32-bit
math for the version 1 case. I think that would be better so we
don't slow down 32-bit architectures too much (div_u64_u64
is very slow).
Arnd
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Rafael J. Wysocki @ 2016-09-29 20:50 UTC (permalink / raw)
To: Chen, Yu C
Cc: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, Denys Vlasenko
In-Reply-To: <36DF59CE26D8EE47B0655C516E9CE6405E617A77@shsmsx102.ccr.corp.intel.com>
On Thursday, September 29, 2016 03:54:24 PM Chen, Yu C wrote:
> Hi,
>
> > -----Original Message-----
> > From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> > Sent: Thursday, September 29, 2016 8:25 PM
> > To: Stephen Rothwell
> > Cc: Thomas Gleixner; Ingo Molnar; H. Peter Anvin; Peter Zijlstra; linux-
> > next@vger.kernel.org; linux-kernel@vger.kernel.org; Denys Vlasenko; Chen, Yu
> > C
> > Subject: Re: linux-next: build failure after merge of the tip tree
> >
> > On Thursday, September 29, 2016 01:20:07 PM Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > After merging the tip tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > arch/x86/power/hibernate_64.c: In function 'hibernation_e820_save':
> > > arch/x86/power/hibernate_64.c:236:15: error: passing argument 1 of
> > 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-
> > pointer-types]
> > > get_e820_md5(&e820_saved, buf);
> > > ^
> > > arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *'
> > but argument is of type 'struct e820map **'
> > > static int get_e820_md5(struct e820map *map, void *buf)
> > > ^
> > > arch/x86/power/hibernate_64.c: In function 'hibernation_e820_mismatch':
> > > arch/x86/power/hibernate_64.c:249:21: error: passing argument 1 of
> > 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-
> > pointer-types]
> > > ret = get_e820_md5(&e820_saved, result);
> > > ^
> > > arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *'
> > but argument is of type 'struct e820map **'
> > > static int get_e820_md5(struct e820map *map, void *buf)
> > > ^
> > >
> > > Caused by commit
> > >
> > > 475339684ef1 ("x86/e820: Prepare e280 code for switch to dynamic
> > > storage")
> > >
> > > interacting with commit
> > >
> > > 6f95ad2b6162 ("PM / hibernate: Verify e820 memory map by MD5
> > > digest")
> > >
> > > from the pm tree.
> > >
> > > I have applied the following merge fix patch:
> > >
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Thu, 29 Sep 2016 13:13:45 +1000
> > > Subject: [PATCH] pm/hibernate: merge fix for type of e820_saved
> > > changing
> > >
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > > arch/x86/power/hibernate_64.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/arch/x86/power/hibernate_64.c
> > > b/arch/x86/power/hibernate_64.c index 72f2c9531b03..904048f7a9c9
> > > 100644
> > > --- a/arch/x86/power/hibernate_64.c
> > > +++ b/arch/x86/power/hibernate_64.c
> > > @@ -233,7 +233,7 @@ static int get_e820_md5(struct e820map *map, void
> > > *buf)
> > >
> > > static void hibernation_e820_save(void *buf) {
> > > - get_e820_md5(&e820_saved, buf);
> > > + get_e820_md5(e820_saved, buf);
> > > }
> > >
> > > static bool hibernation_e820_mismatch(void *buf) @@ -246,7 +246,7 @@
> > > static bool hibernation_e820_mismatch(void *buf)
> > > if (!memcmp(result, buf, MD5_DIGEST_SIZE))
> > > return false;
> > >
> > > - ret = get_e820_md5(&e820_saved, result);
> > > + ret = get_e820_md5(e820_saved, result);
> > > if (ret)
> > > return true;
> > >
> > >
> >
> > Looks good to me, thanks Stephen!
> >
> > Rafael
> Thanks for the fix!
>
> I made a double check of the patch :
> "x86/e820: Prepare e280 code for switch to dynamic storage"
> It looks like this patch has reallocate the e820 & e820_save to their actual size:
> + size = offsetof(struct e820map, map) + sizeof(struct e820entry) * e820->nr_map;
> + n = kmalloc(size, GFP_KERNEL);
>
> however the previous patch to verify the md5 hash during hibernation will
> use the original e820_map structure by sizeof(struct e820map), which might
> read invalid value after the latest patch applied. I think I need to modify the
> hibernation e820 checking patch to only generate md5 digest based on the actual
> e820_save size by sizeof(struct e820entry) * e820->nr_map.
>
> I don't have a machine in hand now, will test later and give feedback later. Thanks again!
OK, dropping the hibernation patch for now.
I'll wait for an update on top of 4.9-rc1.
Thanks,
Rafael
^ permalink raw reply
* Re: linux-next: Tree for Jul 21
From: Segher Boessenkool @ 2016-09-29 19:34 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: Stephen Rothwell, linux-next@vger.kernel.org, LKML
In-Reply-To: <CAP=VYLoa6C1uFtuqEhqTw6fdjGrNhFCQyUv3FNNkOWH2m2kTDw@mail.gmail.com>
On Thu, Jul 21, 2016 at 07:52:43PM -0400, Paul Gortmaker wrote:
> 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
This is caused by building on a BE (better-endian) host. See patch.
Segher
===
>From 7f098efa4d184ab1216c6cf8214c44a3abe50a14 Mon Sep 17 00:00:00 2001
Message-Id: <7f098efa4d184ab1216c6cf8214c44a3abe50a14.1475177310.git.segher@kernel.crashing.org>
From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Thu, 29 Sep 2016 11:51:00 +0000
Subject: [PATCH] x86: Fix building on BE
We need to call GET_LE to read hdr->e_type.
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
---
arch/x86/entry/vdso/vdso2c.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h
index 4f74119..3dab75f 100644
--- a/arch/x86/entry/vdso/vdso2c.h
+++ b/arch/x86/entry/vdso/vdso2c.h
@@ -22,7 +22,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
ELF(Phdr) *pt = (ELF(Phdr) *)(raw_addr + GET_LE(&hdr->e_phoff));
- if (hdr->e_type != ET_DYN)
+ if (GET_LE(&hdr->e_type) != ET_DYN)
fail("input is not a shared object\n");
/* Walk the segment table. */
--
1.9.3
^ permalink raw reply related
* Re: next-20160929 build: 2 failures 4 warnings (next-20160929)
From: Vishwanath Pai @ 2016-09-29 19:08 UTC (permalink / raw)
To: Mark Brown
Cc: Joshua Hunt, Pablo Neira Ayuso, kernel-build-reports,
linaro-kernel, linux-next, netdev, linux-arm-kernel
In-Reply-To: <20160929184737.ragquwy2tmhxo5bn@sirena.org.uk>
On 09/29/2016 02:47 PM, Mark Brown wrote:
> On Thu, Sep 29, 2016 at 12:40:35PM +0100, Build bot for Mark Brown wrote:
>
> For the past couple of days -next has been failing to build an ARM
> allmodconfig due to:
>
>> arm-allmodconfig
>> ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
>
> which appears to be triggered by 11d5f15723c9 (netfilter: xt_hashlimit:
> Create revision 2 to support higher pps rates) introducing a division of
> a 64 bit number which should be done using do_div().
>
I have sent a patch for this a couple of days ago to netdev, it hasn't
made it to net-next yet. Here's the latest one:
[PATCH net-next v3] netfilter: xt_hashlimit: Fix link error in 32bit
arch because of 64bit division
This should fix the link error.
-Vishwanath
^ permalink raw reply
* Re: next-20160929 build: 2 failures 4 warnings (next-20160929)
From: Mark Brown @ 2016-09-29 18:47 UTC (permalink / raw)
To: Vishwanath Pai, Joshua Hunt, Pablo Neira Ayuso
Cc: kernel-build-reports, linaro-kernel, linux-next, netdev,
linux-arm-kernel
In-Reply-To: <E1bpZhb-0002Oz-OQ@optimist>
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
On Thu, Sep 29, 2016 at 12:40:35PM +0100, Build bot for Mark Brown wrote:
For the past couple of days -next has been failing to build an ARM
allmodconfig due to:
> arm-allmodconfig
> ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
which appears to be triggered by 11d5f15723c9 (netfilter: xt_hashlimit:
Create revision 2 to support higher pps rates) introducing a division of
a 64 bit number which should be done using do_div().
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply
* RE: linux-next: build failure after merge of the tip tree
From: Chen, Yu C @ 2016-09-29 15:54 UTC (permalink / raw)
To: Rafael J. Wysocki, Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Denys Vlasenko
In-Reply-To: <4057532.rZT5v6PsDv@vostro.rjw.lan>
Hi,
> -----Original Message-----
> From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> Sent: Thursday, September 29, 2016 8:25 PM
> To: Stephen Rothwell
> Cc: Thomas Gleixner; Ingo Molnar; H. Peter Anvin; Peter Zijlstra; linux-
> next@vger.kernel.org; linux-kernel@vger.kernel.org; Denys Vlasenko; Chen, Yu
> C
> Subject: Re: linux-next: build failure after merge of the tip tree
>
> On Thursday, September 29, 2016 01:20:07 PM Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the tip tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > arch/x86/power/hibernate_64.c: In function 'hibernation_e820_save':
> > arch/x86/power/hibernate_64.c:236:15: error: passing argument 1 of
> 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-
> pointer-types]
> > get_e820_md5(&e820_saved, buf);
> > ^
> > arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *'
> but argument is of type 'struct e820map **'
> > static int get_e820_md5(struct e820map *map, void *buf)
> > ^
> > arch/x86/power/hibernate_64.c: In function 'hibernation_e820_mismatch':
> > arch/x86/power/hibernate_64.c:249:21: error: passing argument 1 of
> 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-
> pointer-types]
> > ret = get_e820_md5(&e820_saved, result);
> > ^
> > arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *'
> but argument is of type 'struct e820map **'
> > static int get_e820_md5(struct e820map *map, void *buf)
> > ^
> >
> > Caused by commit
> >
> > 475339684ef1 ("x86/e820: Prepare e280 code for switch to dynamic
> > storage")
> >
> > interacting with commit
> >
> > 6f95ad2b6162 ("PM / hibernate: Verify e820 memory map by MD5
> > digest")
> >
> > from the pm tree.
> >
> > I have applied the following merge fix patch:
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Thu, 29 Sep 2016 13:13:45 +1000
> > Subject: [PATCH] pm/hibernate: merge fix for type of e820_saved
> > changing
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > arch/x86/power/hibernate_64.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/x86/power/hibernate_64.c
> > b/arch/x86/power/hibernate_64.c index 72f2c9531b03..904048f7a9c9
> > 100644
> > --- a/arch/x86/power/hibernate_64.c
> > +++ b/arch/x86/power/hibernate_64.c
> > @@ -233,7 +233,7 @@ static int get_e820_md5(struct e820map *map, void
> > *buf)
> >
> > static void hibernation_e820_save(void *buf) {
> > - get_e820_md5(&e820_saved, buf);
> > + get_e820_md5(e820_saved, buf);
> > }
> >
> > static bool hibernation_e820_mismatch(void *buf) @@ -246,7 +246,7 @@
> > static bool hibernation_e820_mismatch(void *buf)
> > if (!memcmp(result, buf, MD5_DIGEST_SIZE))
> > return false;
> >
> > - ret = get_e820_md5(&e820_saved, result);
> > + ret = get_e820_md5(e820_saved, result);
> > if (ret)
> > return true;
> >
> >
>
> Looks good to me, thanks Stephen!
>
> Rafael
Thanks for the fix!
I made a double check of the patch :
"x86/e820: Prepare e280 code for switch to dynamic storage"
It looks like this patch has reallocate the e820 & e820_save to their actual size:
+ size = offsetof(struct e820map, map) + sizeof(struct e820entry) * e820->nr_map;
+ n = kmalloc(size, GFP_KERNEL);
however the previous patch to verify the md5 hash during hibernation will
use the original e820_map structure by sizeof(struct e820map), which might
read invalid value after the latest patch applied. I think I need to modify the
hibernation e820 checking patch to only generate md5 digest based on the actual
e820_save size by sizeof(struct e820entry) * e820->nr_map.
I don't have a machine in hand now, will test later and give feedback later. Thanks again!
Yu
^ permalink raw reply
* Re: linux-next: build failure after merge of the tip tree
From: Rafael J. Wysocki @ 2016-09-29 12:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Denys Vlasenko, Chen Yu
In-Reply-To: <20160929132007.4fa85f3a@canb.auug.org.au>
On Thursday, September 29, 2016 01:20:07 PM Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> arch/x86/power/hibernate_64.c: In function 'hibernation_e820_save':
> arch/x86/power/hibernate_64.c:236:15: error: passing argument 1 of 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-pointer-types]
> get_e820_md5(&e820_saved, buf);
> ^
> arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but argument is of type 'struct e820map **'
> static int get_e820_md5(struct e820map *map, void *buf)
> ^
> arch/x86/power/hibernate_64.c: In function 'hibernation_e820_mismatch':
> arch/x86/power/hibernate_64.c:249:21: error: passing argument 1 of 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-pointer-types]
> ret = get_e820_md5(&e820_saved, result);
> ^
> arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but argument is of type 'struct e820map **'
> static int get_e820_md5(struct e820map *map, void *buf)
> ^
>
> Caused by commit
>
> 475339684ef1 ("x86/e820: Prepare e280 code for switch to dynamic storage")
>
> interacting with commit
>
> 6f95ad2b6162 ("PM / hibernate: Verify e820 memory map by MD5 digest")
>
> from the pm tree.
>
> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 29 Sep 2016 13:13:45 +1000
> Subject: [PATCH] pm/hibernate: merge fix for type of e820_saved changing
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/x86/power/hibernate_64.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
> index 72f2c9531b03..904048f7a9c9 100644
> --- a/arch/x86/power/hibernate_64.c
> +++ b/arch/x86/power/hibernate_64.c
> @@ -233,7 +233,7 @@ static int get_e820_md5(struct e820map *map, void *buf)
>
> static void hibernation_e820_save(void *buf)
> {
> - get_e820_md5(&e820_saved, buf);
> + get_e820_md5(e820_saved, buf);
> }
>
> static bool hibernation_e820_mismatch(void *buf)
> @@ -246,7 +246,7 @@ static bool hibernation_e820_mismatch(void *buf)
> if (!memcmp(result, buf, MD5_DIGEST_SIZE))
> return false;
>
> - ret = get_e820_md5(&e820_saved, result);
> + ret = get_e820_md5(e820_saved, result);
> if (ret)
> return true;
>
>
Looks good to me, thanks Stephen!
Rafael
^ permalink raw reply
* next-20160929 build: 2 failures 4 warnings (next-20160929)
From: Build bot for Mark Brown @ 2016-09-29 11:40 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160929
Git describe: next-20160929
Commit: 136afaa263 Add linux-next specific files for 20160929
Build Time: 131 min 35 sec
Passed: 8 / 10 ( 80.00 %)
Failed: 2 / 10 ( 20.00 %)
Errors: 2
Warnings: 4
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
Errors:
arm64-allmodconfig
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
arm-allmodconfig
ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
1 warnings 0 mismatches : arm64-allmodconfig
6 warnings 0 mismatches : arm-multi_v5_defconfig
6 warnings 0 mismatches : arm-multi_v7_defconfig
3 warnings 0 mismatches : arm-allmodconfig
3 warnings 0 mismatches : arm-multi_v4t_defconfig
3 warnings 0 mismatches : arm-allnoconfig
-------------------------------------------------------------------------------
Errors summary: 2
2 ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
1 ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
Warnings Summary: 4
7 <stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
7 <stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
7 <stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
1 ../include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 1 errors, 1 warnings, 0 section mismatches
Errors:
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
../include/linux/kernel.h:739:16: warning: comparison of distinct pointer types lacks a cast
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 6 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 2 errors, 3 warnings, 0 section mismatches
Errors:
ERROR: "__aeabi_uldivmod" [net/netfilter/xt_hashlimit.ko] undefined!
ERROR: "irq_set_parent" [drivers/mfd/tps65217.ko] undefined!
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v4t_defconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1316:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp]
<stdin>:1319:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp]
<stdin>:1322:2: warning: #warning syscall pkey_free not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm64-allnoconfig
x86_64-defconfig
arm64-defconfig
^ permalink raw reply
* Re: linux-next: Tree for Sep 28 (drivers/gpu/drm/amd/amdgpu/amdgpu.ko)
From: Christian König @ 2016-09-29 7:27 UTC (permalink / raw)
To: Deucher, Alexander, 'Randy Dunlap', Stephen Rothwell,
linux-next@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, dri-devel, Koenig, Christian
In-Reply-To: <MWHPR12MB1694FDEF1A23DC7231AD5834F7CF0@MWHPR12MB1694.namprd12.prod.outlook.com>
[-- Attachment #1.1: Type: text/plain, Size: 998 bytes --]
Am 28.09.2016 um 22:46 schrieb Deucher, Alexander:
>> -----Original Message-----
>> From: Randy Dunlap [mailto:rdunlap@infradead.org]
>> Sent: Wednesday, September 28, 2016 1:10 PM
>> To: Stephen Rothwell; linux-next@vger.kernel.org
>> Cc: linux-kernel@vger.kernel.org; dri-devel; Deucher, Alexander; Koenig,
>> Christian
>> Subject: Re: linux-next: Tree for Sep 28
>> (drivers/gpu/drm/amd/amdgpu/amdgpu.ko)
>>
>> On 09/27/16 23:56, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20160927:
>>>
>> on i386:
>>
>> ERROR: "amd_set_clockgating_by_smu"
>> [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>>
> DRM_AMD_POWERPLAY needs to be set. Fixed in the attached patch.
Patch is Reviewed-by: Christian König <christian.koenig@amd.com>.
>
> Alex
>
>> Full randconfig file is attached.
>>
>> --
>> ~Randy
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
[-- Attachment #1.2: Type: text/html, Size: 2397 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply
* linux-next: Tree for Sep 29
From: Stephen Rothwell @ 2016-09-29 6:32 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160928:
The xtensa tree gained a conflict against Linus' tree.
The tip tree gained a conflict against the vfs tree and a build failure
due to an interaction with the pm tree for which I added a merge fix
patch.
Non-merge commits (relative to Linus' tree): 13043
9796 files changed, 537508 insertions(+), 295801 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 243 trees (counting Linus' and 34 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 (ae6dd8d61913 Merge tag 'for-linus-20160928' of git://git.infradead.org/linux-mtd)
Merging fixes/master (d3396e1e4ec4 Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
Merging arc-current/for-curr (3eab887a5542 Linux 4.8-rc4)
Merging arm-current/fixes (1a57c286d8ce ARM: pxa/lubbock: add pcmcia clock)
Merging m68k-current/for-linus (6bd80f372371 m68k/defconfig: Update defconfigs for v4.7-rc2)
Merging metag-fixes/fixes (97b1d23f7bcb metag: Drop show_mem() from mem_init())
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment)
Merging sparc/master (ebb99a4c12e4 sparc64: Fix irq stack bootmem allocation.)
Merging net/master (7b8147aae741 Merge branch 'act_ife-fixes')
Merging ipsec/master (b1f2beb87bb0 Merge tag 'media/v4.8-7' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media)
Merging netfilter/master (440f895aa97f drivers: net: phy: xgene: Fix 'remove' function)
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (db64c5fa590b Merge tag 'iwlwifi-for-kalle-2016-09-15' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (7ac327318e09 Merge tag 'mac80211-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
Merging sound-current/for-linus (0eec880966e7 ALSA: hda - Add the top speaker pin config for HP Spectre x360)
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
Merging driver-core.current/driver-core-linus (c6935931c189 Linux 4.8-rc5)
Merging tty.current/tty-linus (c6935931c189 Linux 4.8-rc5)
Merging usb.current/usb-linus (3be7988674ab Linux 4.8-rc7)
Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f3c4fb6d05e usb: chipidea: udc: fix NULL ptr dereference in isr_setup_status_phase)
Merging staging.current/staging-linus (9395452b4aab Linux 4.8-rc6)
Merging char-misc.current/char-misc-linus (c6935931c189 Linux 4.8-rc5)
Merging input-current/for-linus (9fb6de1b0bf4 Input: joydev - recognize devices with Z axis as joysticks)
Merging crypto-current/master (0cf43f509f72 crypto: rsa-pkcs1pad - Handle leading zero for decryption)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
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 (08895a8b6b06 Linux 4.8-rc8)
Merging kbuild/for-next (f29ca38b6dd4 ppc: there is no clear_pages to export)
CONFLICT (content): Merge conflict in arch/Kconfig
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
Merging arc/for-next (bdb783677531 ARC: CONFIG_NODES_SHIFT fix default values)
Merging arm/for-next (cebdc42a4a9d Merge branch 'sa1111' into for-next)
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
Merging arm-soc/for-next (d54dae3d6ebd Merge branch 'next/dt' into for-next)
Merging pinctrl/for-next (8d0a0ac0abcd Merge branch 'fixes' into devel)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' 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 (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' 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 (ea24fc2674ef Merge branch 'next/dt' into for-next)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
Merging arm64/for-next/core (0c2a6cce1776 arm64: Kconfig: select OF/ACPI_NUMA under NUMA config)
CONFLICT (content): Merge conflict in drivers/perf/arm_pmu.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/head.S
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 (2dc024e94578 cris: return of class_create should be considered)
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
Merging m68k/for-next (f5e14739ed35 CREDITS: Update fingerprint for Geert Uytterhoeven)
Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL)
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (e0950d623b5f Merge branch '4.8-fixes' into mips-for-linux-next)
Merging nios2/for-next (65f836ae4de0 nios2: use of_property_read_bool)
Merging parisc-hd/for-next (92420bd0d01f parisc: Fix self-detected CPU stall warnings on Mako machines)
Merging powerpc/next (c762c69e106f powerpc/boot: Add support for XZ compression)
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_64.S
CONFLICT (content): Merge conflict in arch/powerpc/kernel/misc_32.S
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (871f8bf0c477 s390/dasd: add missing \n to end of dev_err messages)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
Merging xtensa/xtensa-for-next (5b8b3c860ba4 xtensa: add default memmap and mmio32native options to defconfigs)
CONFLICT (content): Merge conflict in arch/xtensa/kernel/setup.c
Merging befs/for-next (58d08821eaa7 befs: befs: fix style issues in datastream.c)
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
Merging btrfs-kdave/for-next (819d18cf0d4a Merge branch 'for-next-next-4.9-20160927' into for-next-20160927)
Merging ceph/master (0276dca6c1ec rbd: add force close option)
Merging cifs/for-next (659f6f19d311 SMB3: Add mount parameter to allow user to override max credits)
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
Merging ecryptfs/next (2bdcdbea80bd ecryptfs: don't allow mmap when the lower fs doesn't support it)
Merging ext3/for_next (225c5161b118 ext2: Unmap metadata when zeroing blocks)
Merging ext4/dev (e36767750532 blockgroup_lock.h: simplify definition of NR_BG_LOCKS)
Merging f2fs/dev (ceec080a4b12 f2fs: remove redundant io plug)
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
Merging fuse/for-next (8d75c710a416 fuse: don't use fuse_ioctl_copy_user() helper)
Merging gfs2/for-next (332f51d7db13 gfs2: Initialize atime of I_NEW inodes)
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
Merging nfsd/nfsd-next (81e6ed5c87c7 nfs: fix false positives in nfs40_walk_client_list())
Merging orangefs/for-next (a21aae3bb15a Merge tag 'for-hubcap-v4.9-readahead' of git://github.com/martinbrandenburg/linux)
Merging overlayfs/overlayfs-next (6a45b3628ce4 ovl: Fix info leak in ovl_lookup_temp())
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (17ce1eb0b64e ubifs: Fix xattr generic handler usage)
Merging xfs/for-next (2e405cda91ca Merge branch 'xfs-4.9-log-recovery-fixes' into for-next)
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
Merging vfs/for-next (6731cb0ff068 Merge vfs-jk into for-next)
CONFLICT (content): Merge conflict in fs/fuse/dir.c
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
Merging vfs-miklos/next (afdf410d53e0 Merge branch 'pipeops' into next)
Merging pci/next (c4315f4b5ddc Merge branch 'pci/msi' into next)
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
Merging hid/for-next (6d6df1778cd5 Merge branch 'for-4.9/alps' into for-next)
Merging i2c/i2c/for-next (7cbca2b38734 Merge branch 'i2c/for-4.9' into i2c/for-next)
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
Merging dmi/master (0deb6b2c087a dmi-id: don't free dev structure after calling device_register)
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
Merging jc_docs/docs-next (17e9217d41e1 Merge branch 'doc/4.9' into docs-next)
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
Merging pm/linux-next (37d006ecd366 Merge branch 'pnp' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (1876b0a39af2 Merge branches 'release' and 'for-rc' into next)
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
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 net-next/master (7836667cec5e net: do not export sk_stream_write_space)
CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/genet/bcmgenet.c
Merging ipsec-next/master (c2f672fc9464 xfrm: state lookup can be lockless)
Merging netfilter-next/master (f20fbc0717f9 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
Applying: netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignment"
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
Merging wireless-drivers-next/master (15b95a159502 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
Merging bluetooth/master (fe68bc4ee615 Bluetooth: btusb: add entry for Marvell 8997 chipset)
Merging mac80211-next/master (8564e38206de cfg80211: add checks for beacon rate, extend to mesh)
Merging rdma/for-next (5603910b1074 Merge branches 'workqueue', '4.9-ioctl' and '4.9-rkey-v2' into k.o/for-4.9)
Applying: starging/lustre: disable LNET infiniband support
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
Merging mtd/master (f6d7c1b5598b mtd: nand: davinci: Reinitialize the HW ECC engine in 4bit hwctl)
Merging l2-mtd/master (5e149073ba42 mtdpart: Propagate _get/put_device())
Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources)
Merging crypto/master (5ecf8ef9103c crypto: caam - fix sg dump)
Merging drm/drm-next (c0d5fb4d0d92 Merge tag 'drm-qemu-20160921' of git://git.kraxel.org/linux into drm-next)
CONFLICT (content): Merge conflict in Documentation/gpu/index.rst
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
Merging drm-intel/for-linux-next (7d7f8633a827 drm/i915: Allow PCH DPLL sharing regardless of DPLL_SDVO_HIGH_SPEED)
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
Merging drm-misc/topic/drm-misc (ea568478ad07 drm/i915: Put "cooked" vlank counters in frame CRC lines)
Merging drm-exynos/exynos-drm/for-next (3a87f9383457 drm/exynos: fix pending update handling)
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_drv.c
Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
Merging regmap/for-next (ca4c3b36769f Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next)
Merging sound/for-next (8da08ca03b73 ALSA: usb-line6: use the same declaration as definition in header for MIDI manufacturer ID)
Merging sound-asoc/for-next (61c63b64b36a Merge remote-tracking branches 'asoc/topic/ux500', 'asoc/topic/wm8960', 'asoc/topic/wm8962' and 'asoc/topic/wm8991' into asoc-next)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
Merging input/next (d095c500fd79 Input: snvs_pwrkey - drop input_free_device call if input_register_device fails)
Merging block/for-next (69a83f9cc81e Merge branch 'for-4.9/block' into for-next)
Merging lightnvm/for-next (1a6fe74dfd1b nvme: Pass pointers, not dma addresses, to nvme_get/set_features())
Merging device-mapper/for-next (7cd326747f46 dm bufio: remove dm_bufio_cond_resched())
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (0f75c404503c mmc: dw_mmc: remove the deprecated "supports-highspeed" property)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (099b548c4292 raid6/test/test.c: bug fix: Specify aligned(alignment) attributes to the char arrays)
CONFLICT (content): Merge conflict in include/linux/raid/pq.h
Merging mfd/for-mfd-next (bd982237e0d6 mfd: arizona: Handle probe deferral for reset GPIO)
Merging backlight/for-backlight-next (602553073892 backlight: lp855x: Add enable regulator)
Merging battery/for-next (bb1e41ba324f power: reset: st: Remove obsolete platforms from dt doc)
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
Merging regulator/for-next (b2de85634be3 Merge remote-tracking branch 'regulator/topic/tps80031' into regulator-next)
Merging security/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
Merging selinux/next (9b6a9ecc2d88 selinux: fix error return code in policydb_read())
Merging tpmdd/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
Merging watchdog/master (7dd2ce7c91bd watchdog: st_wdt: Remove support for obsolete platforms)
Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
Merging vfio/next (c93a97ee0583 vfio-pci: Disable INTx after MSI/X teardown)
Merging trivial/for-next (34df117414d7 fat: fix error message for bogus number of directory entries)
Merging audit/next (fa2bea2f5cca audit: consistently record PIDs with task_tgid_nr())
Merging devicetree/for-next (f94277af03ea of/platform: Initialise dev->fwnode appropriately)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
Merging spi/for-next (b9af8977c238 Merge remote-tracking branches 'spi/topic/ti-qspi', 'spi/topic/tools', 'spi/topic/txx9' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (56c1bc3e0562 Merge branch 'x86/apic' into auto-latest)
CONFLICT (content): Merge conflict in include/linux/jump_label.h
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in arch/x86/lib/memcpy_64.S
CONFLICT (modify/delete): arch/x86/kernel/x8664_ksyms_64.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/x86/kernel/x8664_ksyms_64.c left in tree.
$ git rm -f arch/x86/kernel/x8664_ksyms_64.c
Applying: cpufreq: merge fix for type of cpufreq_offline changing
Applying: pm/hibernate: merge fix for type of e820_saved changing
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 (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling)
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
CONFLICT (content): Merge conflict in kernel/trace/trace_functions_graph.c
CONFLICT (content): Merge conflict in include/linux/ftrace.h
Merging rcu/rcu/next (bf9b45a60458 torture: Prevent jitter from delaying build-only runs)
Merging kvm/linux-next (adad0d02a7d3 kvm: svm: fix unsigned compare less than zero comparison)
Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
CONFLICT (content): Merge conflict in arch/arm/include/asm/arch_gicv3.h
Merging kvm-mips/next (397fc7ecb8e1 KVM: MIPS: Drop dubious EntryHi optimisation)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
Merging xen-tip/linux-next (4f0fbdf22e73 xen/grant-table: Use kmalloc_array() in arch_gnttab_valloc())
Merging percpu/for-next (799bc3c51b2b percpu: eliminate two sparse warnings)
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
Merging drivers-x86/for-next (b5643539b825 platform/x86: asus-wmi: Filter buggy scan codes on ASUS Q500A)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
CONFLICT (content): Merge conflict in MAINTAINERS
Merging ipmi/for-next (76f33d5ca12e ipmi/bt-bmc: add a dependency on ARCH_ASPEED)
Merging driver-core/driver-core-next (e7604239c1c5 MAINTAINERS: extend firmware_class maintainer list)
Merging tty/tty-next (094a32626f90 Revert "drivers/tty: Explicitly pass current to show_stack")
Merging usb/usb-next (ab21b63e8aed Revert "usbtmc: convert to devm_kzalloc")
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
Merging usb-chipidea-next/ci-for-usb-next (e74e83724808 usb: chipidea: udc: Use the preferred form for passing a size of a struct)
Merging staging/staging-next (88638cf1a8c3 staging: greybus: Add backup maintainer for Greybus audio)
CONFLICT (content): Merge conflict in drivers/staging/octeon/ethernet-mdio.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in MAINTAINERS
Merging char-misc/char-misc-next (c9fef1cc3dd3 drivers/misc/hpilo: Changes to support new security states in iLO5 FW)
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
Merging slave-dma/next (34debaa38852 Merge branch 'topic/compile_test' into next)
Merging cgroup/for-next (353b02cb7084 Merge branch 'for-4.8-fixes' into for-next)
Merging scsi/for-next (ce50b74722ef Merge branch 'misc' into for-next)
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging libata/for-next (6568bba8c0e3 Merge branch 'for-4.9' into for-next)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (c2da060a2d88 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
Merging gpio/for-next (e3296f19c862 gpio: Added zynq specific check for special pins on bank zero)
CONFLICT (content): Merge conflict in drivers/gpio/gpio-pca953x.c
CONFLICT (content): Merge conflict in drivers/gpio/gpio-mxc.c
CONFLICT (content): Merge conflict in arch/arm64/Kconfig.platforms
CONFLICT (modify/delete): arch/arm/mach-omap2/board-rx51-peripherals.c deleted in HEAD and modified in gpio/for-next. Version gpio/for-next of arch/arm/mach-omap2/board-rx51-peripherals.c left in tree.
$ git rm -f arch/arm/mach-omap2/board-rx51-peripherals.c
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Merging userns/for-next (2ed6afdee798 netns: move {inc,dec}_net_namespaces into #ifdef)
CONFLICT (content): Merge conflict in include/linux/sysctl.h
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support)
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (a67cd5482f37 tools: move pcmcia crc32hash tool from Documentation)
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
CONFLICT (content): Merge conflict in fs/afs/main.c
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
Merging coresight/next (6015bb25e7b3 coresight: stm: return error code instead of zero in .packet())
Merging rtc/rtc-next (00f7f90c51df rtc: cmos: avoid unused function warning)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (371a2fbecadd Merge branch 'for-4.9/dax' into libnvdimm-for-next)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
Merging akpm-current/current (5f50d812363e ipc-msg-avoid-waking-sender-upon-full-queue-checkpatch-fixes)
CONFLICT (content): Merge conflict in include/linux/relay.h
CONFLICT (content): Merge conflict in arch/powerpc/kernel/Makefile
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Applying: include/linux/mlx5/device.h: kill BUILD_BUG_ON()s
Applying: kdump, vmcoreinfo: report memory sections virtual addresses
Applying: mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
Applying: scripts/tags.sh: enable code completion in VIM
Applying: kthread: add kerneldoc for kthread_create()
Applying: hung_task: allow hung_task_panic when hung_task_warnings is 0
Applying: hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
Applying: treewide: remove redundant #include <linux/kconfig.h>
Merging akpm/master (ec7ac65e4069 treewide: remove redundant #include <linux/kconfig.h>)
^ permalink raw reply
* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2016-09-29 3:20 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Rafael J. Wysocki
Cc: linux-next, linux-kernel, Denys Vlasenko
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
arch/x86/power/hibernate_64.c: In function 'hibernation_e820_save':
arch/x86/power/hibernate_64.c:236:15: error: passing argument 1 of 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-pointer-types]
get_e820_md5(&e820_saved, buf);
^
arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but argument is of type 'struct e820map **'
static int get_e820_md5(struct e820map *map, void *buf)
^
arch/x86/power/hibernate_64.c: In function 'hibernation_e820_mismatch':
arch/x86/power/hibernate_64.c:249:21: error: passing argument 1 of 'get_e820_md5' from incompatible pointer type [-Werror=incompatible-pointer-types]
ret = get_e820_md5(&e820_saved, result);
^
arch/x86/power/hibernate_64.c:203:12: note: expected 'struct e820map *' but argument is of type 'struct e820map **'
static int get_e820_md5(struct e820map *map, void *buf)
^
Caused by commit
475339684ef1 ("x86/e820: Prepare e280 code for switch to dynamic storage")
interacting with commit
6f95ad2b6162 ("PM / hibernate: Verify e820 memory map by MD5 digest")
from the pm tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Sep 2016 13:13:45 +1000
Subject: [PATCH] pm/hibernate: merge fix for type of e820_saved changing
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/x86/power/hibernate_64.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index 72f2c9531b03..904048f7a9c9 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -233,7 +233,7 @@ static int get_e820_md5(struct e820map *map, void *buf)
static void hibernation_e820_save(void *buf)
{
- get_e820_md5(&e820_saved, buf);
+ get_e820_md5(e820_saved, buf);
}
static bool hibernation_e820_mismatch(void *buf)
@@ -246,7 +246,7 @@ static bool hibernation_e820_mismatch(void *buf)
if (!memcmp(result, buf, MD5_DIGEST_SIZE))
return false;
- ret = get_e820_md5(&e820_saved, result);
+ ret = get_e820_md5(e820_saved, result);
if (ret)
return true;
--
2.8.1
--
Cheers,
Stephen Rothwell
^ permalink raw reply related
* linux-next: manual merge of the tip tree with the vfs tree
From: Stephen Rothwell @ 2016-09-29 2:57 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Al Viro
Cc: linux-next, linux-kernel, Paul Gortmaker
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/mm/fault.c
between commit:
df720ac12fc7 ("exceptions: detritus removal")
from the vfs tree and commit:
744c193eb9a2 ("x86: Migrate exception table users off module.h and onto extable.h")
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 arch/x86/mm/fault.c
index c0413d5541af,4dc13340653e..000000000000
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -5,7 -5,7 +5,7 @@@
*/
#include <linux/sched.h> /* test_thread_flag(), ... */
#include <linux/kdebug.h> /* oops_begin/end, ... */
- #include <linux/module.h> /* search_exception_tables */
-#include <linux/extable.h> /* search_exception_table */
++#include <linux/extable.h> /* search_exception_tables */
#include <linux/bootmem.h> /* max_low_pfn */
#include <linux/kprobes.h> /* NOKPROBE_SYMBOL, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
^ permalink raw reply
* Re: linux-next: manual merge of the netfilter-next tree with the net tree
From: Stephen Rothwell @ 2016-09-29 1:20 UTC (permalink / raw)
To: Pablo Neira Ayuso, NetFilter, David Miller, Networking
Cc: linux-next, linux-kernel, Liping Zhang
In-Reply-To: <20160913101250.0ffee30f@canb.auug.org.au>
Hi all,
On Tue, 13 Sep 2016 10:12:50 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the netfilter-next tree got a conflict in:
>
> net/netfilter/nf_tables_netdev.c
>
> between commit:
>
> c73c24849011 ("netfilter: nf_tables_netdev: remove redundant ip_hdr assignment")
>
> from the net tree and commit:
>
> ddc8b6027ad0 ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()")
>
> from the netfilter-next tree.
>
> I fixed it up (I used the latter version of this file and applied the
> patch 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 13 Sep 2016 10:08:58 +1000
> Subject: [PATCH] netfilter: merge fixup for "nf_tables_netdev: remove
> redundant ip_hdr assignment"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/net/netfilter/nf_tables_ipv4.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/net/netfilter/nf_tables_ipv4.h b/include/net/netfilter/nf_tables_ipv4.h
> index 968f00b82fb5..25e33aee91e7 100644
> --- a/include/net/netfilter/nf_tables_ipv4.h
> +++ b/include/net/netfilter/nf_tables_ipv4.h
> @@ -33,7 +33,6 @@ __nft_set_pktinfo_ipv4_validate(struct nft_pktinfo *pkt,
> if (!iph)
> return -1;
>
> - iph = ip_hdr(skb);
> if (iph->ihl < 5 || iph->version != 4)
> return -1;
>
> --
> 2.8.1
The above merge fix patch is now needed when the net-next tree is
merged with Linus' tree.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: manual merge of the xtensa tree with Linus' tree
From: Stephen Rothwell @ 2016-09-29 0:01 UTC (permalink / raw)
To: Max Filippov; +Cc: linux-next, linux-kernel, Kefeng Wang, Rob Herring
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/kernel/setup.c
between commits:
69d99e6c0d62 ("xtensa: Remove unnecessary of_platform_populate with default match table")
e973f4ec130a ("xtensa: Partially Revert "xtensa: Remove unnecessary of_platform_populate with default match table"")
from Linus' tree and commit:
205ad548a742 ("xtensa: rearrange CCOUNT calibration")
from the xtensa 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/xtensa/kernel/setup.c
index 143251ede897,d61c8468abea..000000000000
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@@ -252,14 -246,14 +245,6 @@@ void __init early_init_devtree(void *pa
strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
}
--static int __init xtensa_device_probe(void)
--{
- of_clk_init(NULL);
- of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-- return 0;
--}
--
--device_initcall(xtensa_device_probe);
--
#endif /* CONFIG_OF */
/*
^ permalink raw reply
* Re: Please add xtensa arch tree to the linux-next
From: Stephen Rothwell @ 2016-09-28 22:12 UTC (permalink / raw)
To: Max Filippov; +Cc: Linux-Next, Chris Zankel, Marc Gauthier
In-Reply-To: <CAMo8BfJ88XK=PAmgTGt0fBm+pm=17BF7G6wva-4LNOjYBMMqew@mail.gmail.com>
Hi Max,
On Wed, 28 Sep 2016 13:59:31 -0700 Max Filippov <jcmvbkbc@gmail.com> wrote:
>
> can you please add the following branch with xtensa architecture-specific
> patches to linux-next:
>
> git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
>
> in replacement of the branch from Chris?
Done from today.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgement of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the rdma tree
From: Stephen Rothwell @ 2016-09-28 21:45 UTC (permalink / raw)
To: Doug Ledford
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig, Greg KH, Oleg Drokin, Andreas Dilger
In-Reply-To: <57EBDAFB.9060204@redhat.com>
Hi Doug,
On Wed, 28 Sep 2016 11:00:11 -0400 Doug Ledford <dledford@redhat.com> wrote:
>
> That doesn't seem like a particularly good thing to put in. Wouldn't
> you end up just reverting it later when they fix lustre? And are you
> going to revert the revert when it breaks again and revert the revert of
> the revert when it's fixed again? That just seems a lot of churn. I
> thought it was generally accepted that things in staging might or might
> not work and if they don't, we don't care? Am I wrong on that?
The allmodconfig build needs to work. Linus does an allmodconfig build
as part of his testing ...
Part of the fix patch should reenable building of the currently broken code.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Please add xtensa arch tree to the linux-next
From: Max Filippov @ 2016-09-28 20:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next, Chris Zankel, Marc Gauthier
Hi Stephen,
can you please add the following branch with xtensa architecture-specific
patches to linux-next:
git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
in replacement of the branch from Chris?
--
Thanks.
-- Max
^ permalink raw reply
* RE: linux-next: Tree for Sep 28 (drivers/gpu/drm/amd/amdgpu/amdgpu.ko)
From: Deucher, Alexander @ 2016-09-28 20:46 UTC (permalink / raw)
To: 'Randy Dunlap', Stephen Rothwell,
linux-next@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, dri-devel, Koenig, Christian
In-Reply-To: <f5495e73-ea11-cab0-5d0a-df4567a086b6@infradead.org>
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
> -----Original Message-----
> From: Randy Dunlap [mailto:rdunlap@infradead.org]
> Sent: Wednesday, September 28, 2016 1:10 PM
> To: Stephen Rothwell; linux-next@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org; dri-devel; Deucher, Alexander; Koenig,
> Christian
> Subject: Re: linux-next: Tree for Sep 28
> (drivers/gpu/drm/amd/amdgpu/amdgpu.ko)
>
> On 09/27/16 23:56, Stephen Rothwell wrote:
> > Hi all,
> >
> > Changes since 20160927:
> >
>
> on i386:
>
> ERROR: "amd_set_clockgating_by_smu"
> [drivers/gpu/drm/amd/amdgpu/amdgpu.ko] undefined!
>
DRM_AMD_POWERPLAY needs to be set. Fixed in the attached patch.
Alex
>
> Full randconfig file is attached.
>
> --
> ~Randy
[-- Attachment #2: 0001-drm-amdgpu-remove-DRM_AMD_POWERPLAY.patch --]
[-- Type: application/octet-stream, Size: 5600 bytes --]
From 0dd8a0c21e93bf69770c920a79120afcd9e30234 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Wed, 28 Sep 2016 16:37:15 -0400
Subject: [PATCH] drm/amdgpu: remove DRM_AMD_POWERPLAY
Powerplay is no longer optional after the recently cleanups
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/Kconfig | 1 -
drivers/gpu/drm/amd/amdgpu/Makefile | 4 ----
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 --
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 13 +------------
drivers/gpu/drm/amd/powerplay/Kconfig | 6 ------
5 files changed, 1 insertion(+), 25 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/powerplay/Kconfig
diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index 53cf397..61360e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -32,5 +32,4 @@ config DRM_AMDGPU_GART_DEBUGFS
Selecting this option creates a debugfs file to inspect the mapped
pages. Uses more memory for housekeeping, enable only for debugging.
-source "drivers/gpu/drm/amd/powerplay/Kconfig"
source "drivers/gpu/drm/amd/acp/Kconfig"
diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile
index 9ec262d..248a05d0 100644
--- a/drivers/gpu/drm/amd/amdgpu/Makefile
+++ b/drivers/gpu/drm/amd/amdgpu/Makefile
@@ -111,14 +111,10 @@ amdgpu-$(CONFIG_VGA_SWITCHEROO) += amdgpu_atpx_handler.o
amdgpu-$(CONFIG_ACPI) += amdgpu_acpi.o
amdgpu-$(CONFIG_MMU_NOTIFIER) += amdgpu_mn.o
-ifneq ($(CONFIG_DRM_AMD_POWERPLAY),)
-
include $(FULL_AMD_PATH)/powerplay/Makefile
amdgpu-y += $(AMD_POWERPLAY_FILES)
-endif
-
obj-$(CONFIG_DRM_AMDGPU)+= amdgpu.o
CFLAGS_amdgpu_trace_points.o := -I$(src)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 28c6ea8..728e8ca 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -174,7 +174,6 @@ module_param_named(sched_jobs, amdgpu_sched_jobs, int, 0444);
MODULE_PARM_DESC(sched_hw_submission, "the max number of HW submissions (default 2)");
module_param_named(sched_hw_submission, amdgpu_sched_hw_submission, int, 0444);
-#ifdef CONFIG_DRM_AMD_POWERPLAY
MODULE_PARM_DESC(powerplay, "Powerplay component (1 = enable, 0 = disable, -1 = auto (default))");
module_param_named(powerplay, amdgpu_powerplay, int, 0444);
@@ -183,7 +182,6 @@ module_param_named(powercontainment, amdgpu_powercontainment, int, 0444);
MODULE_PARM_DESC(ppfeaturemask, "all power features enabled (default))");
module_param_named(ppfeaturemask, amdgpu_pp_feature_mask, int, 0444);
-#endif
MODULE_PARM_DESC(sclkdeepsleep, "SCLK Deep Sleep (1 = enable (default), 0 = disable)");
module_param_named(sclkdeepsleep, amdgpu_sclk_deep_sleep_en, int, 0444);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
index 68ad241..7532ff8 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
@@ -42,7 +42,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
amd_pp = &(adev->powerplay);
if (adev->pp_enabled) {
-#ifdef CONFIG_DRM_AMD_POWERPLAY
struct amd_pp_init *pp_init;
pp_init = kzalloc(sizeof(struct amd_pp_init), GFP_KERNEL);
@@ -55,7 +54,6 @@ static int amdgpu_powerplay_init(struct amdgpu_device *adev)
pp_init->device = amdgpu_cgs_create_device(adev);
ret = amd_powerplay_init(pp_init, amd_pp);
kfree(pp_init);
-#endif
} else {
amd_pp->pp_handle = (void *)adev;
@@ -97,7 +95,6 @@ static int amdgpu_pp_early_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int ret = 0;
-#ifdef CONFIG_DRM_AMD_POWERPLAY
switch (adev->asic_type) {
case CHIP_POLARIS11:
case CHIP_POLARIS10:
@@ -120,9 +117,6 @@ static int amdgpu_pp_early_init(void *handle)
adev->pp_enabled = false;
break;
}
-#else
- adev->pp_enabled = false;
-#endif
ret = amdgpu_powerplay_init(adev);
if (ret)
@@ -144,12 +138,11 @@ static int amdgpu_pp_late_init(void *handle)
ret = adev->powerplay.ip_funcs->late_init(
adev->powerplay.pp_handle);
-#ifdef CONFIG_DRM_AMD_POWERPLAY
if (adev->pp_enabled && adev->pm.dpm_enabled) {
amdgpu_pm_sysfs_init(adev);
amdgpu_dpm_dispatch_task(adev, AMD_PP_EVENT_COMPLETE_INIT, NULL, NULL);
}
-#endif
+
return ret;
}
@@ -162,10 +155,8 @@ static int amdgpu_pp_sw_init(void *handle)
ret = adev->powerplay.ip_funcs->sw_init(
adev->powerplay.pp_handle);
-#ifdef CONFIG_DRM_AMD_POWERPLAY
if (adev->pp_enabled)
adev->pm.dpm_enabled = true;
-#endif
return ret;
}
@@ -216,7 +207,6 @@ static int amdgpu_pp_hw_fini(void *handle)
static void amdgpu_pp_late_fini(void *handle)
{
-#ifdef CONFIG_DRM_AMD_POWERPLAY
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
if (adev->pp_enabled) {
@@ -227,7 +217,6 @@ static void amdgpu_pp_late_fini(void *handle)
if (adev->powerplay.ip_funcs->late_fini)
adev->powerplay.ip_funcs->late_fini(
adev->powerplay.pp_handle);
-#endif
}
static int amdgpu_pp_suspend(void *handle)
diff --git a/drivers/gpu/drm/amd/powerplay/Kconfig b/drivers/gpu/drm/amd/powerplay/Kconfig
deleted file mode 100644
index af38033..0000000
--- a/drivers/gpu/drm/amd/powerplay/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-config DRM_AMD_POWERPLAY
- bool "Enable AMD powerplay component"
- depends on DRM_AMDGPU
- default n
- help
- select this option will enable AMD powerplay component.
--
2.5.5
^ 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