* linux-next: manual merge of the rdma tree with the net-next tree
From: Stephen Rothwell @ 2016-01-05 1:51 UTC (permalink / raw)
To: Doug Ledford, David Miller, netdev
Cc: linux-next, linux-kernel, Saeed Mahameed, Achiad Shochat,
Or Gerlitz
Hi Doug,
Today's linux-next merge of the rdma tree got conflicts in:
drivers/net/ethernet/mellanox/mlx5/core/vport.c
include/linux/mlx5/mlx5_ifc.h
include/linux/mlx5/vport.h
between commits:
e1d7d349c69d ("net/mlx5: Update access functions to Query/Modify vport MAC address")
e75465148b7d ("net/mlx5: Introduce access functions to modify/query vport state")
from the net-next tree and commit:
e5f6175c5b66 ("net/mlx5_core: Break down the vport mac address query function")
from the rdma tree and maybe some others.
I have no hope of fixing this stuff up, so I have dropped the rdma tree
again for today. There is similar functionality being introduced in
both trees ... please sort this mess out ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: build failure after merge of the i2c tree
From: Wolfram Sang @ 2016-01-05 1:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Mika Westerberg, linux-i2c
In-Reply-To: <20160105105507.335a4fae@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Stephen,
> > After merging the i2c tree, today's linux-next build (powerpc
> > ppc44x_defconfig) failed like this:
Oops, yes.
> > /* Bus timings (in ns) for bit-banging */
> > -static struct i2c_timings {
> > +static struct ibm_i2c_timings {
I changed it to ibm_iic_timings for consistency reasons...
> > volatile struct iic_regs __iomem *iic = dev->vaddr;
> > - const struct i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
> > + const struct ibm_i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
... and fixed the placement of the * operator ...
> > u8 mask, v, sda;
> > int i, res;
> >
> > --
> > 2.6.2
>
> Ping?
... and applied to for-next, thanks! The patch got lost because the
i2c-list was not on CC and thus patchwork couldn't catch it.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Rafael J. Wysocki @ 2016-01-05 1:04 UTC (permalink / raw)
To: Mark Brown
Cc: Pi-Cheng Chen, Viresh Kumar, Olof Johansson, Arnd Bergmann,
kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel,
Rafael J. Wysocki
In-Reply-To: <20160104153502.GK16023@sirena.org.uk>
On 1/4/2016 4:35 PM, Mark Brown wrote:
> On Mon, Jan 04, 2016 at 12:12:20PM +0000, Build bot for Mark Brown wrote:
>
> Today's linux-next fails to build for arm64 due to 44d3d051253 (ARM64:
> dts: mt8173: Add CPU OPP, clock and regulator supply properties)
Thanks for letting me know, I've dropped this one.
> in one of Raphael's trees:
>
>> arm64-allmodconfig
>> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
>> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
>> arm64-defconfig
>> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
> which is failing because at least CLK_INFRA_CA53SEL is used but never
> defined, presumably there is some dependency which wasn't integrated.
> Normally we merge DT changes via the architecture to help avoid these
> issues.
Yes, that would be better.
Thanks,
Rafael
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Stephen Rothwell @ 2016-01-05 0:49 UTC (permalink / raw)
To: Andrew Morton
Cc: Mark Brown, Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu,
Dave Hansen, Matt Fleming, Kamezawa Hiroyuki,
kernel-build-reports, linux-next, Kevin.Hilman, Tyler.Baker,
linux-arm-kernel, Russell King
In-Reply-To: <20160104163528.be56a4b1.akpm@linux-foundation.org>
Hi Andrew,
On Mon, 4 Jan 2016 16:35:28 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> Stephen, can we please retain
>
> mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
> mm-introduce-kernelcore=mirror-option.patch
> mm-introduce-kernelcore=mirror-option-fix.patch
> mm-introduce-kernelcore=mirror-option-fix-2.patch
>
> and add the below?
Sure, that is easier than dropping the above patches, anyway.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Andrew Morton @ 2016-01-05 0:35 UTC (permalink / raw)
To: Mark Brown
Cc: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, kernel-build-reports, linux-next,
Kevin.Hilman, Tyler.Baker, linux-arm-kernel, Russell King,
Stephen Rothwell
In-Reply-To: <20160104235512.GW16023@sirena.org.uk>
On Mon, 4 Jan 2016 23:55:12 +0000 Mark Brown <broonie@kernel.org> wrote:
> On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
> > On Mon, 4 Jan 2016 22:42:33 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> > > platforms in the kernelci.org boot tests[1]. Doing bisections with
> > > Arndale and BeagleBone Black identifies 904769ac82ebf (mm/page_alloc.c:
> > > calculate zone_start_pfn at zone_spanned_pages_in_node()) from the akpm
> > > tree as the first broken commit[2,3]. An example bootlog from the
> > > failure is:
>
> > Thanks. That patch has rather a blooper if
> > CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
>
> Seems to be what's making a difference from a quick run through, yes.
OK, thanks.
Stephen, can we please retain
mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node.patch
mm-introduce-kernelcore=mirror-option.patch
mm-introduce-kernelcore=mirror-option-fix.patch
mm-introduce-kernelcore=mirror-option-fix-2.patch
and add the below?
Or don't bother - I'll do an mmotm tomorrow with these in it.
I'd still like reviewing and testing from Taku Izumi please.
From: Arnd Bergmann <arnd@arndb.de>
Subject: mm/page_alloc.c: set a zone_start_pfn value in zone_spanned_pages_in_node
We got a new build warning in linux-next:
mm/page_alloc.c: In function 'free_area_init_node':
mm/page_alloc.c:5278:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wmaybe-uninitialized]
zone->zone_start_pfn = zone_start_pfn;
mm/page_alloc.c:5265:17: note: 'zone_start_pfn' was declared here
unsigned long zone_start_pfn, zone_end_pfn;
The code indeed looks wrong, but this is just a guess of what the
fix might be: I have not looked it in detail, so please treat this
as a bug report.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/page_alloc.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/page_alloc.c~mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node-fix
+++ a/mm/page_alloc.c
@@ -5013,6 +5013,8 @@ static inline unsigned long __meminit zo
unsigned long *zone_end_pfn,
unsigned long *zones_size)
{
+ *zone_start_pfn = node_start_pfn;
+ *zone_end_pfn = node_end_pfn;
return zones_size[zone_type];
}
_
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Mark Brown @ 2016-01-04 23:55 UTC (permalink / raw)
To: Andrew Morton
Cc: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, kernel-build-reports, linux-next,
Kevin.Hilman, Tyler.Baker, linux-arm-kernel, Russell King
In-Reply-To: <20160104150946.373ed02b8e8b81221340b7c8@linux-foundation.org>
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
On Mon, Jan 04, 2016 at 03:09:46PM -0800, Andrew Morton wrote:
> On Mon, 4 Jan 2016 22:42:33 +0000 Mark Brown <broonie@kernel.org> wrote:
> > platforms in the kernelci.org boot tests[1]. Doing bisections with
> > Arndale and BeagleBone Black identifies 904769ac82ebf (mm/page_alloc.c:
> > calculate zone_start_pfn at zone_spanned_pages_in_node()) from the akpm
> > tree as the first broken commit[2,3]. An example bootlog from the
> > failure is:
> Thanks. That patch has rather a blooper if
> CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
Seems to be what's making a difference from a quick run through, yes.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the i2c tree
From: Stephen Rothwell @ 2016-01-04 23:55 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-next, linux-kernel, Mika Westerberg
In-Reply-To: <20151216154813.2566a655@canb.auug.org.au>
Hi all,
On Wed, 16 Dec 2015 15:48:13 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the i2c tree, today's linux-next build (powerpc
> ppc44x_defconfig) failed like this:
>
> drivers/i2c/busses/i2c-ibm_iic.c:102:15: error: redefinition of 'struct i2c_timings'
> static struct i2c_timings {
> ^
> In file included from drivers/i2c/busses/i2c-ibm_iic.c:42:0:
> include/linux/i2c.h:424:8: note: originally defined here
> struct i2c_timings {
> ^
>
> Caused by commit
>
> e1dba01ca620 ("i2c: add generic routine to parse DT for timing information")
>
> I have applied the following patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 16 Dec 2015 15:34:10 +1100
> Subject: [PATCH] ii2c: rename i2c_timings struct due to clash with generic version
>
> Fixes: e1dba01ca620 ("i2c: add generic routine to parse DT for timing information")
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/i2c/busses/i2c-ibm_iic.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
> index ab492301581a..51154fada1df 100644
> --- a/drivers/i2c/busses/i2c-ibm_iic.c
> +++ b/drivers/i2c/busses/i2c-ibm_iic.c
> @@ -99,7 +99,7 @@ static void dump_iic_regs(const char* header, struct ibm_iic_private* dev)
> #endif
>
> /* Bus timings (in ns) for bit-banging */
> -static struct i2c_timings {
> +static struct ibm_i2c_timings {
> unsigned int hd_sta;
> unsigned int su_sto;
> unsigned int low;
> @@ -241,7 +241,7 @@ static int iic_dc_wait(volatile struct iic_regs __iomem *iic, u8 mask)
> static int iic_smbus_quick(struct ibm_iic_private* dev, const struct i2c_msg* p)
> {
> volatile struct iic_regs __iomem *iic = dev->vaddr;
> - const struct i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
> + const struct ibm_i2c_timings* t = &timings[dev->fast_mode ? 1 : 0];
> u8 mask, v, sda;
> int i, res;
>
> --
> 2.6.2
Ping?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Andrew Morton @ 2016-01-04 23:09 UTC (permalink / raw)
To: Mark Brown
Cc: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, kernel-build-reports, linux-next,
Kevin.Hilman, Tyler.Baker, linux-arm-kernel, Russell King
In-Reply-To: <20160104224233.GU16023@sirena.org.uk>
On Mon, 4 Jan 2016 22:42:33 +0000 Mark Brown <broonie@kernel.org> wrote:
> Since 20151231 -next has been failing to boot on a wide range of ARM
> platforms in the kernelci.org boot tests[1]. Doing bisections with
> Arndale and BeagleBone Black identifies 904769ac82ebf (mm/page_alloc.c:
> calculate zone_start_pfn at zone_spanned_pages_in_node()) from the akpm
> tree as the first broken commit[2,3]. An example bootlog from the
> failure is:
>
> http://storage.kernelci.org/next/next-20151231/arm-multi_v7_defconfig/lab-cambridge/boot-exynos5250-arndale.html
>
> which shows no output on the console once we start the kernel, a brief
> sampling of failing boards suggests this is the normal failure mode.
> x86 and arm64 targets seem fine (juno shows up as failing but the boot
> log seems fine so it's probably a false positive, Mustang was failing
> already) and there are a small number of ARM platforms that boot. I've
> not yet had any time to investigate further than that (including trying
> a revert of that commit), sorry.
>
> [1] http://kernelci.org/boot/all/job/next/kernel/next-20151231/
> [2] https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/135/console
> [3] https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/136/console
Thanks. That patch has rather a blooper if
CONFIG_HAVE_MEMBLOCK_NODE_MAP=n. Is that the case in your testing?
Arnd's tentative fix is below.
I shall drop that patchset for now.
From: Arnd Bergmann <arnd@arndb.de>
Subject: mm/page_alloc.c: set a zone_start_pfn value in zone_spanned_pages_in_node
We got a new build warning in linux-next:
mm/page_alloc.c: In function 'free_area_init_node':
mm/page_alloc.c:5278:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wmaybe-uninitialized]
zone->zone_start_pfn = zone_start_pfn;
mm/page_alloc.c:5265:17: note: 'zone_start_pfn' was declared here
unsigned long zone_start_pfn, zone_end_pfn;
The code indeed looks wrong, but this is just a guess of what the
fix might be: I have not looked it in detail, so please treat this
as a bug report.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/page_alloc.c | 2 ++
1 file changed, 2 insertions(+)
diff -puN mm/page_alloc.c~mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-calculate-zone_start_pfn-at-zone_spanned_pages_in_node-fix
+++ a/mm/page_alloc.c
@@ -5013,6 +5013,8 @@ static inline unsigned long __meminit zo
unsigned long *zone_end_pfn,
unsigned long *zones_size)
{
+ *zone_start_pfn = node_start_pfn;
+ *zone_end_pfn = node_end_pfn;
return zones_size[zone_type];
}
_
^ permalink raw reply
* Re: next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Mark Brown @ 2016-01-04 22:44 UTC (permalink / raw)
To: Arnd Bergmann
Cc: kernel-build-reports, Igal Liberman, David S. Miller, netdev,
linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <3705737.6TGxRxdFzW@wuerfel>
[-- Attachment #1: Type: text/plain, Size: 634 bytes --]
On Mon, Jan 04, 2016 at 11:07:41PM +0100, Arnd Bergmann wrote:
> On Monday 04 January 2016 16:50:25 Mark Brown wrote:
> > On Mon, Jan 04, 2016 at 12:12:20PM +0000, Build bot for Mark Brown wrote:
> > and various other linker errors caused by the fact that the new fman
> > driver uses PHYLIB but does not depend on or select it.
> This is the patch I submitted for the problem. I don't think that simply
> adding the 'select' would be a good idea because that would force PHYLIB
> builtin for allmodconfig.
Indeed, that was why I held off on my own patch - I wanted to go back
and try to understand why we were using a bool there.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Widespread boot failures on ARM due to "mm/page_alloc.c: calculate zone_start_pfn at zone_spanned_pages_in_node()"
From: Mark Brown @ 2016-01-04 22:42 UTC (permalink / raw)
To: Taku Izumi, Tony Luck, Mel Gorman, Xishi Qiu, Dave Hansen,
Matt Fleming, Kamezawa Hiroyuki, Andrew Morton
Cc: kernel-build-reports, linux-next, Kevin.Hilman, Tyler.Baker,
linux-arm-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 1155 bytes --]
Since 20151231 -next has been failing to boot on a wide range of ARM
platforms in the kernelci.org boot tests[1]. Doing bisections with
Arndale and BeagleBone Black identifies 904769ac82ebf (mm/page_alloc.c:
calculate zone_start_pfn at zone_spanned_pages_in_node()) from the akpm
tree as the first broken commit[2,3]. An example bootlog from the
failure is:
http://storage.kernelci.org/next/next-20151231/arm-multi_v7_defconfig/lab-cambridge/boot-exynos5250-arndale.html
which shows no output on the console once we start the kernel, a brief
sampling of failing boards suggests this is the normal failure mode.
x86 and arm64 targets seem fine (juno shows up as failing but the boot
log seems fine so it's probably a false positive, Mustang was failing
already) and there are a small number of ARM platforms that boot. I've
not yet had any time to investigate further than that (including trying
a revert of that commit), sorry.
[1] http://kernelci.org/boot/all/job/next/kernel/next-20151231/
[2] https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/135/console
[3] https://ci.linaro.org/view/people/job/tbaker-boot-bisect-bot/136/console
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Arnd Bergmann @ 2016-01-04 22:07 UTC (permalink / raw)
To: kernel-build-reports
Cc: Mark Brown, Igal Liberman, David S. Miller, netdev, linaro-kernel,
linux-next, linux-arm-kernel
In-Reply-To: <20160104165025.GN16023@sirena.org.uk>
On Monday 04 January 2016 16:50:25 Mark Brown wrote:
> On Mon, Jan 04, 2016 at 12:12:20PM +0000, Build bot for Mark Brown wrote:
>
> Today's linux-next fails to build an arm allmodconfig (and probably also
> at least arm64 though other errors prevent that getting to linking
> currently) due to:
>
> | drivers/built-in.o: In function `dtsec_restart_autoneg':
> | :(.text+0x30f86c): undefined reference to `mdiobus_read'
> | :(.text+0x30f89c): undefined reference to `mdiobus_write'
> | drivers/built-in.o: In function `dtsec_init':
> | :(.text+0x31008c): undefined reference to `mdiobus_write'
> | :(.text+0x3100b4): undefined reference to `mdiobus_write'
> | :(.text+0x3100dc): undefined reference to `mdiobus_write'
> | :(.text+0x310128): undefined reference to `mdiobus_write'
> | drivers/built-in.o::(.text+0x310150): more undefined references to `mdiobus_write' follow
> | drivers/built-in.o: In function `dtsec_config':
> | :(.text+0x310804): undefined reference to `of_phy_find_device'
>
> and various other linker errors caused by the fact that the new fman
> driver uses PHYLIB but does not depend on or select it.
This is the patch I submitted for the problem. I don't think that simply
adding the 'select' would be a good idea because that would force PHYLIB
builtin for allmodconfig.
Arnd
commit 609a5b98a4b703a4fba8becb7ffb2aa1859c4164
Author: Arnd Bergmann <arnd@arndb.de>
Date: Fri Jan 1 13:24:03 2016 +0100
[SUBMITTED] fsl/fman: allow modular build
ARM allmodconfig fails because of the addition of the FMAN driver:
drivers/built-in.o: In function `dtsec_restart_autoneg':
binder.c:(.text+0x173328): undefined reference to `mdiobus_read'
binder.c:(.text+0x173348): undefined reference to `mdiobus_write'
drivers/built-in.o: In function `dtsec_config':
binder.c:(.text+0x173d24): undefined reference to `of_phy_find_device'
drivers/built-in.o: In function `init_phy':
binder.c:(.text+0x1763b0): undefined reference to `of_phy_connect'
drivers/built-in.o: In function `stop':
binder.c:(.text+0x176014): undefined reference to `phy_stop'
drivers/built-in.o: In function `start':
binder.c:(.text+0x176078): undefined reference to `phy_start'
The reason is that the driver uses PHYLIB, but that is a loadable
module here, and fman itself is built-in.
This patch makes it possible to configure fman as a module as well
so we don't change the status of PHYLIB in an allmodconfig kernel,
and it adds a 'select PHYLIB' statement to ensure that phylib is
always built-in when fman is.
The driver uses "builtin_platform_driver(fman_driver);", which means
it cannot be unloaded, but it's still possible to have it as a loadable
module that gets loaded once and never removed.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 5adae51a64b8 ("fsl/fman: Add FMan MURAM support")
diff --git a/drivers/net/ethernet/freescale/fman/Kconfig b/drivers/net/ethernet/freescale/fman/Kconfig
index 66b729692b48..79b7c84b7869 100644
--- a/drivers/net/ethernet/freescale/fman/Kconfig
+++ b/drivers/net/ethernet/freescale/fman/Kconfig
@@ -1,7 +1,8 @@
config FSL_FMAN
- bool "FMan support"
+ tristate "FMan support"
depends on FSL_SOC || COMPILE_TEST
select GENERIC_ALLOCATOR
+ select PHYLIB
default n
help
Freescale Data-Path Acceleration Architecture Frame Manager
^ permalink raw reply related
* Re: linux-next: manual merge of the rdma tree with the nfsd tree
From: J. Bruce Fields @ 2016-01-04 19:36 UTC (permalink / raw)
To: Doug Ledford
Cc: Stephen Rothwell, linux-next, linux-kernel, Christoph Hellwig,
Ira Weiny, Or Gerlitz, chuck.lever
In-Reply-To: <5689DEA0.1020803@redhat.com>
On Sun, Jan 03, 2016 at 09:53:20PM -0500, Doug Ledford wrote:
> On 01/03/2016 08:44 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Thu, 31 Dec 2015 13:30:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >> Hi Doug,
> >>
> >> Today's linux-next merge of the rdma tree got conflicts in a quite a
> >> few files between (mostly, I think) commit:
> >>
> >> 6c7b6d2d442c ("IB: merge struct ib_device_attr into struct ib_device")
> >>
> >> from the nfsd tree and various commits from the rdma tree.
> >>
> >> It would have taken me considerable time to fix the conflicts up, so I
> >> have dropped teh rdma tree for today (just because it was merged second).
> >> Please have a conversation and figure out how you are going to cooperate
> >> and get these conflicts fixed e.g. set up a stable branch with Christoph's
> >> commit (and any other conflicting commits) in it and merge that into
> >> both trees.
> >
> > So, on further inspection, it appears that there is a series of commits
> > in the rdma tree that does basically the same as that nfsd tree commit
> > above. So I have dropped the rdma tree again today. Please have a
> > conversation guys ...
> >
>
> The initial patchset was Christoph's. It was later replaced with a
> different patchset from Or Gerlitz. Bruce picked up some changes from
> Chuck Lever that were originally based on Christoph's work but now need
> to be rebased off of the current RDMA tree.
OK. I'm assuming Chuck will want to do any necessary rebasing and
retesting himself, so for now I've just dropped those patches, and
expect to pick up new versions when Chuck gets back from the holidays.
--b.
^ permalink raw reply
* Re: next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Mark Brown @ 2016-01-04 16:50 UTC (permalink / raw)
To: Igal Liberman, David S. Miller
Cc: kernel-build-reports, linaro-kernel, linux-next, netdev,
linux-arm-kernel
In-Reply-To: <E1aG3zo-0000gt-2t@optimist>
[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]
On Mon, Jan 04, 2016 at 12:12:20PM +0000, Build bot for Mark Brown wrote:
Today's linux-next fails to build an arm allmodconfig (and probably also
at least arm64 though other errors prevent that getting to linking
currently) due to:
| drivers/built-in.o: In function `dtsec_restart_autoneg':
| :(.text+0x30f86c): undefined reference to `mdiobus_read'
| :(.text+0x30f89c): undefined reference to `mdiobus_write'
| drivers/built-in.o: In function `dtsec_init':
| :(.text+0x31008c): undefined reference to `mdiobus_write'
| :(.text+0x3100b4): undefined reference to `mdiobus_write'
| :(.text+0x3100dc): undefined reference to `mdiobus_write'
| :(.text+0x310128): undefined reference to `mdiobus_write'
| drivers/built-in.o::(.text+0x310150): more undefined references to `mdiobus_write' follow
| drivers/built-in.o: In function `dtsec_config':
| :(.text+0x310804): undefined reference to `of_phy_find_device'
and various other linker errors caused by the fact that the new fman
driver uses PHYLIB but does not depend on or select it.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Mark Brown @ 2016-01-04 15:35 UTC (permalink / raw)
To: Rafael J. Wysocki, Pi-Cheng Chen, Viresh Kumar, Olof Johansson,
Arnd Bergmann
Cc: kernel-build-reports, linaro-kernel, linux-next, linux-arm-kernel
In-Reply-To: <E1aG3zo-0000gt-2t@optimist>
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
On Mon, Jan 04, 2016 at 12:12:20PM +0000, Build bot for Mark Brown wrote:
Today's linux-next fails to build for arm64 due to 44d3d051253 (ARM64:
dts: mt8173: Add CPU OPP, clock and regulator supply properties) in one
of Raphael's trees:
> arm64-allmodconfig
> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
> arm64-defconfig
> Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
which is failing because at least CLK_INFRA_CA53SEL is used but never
defined, presumably there is some dependency which wasn't integrated.
Normally we merge DT changes via the architecture to help avoid these
issues.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the ext4 tree
From: Theodore Ts'o @ 2016-01-04 13:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Li Xi
In-Reply-To: <20160104103419.56719f0b@canb.auug.org.au>
On Mon, Jan 04, 2016 at 10:34:19AM +1100, Stephen Rothwell wrote:
> Hi Ted,
>
> After merging the ext4 tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:...
Thanks for pointing this out! I fixed it last night so it should be
ready for the next linux-build integration cycle.
- Ted
^ permalink raw reply
* Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Mimi Zohar @ 2016-01-04 12:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Al Viro, Dmitry Kasatkin, linux-next, linux-kernel, Petko Manolov,
James Morris
In-Reply-To: <20160104162308.52349acd@canb.auug.org.au>
On Mon, 2016-01-04 at 16:23 +1100, Stephen Rothwell wrote:
> Hi Mimi,
>
> On Mon, 04 Jan 2016 00:06:37 -0500 Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
> >
> > On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> > >
> > > FWIW, I'm going to pull the part that introduces memdup_user_nul() into
> > > a never-rebased branch and if security.git is willing to pull it and handle
> > > that conversion in ima_write_policy() themselves, I'll be only glad to drop
> > > the corresponding chunk in vfs.git#for-next
> >
> > As memdup_user_nul() is not in the security tree, it would break the
> > security tree builds. Having the patch in the linux-integrity/next
> > branch wouldn't help matters.
>
> I think Al intends for you to merge his "never-rebased branch" that
> contains the memdup_user_nul patch into the integrity tree (or James to
> merge it into the security tree). He will also merge the same branch
> into his vfs tree and remove the patch that updates ima_write_policy()
> to use memdup_user_nul() and you (or James) could apply that patch in
> the integrity (or security) tree.
>
> This way we end up with the same commit creating memdup_user_nul() in
> both trees and no left over conflicts.
Thank you for the explanation. It sounds like a plan. James, are you
ok with this?
Mimi
^ permalink raw reply
* next-20160104 build: 3 failures 15 warnings (next-20160104)
From: Build bot for Mark Brown @ 2016-01-04 12:12 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160104
Git describe: next-20160104
Commit: 57c4229929 Add linux-next specific files for 20160104
Build Time: 65 min 8 sec
Passed: 6 / 9 ( 66.67 %)
Failed: 3 / 9 ( 33.33 %)
Errors: 1
Warnings: 15
Section Mismatches: 0
Failed defconfigs:
arm64-allmodconfig
arm-allmodconfig
arm64-defconfig
Errors:
arm64-allmodconfig
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
arm64-defconfig
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
5 warnings 0 mismatches : arm64-allmodconfig
7 warnings 0 mismatches : arm-multi_v5_defconfig
9 warnings 0 mismatches : arm-multi_v7_defconfig
7 warnings 0 mismatches : arm-allmodconfig
4 warnings 0 mismatches : arm-allnoconfig
4 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
3 Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings Summary: 15
7 ../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
7 ../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
6 <stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
4 ../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized]
4 ../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
2 ../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
1 ../net/bluetooth/mgmt.c:5471:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../net/bluetooth/mgmt.c:5471:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/udf/inode.c:1974:3: warning: 'adsize' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/udf/inode.c:1927:28: warning: 'adsize' may be used uninitialized in this function [-Wmaybe-uninitialized]
1 ../fs/dax.c:916:17: warning: passing argument 1 of '__dax_dbg' from incompatible pointer type
1 ../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
1 ../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
1 ../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wmaybe-uninitialized]
-------------------------------------------------------------------------------
arm64-allmodconfig : FAIL, 2 errors, 5 warnings, 0 section mismatches
Errors:
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../fs/dax.c:916:17: warning: passing argument 1 of '__dax_dbg' from incompatible pointer type
../drivers/gpu/drm/vc4/vc4_validate.c:864:4: warning: format '%d' expects argument of type 'int', but argument 4 has type 'size_t' [-Wformat=]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized]
../fs/udf/inode.c:1974:3: warning: 'adsize' may be used uninitialized in this function [-Wmaybe-uninitialized]
../fs/udf/inode.c:1927:28: warning: 'adsize' may be used uninitialized in this function [-Wmaybe-uninitialized]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 9 warnings, 0 section mismatches
Warnings:
arch/arm/configs/multi_v7_defconfig:435:warning: symbol value 'm' invalid for MFD_DA9063
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized]
../net/bluetooth/mgmt.c:5471:8: warning: 'r192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../net/bluetooth/mgmt.c:5471:8: warning: 'h192' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized]
../crypto/wp512.c:987:1: warning: the frame size of 1112 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:5: warning: comparison of distinct pointer types lacks a cast [enabled by default]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
arm-allnoconfig : PASS, 0 errors, 4 warnings, 0 section mismatches
Warnings:
<stdin>:1307:2: warning: #warning syscall copy_file_range not implemented [-Wcpp]
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized]
-------------------------------------------------------------------------------
arm64-defconfig : FAIL, 1 errors, 4 warnings, 0 section mismatches
Errors:
Error: ../arch/arm64/boot/dts/mediatek/mt8173.dtsi:132.24-25 syntax error
Warnings:
../mm/page_alloc.c:4617:37: warning: unused variable 'tmp' [-Wunused-variable]
../mm/page_alloc.c:4617:26: warning: unused variable 'r' [-Wunused-variable]
../mm/page_alloc.c:5276:25: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wmaybe-uninitialized]
../drivers/tty/serial/amba-pl011.c:190:27: warning: 'vendor_zte' defined but not used [-Wunused-variable]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Jan 4
From: Stephen Rothwell @ 2016-01-04 8:39 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20151231:
Dropped tree: rdma (complex conflicts)
New trees: drm-vc4, bcm2835-dt, bcm2835-soc, bcm2835-drivers, bcm2835-defconfig
The ext4 tree gained a build failure so I used the version from
next-20151231.
The i2c tree still had its build failure for which I applied a patch.
The libata tree was fixed up.
The rdma tree still had its considerable conflicts against the nfsd tree,
so I dropped the rdma tree again for today.
The drm tree lost a build failure, but still had the other for which I
added a fix patch.
The rcu tree gained a build failure for which I reverted 2 commits.
The integrity tree gained a conflict against the vfs tree.
The akpm-current tree gained a conflict against the drm tree and a
supplied patch for the perf build problem.
The akpm tree lost a patch that turned up elsewhere but still had its
build failure that I just left broken for now.
Non-merge commits (relative to Linus' tree): 8627
8450 files changed, 411632 insertions(+), 156035 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After the
final fixups (if any), I do an x86_64 modules_install followed by builds
for powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc,
sparc64 and arm defconfig.
Below is a summary of the state of the merge.
I am currently merging 237 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed)
Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (036592fbbe75 powerpc/opal-irqchip: Fix deadlock introduced by "Fix double endian conversion")
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging net/master (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings)
Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (cf1e05c63642 mac80211: handle width changes from opmode notification IE in beacon)
Merging sound-current/for-linus (c7b60a89516b ALSA: hda - Add keycode map for alc input device)
Merging pci-current/for-linus (1dbe162d53e1 PCI: hisi: Fix hisi_pcie_cfg_read() 32-bit reads)
Merging driver-core.current/driver-core-linus (4ef7675344d6 Linux 4.4-rc6)
Merging tty.current/tty-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb.current/usb-linus (4ef7675344d6 Linux 4.4-rc6)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set)
Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging input-current/for-linus (dd0d0d4de582 Input: i8042 - add Fujitsu Lifebook U745 to the nomux list)
Merging crypto-current/master (9f47e11b9e31 crypto: algif_skcipher - Require setkey before accept(2))
Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (3d8acd1f667b drm/i915: increase the tries for HDMI hotplug live status checking)
Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page)
Merging arc/for-next (74bf8efb5fa6 Linux 4.4-rc7)
Merging arm/for-next (cf19d2e9463a Merge branch 'misc-rc6' into for-next)
Merging arm-perf/for-next/perf (5d7ee87708d4 arm64: perf: add support for Cortex-A72)
Merging arm-soc/for-next (4909c459092b Merge branches 'next/drivers' and 'next/multiplatform' into for-next)
Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (c6abe665c94f Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
Merging mvebu/for-next (12bd4032ea2f Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (06cdbbe9902d Merge tag 'omap-for-v4.5/81xx-fix-signed' into for-next)
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs)
Merging renesas/next (c546828f1614 Merge branches 'heads/arm64-defconfig-for-v4.5', 'heads/arm64-dt-for-v4.5', 'heads/defconfig-for-v4.5', 'heads/dt-for-v4.5' and 'heads/gic-cleanup-for-v4.5' into next)
Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next)
Merging tegra/for-next (f4dc1ae37415 Merge branch for-4.5/defconfig into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
Merging arm64/for-next/core (c9cd0ed925c0 arm64: traps: address fallout from printk -> pr_* conversion)
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
Merging h8300/h8300-next (82271533321d irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (ea8d65ad6958 m68k/defconfig: Update defconfigs for v4.4-rc1)
Merging m68knommu/for-next (4e30bce03142 m68k: coldfire/gpio: Be sure to clamp return value)
Merging metag/for-next (f23d0e2468bc MAINTAINERS: Change Meta arch port status to Odd Fixes)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
Merging mips/mips-for-linux-next (7635e531b101 Merge branch '4.4-fixes' into mips-for-linux-next)
Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3)
Merging powerpc/next (e9d764f80396 powerpc/pseries: Enable kernel CPU dlpar from sysfs)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (9236b4dd6bfa s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (06c42332222d tile: fix bug in setting PT_FLAGS_DISABLE_IRQ on kernel entry)
Merging uml/linux-next (887a9853092c um: fix returns without va_end)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa)
Merging btrfs/next (511711af91f2 btrfs: don't run delayed references while we are creating the free space tree)
Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only)
Merging cifs/for-next (181a15048df3 [SMB3] Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (6c37157874aa udf: Fix lost indirect extent block)
Merging ext4/dev (6ac40c7b5597 fs: clean up the flags definition in uapi/linux/fs.h)
$ git reset --hard HEAD^
Merging next-20151231 version of ext4
Merging f2fs/dev (4cf185379b75 f2fs: add a tracepoint for sync_dirty_inodes)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
Merging gfs2/for-next (a93a99838248 gfs2: fix flock panic issue)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
Merging nfs/linux-next (614bdee254f8 Merge branch 'bugfixes')
Merging nfsd/nfsd-next (eb57be60eca9 svcrdma: Add class for RDMA backwards direction transport)
Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION)
Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
Merging v9fs/for-next (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing)
Merging ubifs/linux-next (6b238de189f6 mtd: ubi: don't leak e if schedule_erase() fails)
Merging xfs/for-next (4e14e49a91e1 Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next)
Merging file-locks/linux-next (9189922675ec fs: make locks.c explicitly non-modular)
Merging vfs/for-next (d7451d073a84 Merge branches 'work.misc', 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in drivers/s390/char/zcore.c
Applying: orangfs: update for follow_link to get_link change
Merging pci/next (c6123e06042d Merge branches 'pci/host-generic', 'pci/host-imx6', 'pci/host-iproc' and 'pci/host-rcar' into next)
Merging hid/for-next (817b1df9945e Merge branch 'for-4.4/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (bdcadbaaf804 Merge branch 'i2c/for-4.5' into i2c/for-next)
Applying: ii2c: rename i2c_timings struct due to clash with generic version
Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define)
Merging dmi/master (072151bb0154 firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (c60fdf8587ae hwmon: (nct6683,nct6775) constify sensor_template_group structures)
Merging v4l-dvb/master (e27bc2ab8e77 Merge ../mc_dvb into to_next)
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c
Merging kbuild/for-next (45538834d1f5 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
Merging libata/for-next (101f6dbe1444 Merge branch 'for-4.5' into for-next)
Merging pm/linux-next (1ce514b9eae5 Merge branch 'pm-cpufreq' into linux-next)
Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
Merging thermal/next (1d296eb7260a Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update())
Applying: thermal: fix for thermal_zone_device_update() API change
Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
Merging slave-dma/next (f9166b3aaff0 Merge branch 'topic/univ_api' into next)
Merging net-next/master (c07f30ad6805 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning)
Merging wireless-drivers-next/master (49f2a47d9131 prism54: fix checks for dma mapping errors)
Merging bluetooth/master (59869ebfe7a7 ieee802154: cc2520: Check CRC & add promiscuous)
Merging mac80211-next/master (c45932df5612 regulatory: fix world regulatory domain data)
Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception)
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/verbs.c
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_transport.c
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/frwr_ops.c
CONFLICT (content): Merge conflict in net/rds/iw.c
CONFLICT (content): Merge conflict in net/rds/ib.c
CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h
CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/srpt/ib_srpt.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/srp/ib_srp.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_memory.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iscsi_iser.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/ipoib/ipoib_main.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/ipoib/ipoib_ethtool.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/ipoib/ipoib_cm.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/verbs.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_cmd.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/sysfs.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/fmr_pool.c
CONFLICT (content): Merge conflict in drivers/infiniband/core/cm.c
$ git merge --abort
Merging mtd/master (e488ca9f8d4f doc: dt: mtd: partitions: add compatible property to "partitions" node)
Merging l2-mtd/master (1873315fb156 mtd: sh_flctl: pass FIFO as physical address)
Applying: mtd: nand: fix for drop unnecessary partition parser data
Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast)
Merging drm/drm-next (c11b89896351 Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next)
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Applying: drm/amdgpu/powerplay: include asm/div64.h for do_div()
Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
Merging drm-intel/for-linux-next (d5f384de5bf1 drm/i915: Move Braswell stop_machine GGTT insertion workaround)
Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC)
Merging drm-misc/topic/drm-misc (e112e593b215 drm: use dev_name as default unique name in drm_dev_alloc())
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
Merging hdlcd/for-upstream/hdlcd (2651f437261f MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.)
Merging sound/for-next (d8c5ed752e5b ALSA: dummy: constify dummy_timer_ops structures)
Merging sound-asoc/for-next (5787aed27c76 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next)
Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab)
Merging input/next (fa68e2777cbc Input: pcap_ts - use to_delayed_work)
Merging block/for-next (d49ed8e45ac0 Merge branch 'for-4.5/drivers' into for-next)
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c
CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile
Applying: nvme: merge fix up for ns code movement
Merging device-mapper/for-next (18d03e8c25f1 dm thin: fix race condition when destroying thin pool workqueue)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
Merging mmc-uh/next (25cc20daff0f mmc: dw_mmc: remove the unused quirks)
Applying: mmc: tegra: fix bad merge
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
Merging md/for-next (4734eb989638 async_tx: use GFP_NOWAIT rather than GFP_IO)
Merging mfd/for-mfd-next (526c0ab13672 mfd: syscon: Add a DT property to set value width)
Merging backlight/for-backlight-next (ee65ad0e2a9e backlight: pwm_bl: Avoid backlight flicker when probed from DT)
Merging battery/master (f96576bd63e5 power: Fix unmet dependency on POWER_SUPPLY by POWER_RESET by uncoupling them)
Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
Merging regulator/for-next (e1eadd8e89ae Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/tps6105x', 'regulator/topic/tps65086', 'regulator/topic/tps65218' and 'regulator/topic/wm831x' into regulator-next)
Merging security/next (aa98b942cbf3 Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_fs.c
Merging integrity/next (6427e6c71c8b ima: ima_write_policy() limit locking)
CONFLICT (content): Merge conflict in security/integrity/ima/ima_fs.c
Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm())
Merging lblnet/next (b2776bf7149b Linux 3.18)
Merging watchdog/master (3b8d058cfe6a hwmon: (sch56xx) Drop watchdog driver data reference count callbacks)
Merging iommu/next (d5ffaf1db92c Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu' and 'x86/amd' into next)
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
Merging vfio/next (03a76b60f8ba vfio: Include No-IOMMU mode)
Merging jc_docs/docs-next (9daacf51b428 Documentation/kernel-parameters: update KMG units)
Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static)
Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled)
CONFLICT (content): Merge conflict in kernel/audit.c
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (fcd71d9cc6e3 of: fix declaration of of_io_request_and_map)
Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
Merging spi/for-next (006fa61e79e6 Merge remote-tracking branches 'spi/topic/sh-msiof', 'spi/topic/spidev', 'spi/topic/sun4i' and 'spi/topic/topcliff-pch' into spi-next)
Merging tip/auto-latest (f29c2e03f0b3 Merge branch 'x86/urgent')
CONFLICT (content): Merge conflict in arch/h8300/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig
Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (1cac5503fbf7 EDAC, i5100: Use to_delayed_work())
Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
Merging ftrace/for-next (05a724bd44a6 tracing: Fix comment to use tracing_on over tracing_enable)
Merging rcu/rcu/next (319cd9cfa129 Merge with 97702524eb17 (rcutorture: Add RCU grace-period performance tests))
Merging kvm/linux-next (da3f7ca3e856 Merge tag 'kvm-s390-next-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (696066f875bc KVM: PPC: Increase memslots to 512)
Merging kvms390/next (32e6b236d269 KVM: s390: consider system MHA for guest storage)
Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (82607adcf9cd workqueue: implement lockup detector)
Merging drivers-x86/for-next (615e897884d5 asus-wmi: drop to_platform_driver macro)
Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
Merging regmap/for-next (027617b52003 Merge remote-tracking branches 'regmap/topic/64bit', 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next)
Merging hsi/for-next (403c5c065081 HSI: Remove struct hsi_client private fields from kernel-doc)
Merging leds/for-next (376886d44f4c leds: bcm6358: remove unneeded busy status check)
Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.)
Merging driver-core/driver-core-next (4ef7675344d6 Linux 4.4-rc6)
Merging tty/tty-next (462a1196a578 Merge 4.4-rc6 into tty-next)
Merging usb/usb-next (daf273350d96 Merge tag 'phy-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next)
Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM)
Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages)
Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry)
Merging staging/staging-next (02c34ccc1d2d Merge tag 'iio-for-4.5c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
Merging char-misc/char-misc-next (d7a26beb6fe6 Merge tag 'extcon-next-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next)
Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions)
Merging cgroup/for-next (694f447eca18 Merge branch 'for-4.5' into for-next)
CONFLICT (content): Merge conflict in init/Kconfig
CONFLICT (content): Merge conflict in include/linux/cgroup_subsys.h
Merging scsi/for-next (3196a8641050 Merge branch 'fixes' into for-next)
Merging target-updates/for-next (beccdd6ac780 qla2xxx: Check for online flag instead of active reset when transmitting responses)
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c
CONFLICT (content): Merge conflict in drivers/infiniband/ulp/iser/iser_memory.c
Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
Merging pinctrl/for-next (bda7c4c2b976 pinctrl: qcom: make PMIC drivers bool)
Merging vhost/linux-next (80a9b47deb7d virtio_ring: use virt_store_mb)
CONFLICT (content): Merge conflict in include/asm-generic/barrier.h
CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h
CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
Merging gpio/for-next (e28ecca6eac4 gpio: fix warning about iterator)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (6604c6556db9 pwm: Add PWM driver for OMAP using dual-mode timers)
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
Merging clk/clk-next (49dea76aebab Merge branch 'clk-rockchip' into clk-next)
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
Merging kselftest/next (ed2d26d7cbcc tools, testing, add test for intel_pstate driver)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (8735f8e16a70 selftests/x86: Add tests for UC_SIGCONTEXT_SS and UC_STRICT_RESTORE_SS)
Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops)
Merging livepatching/for-next (5dc5f4089332 Merge branch 'for-4.5/core' into for-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c
Merging coresight/next (d2b29c2f35a2 coresight: Fix a typo in Kconfig)
Merging rtc/rtc-next (cab572b82c4b rtc: fix overflow and incorrect calculation in rtc_time64_to_tm)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (d23a0e707dd6 Merge branch 'for-4.5/pfn' into for-4.5/libnvdimm)
Applying: Revert "Merge with 97702524eb17 (rcutorture: Add RCU grace-period performance tests)"
Applying: Revert "rcutorture: Add RCU grace-period performance tests"
Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.)
Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836)
Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver)
Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig)
Merging akpm-current/current (3a27fd2a94eb list, perf: fix list_force_poison() build regression)
CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in include/net/sock.h
CONFLICT (content): Merge conflict in include/linux/memblock.h
CONFLICT (content): Merge conflict in fs/block_dev.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c
CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable_64.c
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in Makefile
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Applying: mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t
Applying: mm, dax: convert vmf_insert_pfn_pmd() to pfn_t fix
Applying: fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP
$ git checkout -b akpm remotes/origin/akpm/master
Applying: fs/overlayfs/super.c needs pagemap.h
Applying: fs/adfs/adfs.h: tidy up comments
Applying: iio: core: fix ptr_ret.cocci warnings
Applying: dma-mapping: make the generic coherent dma mmap implementation optional
Applying: arc: convert to dma_map_ops
Applying: arc: dma mapping fixes
Applying: ARC: dma mapping fixes #2
Applying: avr32: convert to dma_map_ops
Applying: blackfin: convert to dma_map_ops
Applying: c6x: convert to dma_map_ops
Applying: C6X: fix build breakage
Applying: c6x: dma mapping fixes
Applying: cris: convert to dma_map_ops
Applying: nios2: convert to dma_map_ops
Applying: nios2: dma mapping fixes
Applying: frv: convert to dma_map_ops
Applying: parisc: convert to dma_map_ops
Applying: mn10300: convert to dma_map_ops
Applying: m68k: convert to dma_map_ops
Applying: metag: convert to dma_map_ops
Applying: sparc: use generic dma_set_mask
Applying: tile: uninline dma_set_mask
Applying: dma-mapping: always provide the dma_map_ops based implementation
Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig
Applying: dma-mapping: remove <asm-generic/dma-coherent.h>
Applying: dma-mapping: use offset_in_page macro
Applying: memstick: use sector_div instead of do_div
Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem
Applying: mm: memcontrol: remove double kmem page_counter init
Applying: mm: memcontrol: give the kmem states more descriptive names
Applying: mm: memcontrol: group kmem init and exit functions together
Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code
Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2
Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix
Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2
Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET
Applying: net: drop tcp_memcontrol.c
Applying: net-drop-tcp_memcontrolc-fix
Applying: mm: memcontrol: rein in the CONFIG space madness
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix
Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix
Applying: mm: memcontrol: flatten struct cg_proto
Applying: mm: memcontrol: clean up alloc, online, offline, free functions
Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix
Applying: memcg: fix SLOB build regression
Applying: mm: memcontrol: charge swap to cgroup2
Applying: mm: vmscan: pass memcg to get_scan_count()
Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
Applying: swap.h: move memcg related stuff to the end of the file
Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit
Applying: mm: free swap cache aggressively if memcg swap is full
Applying: Documentation: cgroup: add memory.swap.{current,max} description
Applying: MAINTAINERS: add git URL for APM driver
Applying: MAINTAINERS: add git URL for at91
Applying: MAINTAINERS: add git URL for Rockchip
Applying: MAINTAINERS: add git URL for ARM64
Applying: MAINTAINERS: update git URL for ath6kl
Applying: MAINTAINERS: add git URL for backlight
Applying: MAINTAINERS: add git URL for chrome
Applying: MAINTAINERS: add git URL for cris
Applying: MAINTAINERS: add git URL for cryptodev
Applying: MAINTAINERS: add git URL for devfreq
Applying: MAINTAINERS: update git URL for DLM
Applying: MAINTAINERS: add git URL for eCryptfs
Applying: MAINTAINERS: add git URL for ext4
Applying: MAINTAINERS: add git URL for hwspinlock
Applying: MAINTAINERS: add git URL for integrity
Applying: MAINTAINERS: add git URL for IPVS
Applying: MAINTAINERS: add git URL for nfsd
Applying: MAINTAINERS: add git URL for KVM/s390
Applying: MAINTAINERS: add git URL for kgdb
Applying: MAINTAINERS: add git URL for nvdimm
Applying: MAINTAINERS: add git URL for metag
Applying: MAINTAINERS: add git URL for wireless drivers
Applying: MAINTAINERS: add git URL for devicetree
Applying: MAINTAINERS: update git URL for PCMCIA
Applying: MAINTAINERS: update git URL for pstore
Applying: MAINTAINERS: update git URL for ath10k
Applying: MAINTAINERS: add git URL for hexagon
Applying: MAINTAINERS: add git URL for reset
Applying: MAINTAINERS: add git URL for s390
Applying: MAINTAINERS: fix tree format for SAMSUNG thermal
Applying: MAINTAINERS: add git URL for md
Applying: MAINTAINERS: add git URL for squashfs
Applying: MAINTAINERS: add git URL for swiotlb
Applying: MAINTAINERS: add git URL for xtensa
Applying: MAINTAINERS: fix tree format for TPM
Applying: MAINTAINERS: add git URL for UML
Applying: MAINTAINERS: add git URL for VFIO
Applying: MAINTAINERS: add git URL for vhost
Applying: MAINTAINERS: update git URL for XFS
Applying: pmem: add wb_cache_pmem() to the PMEM API
Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6
Applying: dax: support dirty DAX entries in radix tree
Applying: dax-support-dirty-dax-entries-in-radix-tree-v6
Applying: mm: add find_get_entries_tag()
Applying: dax: add support for fsync/sync
Applying: dax-add-support-for-fsync-sync-v6
Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync
Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync
Merging akpm/master (0808ace3469f xfs: call dax_pfn_mkwrite() for DAX fsync/msync)
^ permalink raw reply
* linux-next: manual merge of the akpm-current tree with the drm tree
From: Stephen Rothwell @ 2016-01-04 7:45 UTC (permalink / raw)
To: Andrew Morton, Dave Airlie
Cc: linux-next, linux-kernel, Dan Williams, Laurent Pinchart,
Tomi Valkeinen
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/gpu/drm/omapdrm/omap_gem.c
between commit:
f4302747af02 ("drm: omapdrm: gem: Move global usergart variable to omap_drm_private")
from the drm tree and commit:
0cf445f1b0c1 ("mm, dax, gpu: convert vm_insert_mixed to pfn_t")
from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/omapdrm/omap_gem.c
index 984462622291,ceba5459ceb7..000000000000
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@@ -496,8 -480,9 +498,9 @@@ static int fault_2d(struct drm_gem_obje
pfn, pfn << PAGE_SHIFT);
for (i = n; i > 0; i--) {
- vm_insert_mixed(vma, (unsigned long)vaddr, pfn);
+ vm_insert_mixed(vma, (unsigned long)vaddr,
+ __pfn_to_pfn_t(pfn, PFN_DEV));
- pfn += usergart[fmt].stride_pfn;
+ pfn += priv->usergart[fmt].stride_pfn;
vaddr += PAGE_SIZE * m;
}
^ permalink raw reply
* Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Stephen Rothwell @ 2016-01-04 5:23 UTC (permalink / raw)
To: Mimi Zohar
Cc: Al Viro, Dmitry Kasatkin, linux-next, linux-kernel, Petko Manolov,
James Morris
In-Reply-To: <1451883997.2772.27.camel@linux.vnet.ibm.com>
Hi Mimi,
On Mon, 04 Jan 2016 00:06:37 -0500 Mimi Zohar <zohar@linux.vnet.ibm.com> wrote:
>
> On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> >
> > FWIW, I'm going to pull the part that introduces memdup_user_nul() into
> > a never-rebased branch and if security.git is willing to pull it and handle
> > that conversion in ima_write_policy() themselves, I'll be only glad to drop
> > the corresponding chunk in vfs.git#for-next
>
> As memdup_user_nul() is not in the security tree, it would break the
> security tree builds. Having the patch in the linux-integrity/next
> branch wouldn't help matters.
I think Al intends for you to merge his "never-rebased branch" that
contains the memdup_user_nul patch into the integrity tree (or James to
merge it into the security tree). He will also merge the same branch
into his vfs tree and remove the patch that updates ima_write_policy()
to use memdup_user_nul() and you (or James) could apply that patch in
the integrity (or security) tree.
This way we end up with the same commit creating memdup_user_nul() in
both trees and no left over conflicts.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Mimi Zohar @ 2016-01-04 5:06 UTC (permalink / raw)
To: Al Viro
Cc: Stephen Rothwell, Dmitry Kasatkin, linux-next, linux-kernel,
Petko Manolov, James Morris
In-Reply-To: <20160104031621.GP9938@ZenIV.linux.org.uk>
On Mon, 2016-01-04 at 03:16 +0000, Al Viro wrote:
> On Mon, Jan 04, 2016 at 01:52:21PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the integrity tree got a conflict in:
> >
> > security/integrity/ima/ima_fs.c
> >
> > between commit:
> >
> > 3bc8f29b149e ("new helper: memdup_user_nul()")
> >
> > from the vfs tree and commit:
> >
> > 6427e6c71c8b ("ima: ima_write_policy() limit locking")
> >
> > from the integrity tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
Thanks!
> FWIW, I'm going to pull the part that introduces memdup_user_nul() into
> a never-rebased branch and if security.git is willing to pull it and handle
> that conversion in ima_write_policy() themselves, I'll be only glad to drop
> the corresponding chunk in vfs.git#for-next
Al,
As memdup_user_nul() is not in the security tree, it would break the
security tree builds. Having the patch in the linux-integrity/next
branch wouldn't help matters.
Mimi
^ permalink raw reply
* Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Al Viro @ 2016-01-04 3:16 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mimi Zohar, Dmitry Kasatkin, linux-next, linux-kernel,
Petko Manolov
In-Reply-To: <20160104135221.0e5515ac@canb.auug.org.au>
On Mon, Jan 04, 2016 at 01:52:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the integrity tree got a conflict in:
>
> security/integrity/ima/ima_fs.c
>
> between commit:
>
> 3bc8f29b149e ("new helper: memdup_user_nul()")
>
> from the vfs tree and commit:
>
> 6427e6c71c8b ("ima: ima_write_policy() limit locking")
>
> from the integrity tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
FWIW, I'm going to pull the part that introduces memdup_user_nul() into
a never-rebased branch and if security.git is willing to pull it and handle
that conversion in ima_write_policy() themselves, I'll be only glad to drop
the corresponding chunk in vfs.git#for-next
^ permalink raw reply
* Re: linux-next: manual merge of the integrity tree with the vfs tree
From: Stephen Rothwell @ 2016-01-04 2:58 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, Al Viro
Cc: linux-next, linux-kernel, Petko Manolov, James Morris
In-Reply-To: <20160104135221.0e5515ac@canb.auug.org.au>
[Just cc'ing the security tree maintainer, since this will soon be in
his tree and is related to a conflict between that tree and the vfs
tree.]
On Mon, 4 Jan 2016 13:52:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the integrity tree got a conflict in:
>
> security/integrity/ima/ima_fs.c
>
> between commit:
>
> 3bc8f29b149e ("new helper: memdup_user_nul()")
>
> from the vfs tree and commit:
>
> 6427e6c71c8b ("ima: ima_write_policy() limit locking")
>
> from the integrity tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc security/integrity/ima/ima_fs.c
> index a185b6f2f390,f355231997b4..000000000000
> --- a/security/integrity/ima/ima_fs.c
> +++ b/security/integrity/ima/ima_fs.c
> @@@ -277,13 -272,25 +272,20 @@@ static ssize_t ima_write_policy(struct
> if (*ppos != 0)
> goto out;
>
> - result = -ENOMEM;
> - data = kmalloc(datalen + 1, GFP_KERNEL);
> - if (!data)
> + data = memdup_user_nul(buf, datalen);
> + if (IS_ERR(data)) {
> + result = PTR_ERR(data);
> goto out;
> -
> - *(data + datalen) = '\0';
> -
> - result = -EFAULT;
> - if (copy_from_user(data, buf, datalen))
> - goto out_free;
> + }
>
> + result = mutex_lock_interruptible(&ima_write_mutex);
> + if (result < 0)
> + goto out_free;
> result = ima_parse_add_rule(data);
> + mutex_unlock(&ima_write_mutex);
> +
> + out_free:
> + kfree(data);
> out:
> if (result < 0)
> valid_policy = 0;
^ permalink raw reply
* Re: linux-next: manual merge of the rdma tree with the nfsd tree
From: Doug Ledford @ 2016-01-04 2:53 UTC (permalink / raw)
To: Stephen Rothwell, J. Bruce Fields
Cc: linux-next, linux-kernel, Christoph Hellwig, Ira Weiny,
Or Gerlitz
In-Reply-To: <20160104124450.7ba21c87@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
On 01/03/2016 08:44 PM, Stephen Rothwell wrote:
> Hi all,
>
> On Thu, 31 Dec 2015 13:30:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Hi Doug,
>>
>> Today's linux-next merge of the rdma tree got conflicts in a quite a
>> few files between (mostly, I think) commit:
>>
>> 6c7b6d2d442c ("IB: merge struct ib_device_attr into struct ib_device")
>>
>> from the nfsd tree and various commits from the rdma tree.
>>
>> It would have taken me considerable time to fix the conflicts up, so I
>> have dropped teh rdma tree for today (just because it was merged second).
>> Please have a conversation and figure out how you are going to cooperate
>> and get these conflicts fixed e.g. set up a stable branch with Christoph's
>> commit (and any other conflicting commits) in it and merge that into
>> both trees.
>
> So, on further inspection, it appears that there is a series of commits
> in the rdma tree that does basically the same as that nfsd tree commit
> above. So I have dropped the rdma tree again today. Please have a
> conversation guys ...
>
The initial patchset was Christoph's. It was later replaced with a
different patchset from Or Gerlitz. Bruce picked up some changes from
Chuck Lever that were originally based on Christoph's work but now need
to be rebased off of the current RDMA tree.
--
Doug Ledford <dledford@redhat.com>
GPG KeyID: 0E572FDD
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]
^ permalink raw reply
* linux-next: manual merge of the integrity tree with the vfs tree
From: Stephen Rothwell @ 2016-01-04 2:52 UTC (permalink / raw)
To: Mimi Zohar, Dmitry Kasatkin, Al Viro
Cc: linux-next, linux-kernel, Petko Manolov
Hi all,
Today's linux-next merge of the integrity tree got a conflict in:
security/integrity/ima/ima_fs.c
between commit:
3bc8f29b149e ("new helper: memdup_user_nul()")
from the vfs tree and commit:
6427e6c71c8b ("ima: ima_write_policy() limit locking")
from the integrity tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc security/integrity/ima/ima_fs.c
index a185b6f2f390,f355231997b4..000000000000
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@@ -277,13 -272,25 +272,20 @@@ static ssize_t ima_write_policy(struct
if (*ppos != 0)
goto out;
- result = -ENOMEM;
- data = kmalloc(datalen + 1, GFP_KERNEL);
- if (!data)
+ data = memdup_user_nul(buf, datalen);
+ if (IS_ERR(data)) {
+ result = PTR_ERR(data);
goto out;
-
- *(data + datalen) = '\0';
-
- result = -EFAULT;
- if (copy_from_user(data, buf, datalen))
- goto out_free;
+ }
+ result = mutex_lock_interruptible(&ima_write_mutex);
+ if (result < 0)
+ goto out_free;
result = ima_parse_add_rule(data);
+ mutex_unlock(&ima_write_mutex);
+
+ out_free:
+ kfree(data);
out:
if (result < 0)
valid_policy = 0;
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox