* Re: [-next] BUG_ON in scsi_target_destroy()
From: James Bottomley @ 2016-04-13 15:14 UTC (permalink / raw)
To: Johannes Thumshirn, Sergey Senozhatsky
Cc: Ewan D. Milne, Hannes Reinecke, Martin K. Petersen,
Stephen Rothwell, linux-scsi, linux-kernel, linux-usb, linux-next,
Sergey Senozhatsky, Xiong Zhou
In-Reply-To: <2201725.I2to9GCRQJ@c203>
On Wed, 2016-04-13 at 10:41 +0200, Johannes Thumshirn wrote:
> Hi Sergey, Xiong,
>
> Can you try below patch?
>
> On Montag, 11. April 2016 18:01:47 CEST Sergey Senozhatsky wrote:
> > Hello,
> >
> > commit 7b106f2de6938c31ce5e9c86bc70ad3904666b96
> > Author: Johannes Thumshirn <jthumshirn@suse.de>
> > Date: Tue Apr 5 11:50:44 2016 +0200
> >
> > scsi: Add intermediate STARGET_REMOVE state to
> > scsi_target_state
> >
> >
> > BUG_ON()s (next-20160411) each time I remove a usb flash
> >
> > [ 49.561600] [<ffffffffa0087f42>] scsi_target_destroy+0x5a/0xcb
> > [scsi_mod]
> > [ 49.561607] [<ffffffffa0089099>] scsi_target_reap+0x4a/0x4f
> > [scsi_mod]
> > [ 49.561613] [<ffffffffa008b453>] __scsi_remove_device+0xc3/0xd0
> > [scsi_mod]
> > [ 49.561619] [<ffffffffa0089d7b>] scsi_forget_host+0x52/0x63
> > [scsi_mod]
> > [ 49.561623] [<ffffffffa0080dbc>] scsi_remove_host+0x8c/0x102
> > [scsi_mod]
> > [ 49.561627] [<ffffffffa015c447>] usb_stor_disconnect+0x6b/0xab
> > [usb_storage]
> > [ 49.561634] [<ffffffffa0013f73>]
> > usb_unbind_interface+0x77/0x1ca [usbcore]
> > [ 49.561636] [<ffffffff813ae064>]
> > __device_release_driver+0x9d/0x121
> > [ 49.561638] [<ffffffff813ae10b>]
> > device_release_driver+0x23/0x30
> > [ 49.561639] [<ffffffff813ad2d1>] bus_remove_device+0xfb/0x10e
> > [ 49.561641] [<ffffffff813aac05>] device_del+0x164/0x1e6
> > [ 49.561648] [<ffffffffa0011b09>] ?
> > remove_intf_ep_devs+0x3b/0x48 [usbcore]
> > [ 49.561655] [<ffffffffa001200e>] usb_disable_device+0x84/0x1a5
> > [usbcore]
> > [ 49.561661] [<ffffffffa000ac7b>] usb_disconnect+0x94/0x19f
> > [usbcore]
> > [ 49.561667] [<ffffffffa000c2ab>] hub_event+0x5c1/0xdea
> > [usbcore]
> > [ 49.561670] [<ffffffff810530b1>] process_one_work+0x1dc/0x37f
> > [ 49.561672] [<ffffffff81053dc5>] worker_thread+0x282/0x36d
> > [ 49.561673] [<ffffffff81053b43>] ? rescuer_thread+0x2ae/0x2ae
> > [ 49.561675] [<ffffffff810580a8>] kthread+0xd2/0xda
> > [ 49.561678] [<ffffffff814bbf92>] ret_from_fork+0x22/0x40
> > [ 49.561679] [<ffffffff81057fd6>] ?
> > kthread_worker_fn+0x13e/0x13e
> >
> > -ss
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux
> > -scsi" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
>
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index 0734927..0c00928 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -1276,6 +1276,7 @@ int scsi_sysfs_add_sdev(struct scsi_device
> *sdev)
> void __scsi_remove_device(struct scsi_device *sdev)
> {
> struct device *dev = &sdev->sdev_gendev;
> + struct scsi_target *starget;
>
> /*
> * This cleanup path is not reentrant and while it is
> impossible
> @@ -1315,7 +1316,9 @@ void __scsi_remove_device(struct scsi_device
> *sdev)
> * remoed sysfs visibility from the device, so make the
> target
> * invisible if this was the last device underneath it.
> */
> - scsi_target_reap(scsi_target(sdev));
> + starget = scsi_target(sdev);
> + starget->state = STARGET_REMOVE;
> + scsi_target_reap(starget);
How about good grief no! A device with multiple targets will get it's
lists screwed with this
The STARGET_REMOVE state you added only applies to the case we're
trying to kill a target. In the natural operation case, which is what
everyone else is running into, we will try to remove a running target
when it has no more scsi devices left on it. So the correct patch
should be to make the BUG_ON see this:
James
---
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 27df7e7..e0a78f5 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -319,8 +319,7 @@ static void scsi_target_destroy(struct scsi_target *starget)
struct Scsi_Host *shost = dev_to_shost(dev->parent);
unsigned long flags;
- BUG_ON(starget->state != STARGET_REMOVE &&
- starget->state != STARGET_CREATED);
+ BUG_ON(starget->state == STARGET_DEL);
starget->state = STARGET_DEL;
transport_destroy_device(dev);
spin_lock_irqsave(shost->host_lock, flags);
^ permalink raw reply related
* Re: [-next] BUG_ON in scsi_target_destroy()
From: Sergey Senozhatsky @ 2016-04-13 14:47 UTC (permalink / raw)
To: Johannes Thumshirn
Cc: Sergey Senozhatsky, Ewan D. Milne, Hannes Reinecke,
James Bottomley, Martin K. Petersen, Stephen Rothwell, linux-scsi,
linux-kernel, linux-usb, linux-next, Sergey Senozhatsky,
Xiong Zhou
In-Reply-To: <2201725.I2to9GCRQJ@c203>
Hi,
On (04/13/16 10:41), Johannes Thumshirn wrote:
> Hi Sergey, Xiong,
>
> Can you try below patch?
it panics my system.
first it warn_on-s in lib/kobject.c:244
then NULL dereferences
do_scan_async
__scsi_remove_device
scsi_target_reap
device_del
dpm_sysfs_remove
sysfs_unmerge_group
kernfs_find_and_get_ns
kernfs_find_ns
-ss
^ permalink raw reply
* Re: [-next] BUG_ON in scsi_target_destroy()
From: Johannes Thumshirn @ 2016-04-13 13:59 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Sergey Senozhatsky, Ewan D. Milne, Hannes Reinecke,
James Bottomley, Martin K. Petersen, Stephen Rothwell, linux-scsi,
linux-kernel, linux-usb, linux-next, Xiong Zhou
In-Reply-To: <20160413144704.GA490@swordfish>
On Mittwoch, 13. April 2016 23:47:04 CEST Sergey Senozhatsky wrote:
> Hi,
>
> On (04/13/16 10:41), Johannes Thumshirn wrote:
> > Hi Sergey, Xiong,
> >
> > Can you try below patch?
>
> it panics my system.
> first it warn_on-s in lib/kobject.c:244
>
> then NULL dereferences
> do_scan_async
> __scsi_remove_device
> scsi_target_reap
> device_del
> dpm_sysfs_remove
> sysfs_unmerge_group
> kernfs_find_and_get_ns
> kernfs_find_ns
>
> -ss
>
Thanks for the update, I'll have a look into the callchain
--
Johannes Thumshirn Storage
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply
* Re: [-next] BUG_ON in scsi_target_destroy()
From: Johannes Thumshirn @ 2016-04-13 8:41 UTC (permalink / raw)
To: Sergey Senozhatsky
Cc: Ewan D. Milne, Hannes Reinecke, James Bottomley,
Martin K. Petersen, Stephen Rothwell,
linux-scsi-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-next-u79uwXL29TY76Z2rM5mHXA, Sergey Senozhatsky, Xiong Zhou
In-Reply-To: <20160411090146.GA537@swordfish>
Hi Sergey, Xiong,
Can you try below patch?
On Montag, 11. April 2016 18:01:47 CEST Sergey Senozhatsky wrote:
> Hello,
>
> commit 7b106f2de6938c31ce5e9c86bc70ad3904666b96
> Author: Johannes Thumshirn <jthumshirn-l3A5Bk7waGM@public.gmane.org>
> Date: Tue Apr 5 11:50:44 2016 +0200
>
> scsi: Add intermediate STARGET_REMOVE state to scsi_target_state
>
>
> BUG_ON()s (next-20160411) each time I remove a usb flash
>
> [ 49.561600] [<ffffffffa0087f42>] scsi_target_destroy+0x5a/0xcb [scsi_mod]
> [ 49.561607] [<ffffffffa0089099>] scsi_target_reap+0x4a/0x4f [scsi_mod]
> [ 49.561613] [<ffffffffa008b453>] __scsi_remove_device+0xc3/0xd0 [scsi_mod]
> [ 49.561619] [<ffffffffa0089d7b>] scsi_forget_host+0x52/0x63 [scsi_mod]
> [ 49.561623] [<ffffffffa0080dbc>] scsi_remove_host+0x8c/0x102 [scsi_mod]
> [ 49.561627] [<ffffffffa015c447>] usb_stor_disconnect+0x6b/0xab [usb_storage]
> [ 49.561634] [<ffffffffa0013f73>] usb_unbind_interface+0x77/0x1ca [usbcore]
> [ 49.561636] [<ffffffff813ae064>] __device_release_driver+0x9d/0x121
> [ 49.561638] [<ffffffff813ae10b>] device_release_driver+0x23/0x30
> [ 49.561639] [<ffffffff813ad2d1>] bus_remove_device+0xfb/0x10e
> [ 49.561641] [<ffffffff813aac05>] device_del+0x164/0x1e6
> [ 49.561648] [<ffffffffa0011b09>] ? remove_intf_ep_devs+0x3b/0x48 [usbcore]
> [ 49.561655] [<ffffffffa001200e>] usb_disable_device+0x84/0x1a5 [usbcore]
> [ 49.561661] [<ffffffffa000ac7b>] usb_disconnect+0x94/0x19f [usbcore]
> [ 49.561667] [<ffffffffa000c2ab>] hub_event+0x5c1/0xdea [usbcore]
> [ 49.561670] [<ffffffff810530b1>] process_one_work+0x1dc/0x37f
> [ 49.561672] [<ffffffff81053dc5>] worker_thread+0x282/0x36d
> [ 49.561673] [<ffffffff81053b43>] ? rescuer_thread+0x2ae/0x2ae
> [ 49.561675] [<ffffffff810580a8>] kthread+0xd2/0xda
> [ 49.561678] [<ffffffff814bbf92>] ret_from_fork+0x22/0x40
> [ 49.561679] [<ffffffff81057fd6>] ? kthread_worker_fn+0x13e/0x13e
>
> -ss
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 0734927..0c00928 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1276,6 +1276,7 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
void __scsi_remove_device(struct scsi_device *sdev)
{
struct device *dev = &sdev->sdev_gendev;
+ struct scsi_target *starget;
/*
* This cleanup path is not reentrant and while it is impossible
@@ -1315,7 +1316,9 @@ void __scsi_remove_device(struct scsi_device *sdev)
* remoed sysfs visibility from the device, so make the target
* invisible if this was the last device underneath it.
*/
- scsi_target_reap(scsi_target(sdev));
+ starget = scsi_target(sdev);
+ starget->state = STARGET_REMOVE;
+ scsi_target_reap(starget);
put_device(dev);
}
--
Johannes Thumshirn Storage
jthumshirn-l3A5Bk7waGM@public.gmane.org +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* Re: linux-next: Tree for Apr 4
From: Heiko Carstens @ 2016-04-13 7:52 UTC (permalink / raw)
To: Martin Schwidefsky
Cc: Sudip Mukherjee, Stephen Rothwell, linux-next, linux-kernel,
linux-s390
In-Reply-To: <20160412183408.248092c7@mschwide>
On Tue, Apr 12, 2016 at 06:34:08PM +0200, Martin Schwidefsky wrote:
> On Mon, 4 Apr 2016 16:26:35 +0200
> Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
>
> > On Mon, Apr 04, 2016 at 05:51:09PM +0530, Sudip Mukherjee wrote:
> > > On Monday 04 April 2016 09:39 AM, Stephen Rothwell wrote:
> > > >Hi all,
> > > >
> > > >Changes since 20160401:
> > >
> > > s390 allmodconfig build fails with the error:
> > >
> > > arch/s390/crypto/ghash_s390.c:14:24: fatal error: crypt_s390.h: No
> > > such file or directory
> > > #include "crypt_s390.h"
> > > ^
> > >
> > > build log is at:
> > > https://travis-ci.org/sudipm-mukherjee/parport/jobs/120536718
> > >
> > > caused by the commit -
> > > ce69a690149c ("s390/crypto: cleanup and move the header with the
> > > cpacf definitions") which removed the file "crypt_s390.h"
> >
> > Thanks for letting us know!
> >
> > I just removed that specific patch from the 'features' branch again. It was
> > incomplete since it didn't convert the ghash module at all.
> >
> > No idea what Martin was thinking when pushing that patch.
>
> That is strange. On my local features branch that I use to push to kerne.org
> there is no ghash commit. The last commit is this:
Nobody said there is a ghash commit ;)
> commit ce69a690149c7431d05b4679409ab8fa6ad3a09f
> Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Date: Thu Mar 17 15:22:12 2016 +0100
>
> s390/crypto: cleanup and move the header with the cpacf definitions
>
> which Heiko now removed. My guest right now is that the ghash commit stems
> from another tree merged into linux-next and we simply have an unresolved
> dependency here. I do have an updated ghash patch that includes the correct
> header.
Your patch did not convert/touch arch/s390/crypto/ghash_s390.c which is
very old code. And you need to do more within that file than just changing
the include.
^ permalink raw reply
* linux-next: build failure after merge of the net-next tree
From: Stephen Rothwell @ 2016-04-13 7:50 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Mark Rustad, Jeff Kirsher,
Andrew Bowers, Build bot for Mark Brown, kernel-build-reports,
linaro-kernel
Hi all,
[A report from Mark's buildbot]
After merging the net-next tree, today's linux-next build (arm
allmodconfig) failed like thisi (this has actually been failing for a
few days, now):
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Caused by commit
49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type")
arm only allows udelay()s up to 2 milliseconds. This commit
adds a 5 ms udelay in ixgbe_acquire_swfw_sync_x550em_a() in
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* next-20160413 build: 1 failures 17 warnings (next-20160413)
From: Build bot for Mark Brown @ 2016-04-13 7:33 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160413
Git describe: next-20160413
Commit: 54ea972ac5 Add linux-next specific files for 20160413
Build Time: 85 min 33 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 17
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
14 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 17
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 14 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 13
From: Stephen Rothwell @ 2016-04-13 5:05 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160412:
The keys tree gained a conflict against the crypto tree.
The akpm-current tree still had its build failure for which I applied
a patch.
Non-merge commits (relative to Linus' tree): 3274
3208 files changed, 125941 insertions(+), 78193 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (1c74a7f812b1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (0dee6c82c2aa ARC: [plat-axs103] Enable loop block devices)
Merging arm-current/fixes (208fae5c3b94 ARM: 8550/1: protect idiv patching against undefined gcc behavior)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (1ecf689013b5 devlink: add missing install of header)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (8f815cdde3e5 nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (adcdd0d5a1cb ALSA: usb-audio: Skip volume controls triggers hangup on Dell USB Dock)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (87243deb8867 debugfs: Make automount point inodes permanently empty)
Merging tty.current/tty-linus (bf1620068911 Linux 4.6-rc3)
Merging usb.current/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask configuration)
Merging usb-serial-fixes/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (bf1620068911 Linux 4.6-rc3)
Merging char-misc.current/char-misc-linus (053f78d35995 Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want BTN_TOOL_<name> on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (42bf7b46a5de drm/i915: fix deadlock on lid open)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (2a8ffcb18371 ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (2c94ffb62d6b Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (3aa3d5fcd736 Merge branch 'fixes' into for-next)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f11671bc57fb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (cbbd63dd257b Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (28c3334242a9 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (6d5b4ac3dc09 Merge branch 'heads/fixes-for-v4.6' into next)
Merging rockchip/for-next (3ca335860606 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (190b9dbbb4d6 Merge branch 'next/defconfig' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (622c4dab4b80 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (d2a2bc721cef m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d584e7303bec MIPS: BMIPS: Pretty print BMIPS5200 processor name)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (aa14138a51ca cxl: Configure the PSL for two CAPI ports on POWER8NVL)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (c325a67c7290 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (615b2d2766d9 ext4 crypto: migrate into vfs's crypto engine)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (a527b38e1475 GFS2: fs/gfs2/glock.c: Deinline do_error, save 1856 bytes)
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (bf1620068911 Linux 4.6-rc3)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
CONFLICT (content): Merge conflict in fs/ext4/file.c
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (96ee96e16f9f Merge branch 'for-4.6/upstream-fixes' into for-next)
Merging i2c/i2c/for-next (18eadc912cd4 Merge branch 'i2c/for-current' into i2c/for-next)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (5b3af0edd8db hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (171912fdeb21 Merge branch 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61ca65df0313 Merge branch 'topic/xilinx' into next)
Merging net-next/master (69fb78121bf8 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (bddf59046d80 Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (8805eea2494a Bluetooth: hci_bcsp: fix code style)
Merging mac80211-next/master (57fbcce37be7 cfg80211: remove enum ieee80211_band)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (170697468d80 mtd: nand: omap2: rely on generic DT parsing done in nand_scan_ident())
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (b521973b45ef drm/i915: Don't read out port_clock on CHV when DPLL is disabled)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (f35034f8ac72 drm/core: Fix ordering in drm_mode_config_cleanup.)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (4cdd8b9b9fc9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (191227d99a28 ALSA: usb-audio: allow clock source validity interrupts)
Merging sound-asoc/for-next (7dba88f4fc60 Merge remote-tracking branches 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (dffba2648492 module: fix redundant test.)
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (1249d229d0d0 Merge branch 'for-4.7/drivers' into for-next)
Merging device-mapper/for-next (e243e0f1256a dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (feea9bc8c46d mmc: block: Use the mmc host device index as the mmcblk device index)
Merging md/for-next (5b5b7fd185e9 Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (e6e1c23744ef Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/s2mps11' and 'regulator/topic/twl' into regulator-next)
Merging security/next (3c9d6296b7ae security: drop the unused hook skb_owned_by)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (1ea6102bba5f Merge branch 'keys-trust' into keys-next)
CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (018ffbbd0b1f Merge remote-tracking branches 'spi/topic/pic32', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (316314cae15f KVM: x86: mask CPUID(0xD,0x1).EAX against host value)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (bf1620068911 Linux 4.6-rc3)
Merging usb/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-gadget/next (9735a22799b9 Linux 4.6-rc2)
Merging usb-serial/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (5f47992491ff Merge 4.6-rc3 into staging-next)
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (af59836135bf extcon: usb-gpio: Don't miss event during suspend/resume)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (1a3583e425fb Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (9e72376659d9 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (d56f8994b6fb clk: Provide OF helper to mark clocks as CRITICAL)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (0ee930b57e0c Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (1b3e91cd20ad coresight: configuring ETF in FIFO mode when acting as link)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (ebb3387ace84 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* linux-next: manual merge of the keys tree with the crypto tree
From: Stephen Rothwell @ 2016-04-13 2:03 UTC (permalink / raw)
To: David Howells, Herbert Xu; +Cc: linux-next, linux-kernel, Colin Ian King
Hi David,
Today's linux-next merge of the keys tree got a conflict in:
crypto/asymmetric_keys/pkcs7_parser.c
between commit:
06af9b0f4949 ("PKCS#7: fix missing break on OID_sha224 case")
from the crypto tree and commit:
566a117a8b24 ("PKCS#7: Make the signature a pointer rather than embedding it")
from the keys tree.
I fixed it up (the latter added the same "break" statement) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* linux-next: build warning in Linus' tree
From: Stephen Rothwell @ 2016-04-12 23:59 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Rob Clark
Hi Dave,
Staring with Linus' tree, today's (and presumably previous) linux-next
build (arm multi_v7_defconfig) produced this warning:
drivers/gpu/drm/msm/msm_drv.c: In function 'msm_preclose':
drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
struct msm_kms *kms = priv->kms;
^
Introduced by commit
4016260ba47a ("rm/msm: fix bug after preclose removal")
merged into v4.6-rc2.
--
Cheers,
Stephen Rothwell
^ permalink raw reply
* Re: linux-next: Tree for Apr 4
From: Martin Schwidefsky @ 2016-04-12 16:34 UTC (permalink / raw)
To: Heiko Carstens
Cc: Sudip Mukherjee, Stephen Rothwell, linux-next, linux-kernel,
linux-s390
In-Reply-To: <20160404142635.GF4058@osiris>
On Mon, 4 Apr 2016 16:26:35 +0200
Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> On Mon, Apr 04, 2016 at 05:51:09PM +0530, Sudip Mukherjee wrote:
> > On Monday 04 April 2016 09:39 AM, Stephen Rothwell wrote:
> > >Hi all,
> > >
> > >Changes since 20160401:
> >
> > s390 allmodconfig build fails with the error:
> >
> > arch/s390/crypto/ghash_s390.c:14:24: fatal error: crypt_s390.h: No
> > such file or directory
> > #include "crypt_s390.h"
> > ^
> >
> > build log is at:
> > https://travis-ci.org/sudipm-mukherjee/parport/jobs/120536718
> >
> > caused by the commit -
> > ce69a690149c ("s390/crypto: cleanup and move the header with the
> > cpacf definitions") which removed the file "crypt_s390.h"
>
> Thanks for letting us know!
>
> I just removed that specific patch from the 'features' branch again. It was
> incomplete since it didn't convert the ghash module at all.
>
> No idea what Martin was thinking when pushing that patch.
That is strange. On my local features branch that I use to push to kerne.org
there is no ghash commit. The last commit is this:
commit ce69a690149c7431d05b4679409ab8fa6ad3a09f
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu Mar 17 15:22:12 2016 +0100
s390/crypto: cleanup and move the header with the cpacf definitions
which Heiko now removed. My guest right now is that the ghash commit stems
from another tree merged into linux-next and we simply have an unresolved
dependency here. I do have an updated ghash patch that includes the correct
header.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply
* next-20160412 build: 1 failures 17 warnings (next-20160412)
From: Build bot for Mark Brown @ 2016-04-12 7:34 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160412
Git describe: next-20160412
Commit: e45df7c04b Add linux-next specific files for 20160412
Build Time: 85 min 56 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 17
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
14 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 17
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 14 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 12
From: Stephen Rothwell @ 2016-04-12 4:34 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160411:
The akpm-current tree still had its build failure for which I applied
a patch.
Non-merge commits (relative to Linus' tree): 3093
2887 files changed, 119069 insertions(+), 73221 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (1c74a7f812b1 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (0dee6c82c2aa ARC: [plat-axs103] Enable loop block devices)
Merging arm-current/fixes (208fae5c3b94 ARM: 8550/1: protect idiv patching against undefined gcc behavior)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (4f7f34eaab9f net: vrf: Fix dev refcnt leak due to IPv6 prefix route)
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (76e6abb5798a nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (c636b95ec598 ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T460s)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (bf1620068911 Linux 4.6-rc3)
Merging usb.current/usb-linus (bf1620068911 Linux 4.6-rc3)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask configuration)
Merging usb-serial-fixes/usb-linus (d48d5691ebf8 USB: option: add "D-Link DWM-221 B1" device id)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (bf1620068911 Linux 4.6-rc3)
Merging char-misc.current/char-misc-linus (053f78d35995 Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want BTN_TOOL_<name> on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (42bf7b46a5de drm/i915: fix deadlock on lid open)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (2a8ffcb18371 ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (2c94ffb62d6b Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (55199a55c624 Merge branch 'fixes' into for-next)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f11671bc57fb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (11cd82347cf2 Merge branch 'omap-for-v4.7/dt' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (28c3334242a9 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (6d5b4ac3dc09 Merge branch 'heads/fixes-for-v4.6' into next)
Merging rockchip/for-next (29254cec05b2 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c673f2334187 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (87e090966759 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (d2a2bc721cef m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d584e7303bec MIPS: BMIPS: Pretty print BMIPS5200 processor name)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (aa14138a51ca cxl: Configure the PSL for two CAPI ports on POWER8NVL)
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (eca999f1db56 Merge branch 'for-next-4.6-20160411' into for-next-20160411)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (c325a67c7290 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (fec3fd6ad71f f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (611526756a3d gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read())
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (bf1620068911 Linux 4.6-rc3)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (ab99ccb59bc1 Merge branch 'for-4.7/upstream' into for-next)
Merging i2c/i2c/for-next (a51a79d50ebc i2c: st: use new 8 bit address helper function)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (5b3af0edd8db hwmon: (it87) Add support for IT8628E)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (171912fdeb21 Merge branch 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61ca65df0313 Merge branch 'topic/xilinx' into next)
Merging net-next/master (7c3da7d0d4f3 Merge branch 'rprpc-2nd-rewrite-part-1')
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (bddf59046d80 Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next)
Merging bluetooth/master (8805eea2494a Bluetooth: hci_bcsp: fix code style)
Merging mac80211-next/master (fcfeed737254 cfg80211: Improve Connect/Associate command documentation)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (f50756d489fe mtd/ifc: Add support for IFC controller version 2.0)
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (f470b19095c2 drm/i915/userptr: Store i915 backpointer for i915_mm_struct)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (4cdd8b9b9fc9 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (191227d99a28 ALSA: usb-audio: allow clock source validity interrupts)
Merging sound-asoc/for-next (4e1c0f572696 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (904953eed12b dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (486be4123913 mmc: sdhci-pic32: remove owner assignment)
Merging md/for-next (5b5b7fd185e9 Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (6ffb6de85738 Merge remote-tracking branches 'regulator/topic/s2mps11' and 'regulator/topic/twl' into regulator-next)
Merging security/next (3c9d6296b7ae security: drop the unused hook skb_owned_by)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (fc55ca1ccb19 Merge remote-tracking branches 'spi/topic/pic32', 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (316314cae15f KVM: x86: mask CPUID(0xD,0x1).EAX against host value)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (bf1620068911 Linux 4.6-rc3)
Merging usb/usb-next (bf1620068911 Linux 4.6-rc3)
Merging usb-gadget/next (9735a22799b9 Linux 4.6-rc2)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (5f47992491ff Merge 4.6-rc3 into staging-next)
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (af59836135bf extcon: usb-gpio: Don't miss event during suspend/resume)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (1a3583e425fb Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (9e72376659d9 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (d56f8994b6fb clk: Provide OF helper to mark clocks as CRITICAL)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (0ee930b57e0c Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (8315ef1aef6a drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: linux-next: manual merge of the staging tree with Linus' tree
From: Greg KH @ 2016-04-11 16:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Kirill A. Shutemov
In-Reply-To: <20160405134927.75b47655@canb.auug.org.au>
On Tue, Apr 05, 2016 at 01:49:27PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/lustre/lnet/selftest/brw_test.c
> drivers/staging/lustre/lustre/include/lu_object.h
> drivers/staging/lustre/lustre/lclient/lcommon_cl.c
> drivers/staging/lustre/lustre/llite/llite_internal.h
> drivers/staging/lustre/lustre/llite/llite_lib.c
> drivers/staging/lustre/lustre/llite/llite_mmap.c
> drivers/staging/lustre/lustre/llite/rw.c
> drivers/staging/lustre/lustre/llite/rw26.c
> drivers/staging/lustre/lustre/llite/vvp_io.c
> drivers/staging/lustre/lustre/llite/vvp_page.c
> drivers/staging/lustre/lustre/obdclass/class_obd.c
> drivers/staging/lustre/lustre/obdecho/echo_client.c
> drivers/staging/lustre/lustre/osc/lproc_osc.c
> drivers/staging/lustre/lustre/osc/osc_cache.c
> drivers/staging/lustre/lustre/osc/osc_page.c
> drivers/staging/lustre/lustre/osc/osc_request.c
>
> between commits:
>
> 09cbfeaf1a5a ("mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros")
> ea1754a08476 ("mm, fs: remove remaining PAGE_CACHE_* and page_cache_{get,release} usage")
>
> from Linus' tree and lots of commits from the staging tree.
>
> I fixed it up (see below the signature) 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.
>
> I also added this merge fix patch:
Thanks for this, it should all now be resolved in my tree.
greg k-h
^ permalink raw reply
* Re: next-20160401+: ARM: DRA7: linux-next regression: mm/slab: clean-up kmem_cache_node setup
From: Nishanth Menon @ 2016-04-11 13:15 UTC (permalink / raw)
To: Joonsoo Kim
Cc: Andrew Morton, Tony Lindgren, Russell King, linux-omap,
linux-arm-kernel@lists.infradead.org, lkml, linux-next
In-Reply-To: <20160411020203.GA25211@js1304-P5Q-DELUXE>
On 04/10/2016 09:02 PM, Joonsoo Kim wrote:
> On Fri, Apr 08, 2016 at 03:39:20PM -0500, Nishanth Menon wrote:
>> Hi,
>>
>> http://marc.info/?l=linux-omap&m=146014314115625&w=2 series works with
>> v4.6-rc2 kernel, however, it fails with linux-next for suspend-to-ram
>> (mem) on BeagleBoard-X15
>>
>> next-20160327 - good
>> next-20160329 - good
>> next-20160330 - Fails to boot - I2C crashes
>> next-20160331- Fails to boot - USB crashes
>> next-20160401 -> bad
>> next-20160408 -> bad
>>
>> Bisect log of next-20160408 vs v4.6-rc2 ->
>> http://pastebin.ubuntu.com/15697856/
>>
>> # first bad commit: [2b629704a2b6a5b239f23750e5517a9d8c3a4e8c]
>> mm/slab: clean-up kmem_cache_node setup
>>
>
> Hello,
>
> I made a mistake on that patch. Could you try to test below one on
> top of it.
>
> Thanks.
Thanks for the fix
http://pastebin.ubuntu.com/15758542/ -> things are back to working now.
>
> --------->8----------------
> From d3af3cc409527e9be6beb62ea395cde67f3c5029 Mon Sep 17 00:00:00 2001
> From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> Date: Mon, 11 Apr 2016 10:48:29 +0900
> Subject: [PATCH] mm/slab: clean-up kmem_cache_node setup-fix
>
> After calling free_block(), we need to re-calculate array_cache's
> avail counter. Fix it.
>
> And, it's better to free objects in shared array when it is
> really necessary. Check it before calling free_block().
>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
please feel free to add:
Tested-by: Nishanth Menon <nm@ti.com>
> ---
> mm/slab.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/mm/slab.c b/mm/slab.c
> index fcd5fbb..27cb390 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -927,9 +927,10 @@ static int setup_kmem_cache_node(struct kmem_cache *cachep,
>
> n = get_node(cachep, node);
> spin_lock_irq(&n->list_lock);
> - if (n->shared) {
> + if (n->shared && force_change) {
> free_block(cachep, n->shared->entry,
> n->shared->avail, node, &list);
> + n->shared->avail = 0;
> }
>
> if (!n->shared || force_change) {
>
--
Regards,
Nishanth Menon
^ permalink raw reply
* Re: Kernel crash on startup - bisected to commit 3b24d854cb35
From: Kalle Valo @ 2016-04-11 12:40 UTC (permalink / raw)
To: Larry Finger
Cc: Eric Dumazet, David S. Miller, linux-next, linux-netdev, LKML,
linux-wireless
In-Reply-To: <570934C9.5020008@lwfinger.net>
Larry Finger <Larry.Finger@lwfinger.net> writes:
>> Can you double check you have this fix ?
>>
>> commit 8501786929de4616b10b8059ad97abd304a7dddf
>> Author: Eric Dumazet <edumazet@google.com>
>> Date: Wed Apr 6 22:07:34 2016 -0700
>>
>> tcp/dccp: fix inet_reuseport_add_sock()
>>
>> David Ahern reported panics in __inet_hash() caused by my recent commit.
>>
>> The reason is inet_reuseport_add_sock() was still using
>> sk_nulls_for_each_rcu() instead of sk_for_each_rcu().
>> SO_REUSEPORT enabled listeners were causing an instant crash.
>>
>> While chasing this bug, I found that I forgot to clear SOCK_RCU_FREE
>> flag, as it is inherited from the parent at clone time.
>>
>> Fixes: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
>> under synflood")
>> Signed-off-by: Eric Dumazet <edumazet@google.com>
>> Reported-by: David Ahern <dsa@cumulusnetworks.com>
>> Tested-by: David Ahern <dsa@cumulusnetworks.com>
>> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> No, I did not have that patch. After pulling from net-next to get it,
> my system no longer panics.
>
> Note to linux-wireless readers. At the moment, a system built from
> wireless-drivers-next will have this problem.
I'm currently writing a pull request to Dave and once he pulls it I'll
fast forward wireless-drivers-next to latest net-next. Usually this take
two days or so.
--
Kalle Valo
^ permalink raw reply
* Re: next-20160401+: ARM: DRA7: linux-next regression: mm/slab: clean-up kmem_cache_node setup
From: Jon Hunter @ 2016-04-11 11:44 UTC (permalink / raw)
To: Joonsoo Kim, Nishanth Menon
Cc: Russell King, Tony Lindgren, lkml, linux-next, Andrew Morton,
linux-omap, linux-arm-kernel@lists.infradead.org
In-Reply-To: <20160411020203.GA25211@js1304-P5Q-DELUXE>
On 11/04/16 03:02, Joonsoo Kim wrote:
> On Fri, Apr 08, 2016 at 03:39:20PM -0500, Nishanth Menon wrote:
>> Hi,
>>
>> http://marc.info/?l=linux-omap&m=146014314115625&w=2 series works with
>> v4.6-rc2 kernel, however, it fails with linux-next for suspend-to-ram
>> (mem) on BeagleBoard-X15
>>
>> next-20160327 - good
>> next-20160329 - good
>> next-20160330 - Fails to boot - I2C crashes
>> next-20160331- Fails to boot - USB crashes
>> next-20160401 -> bad
>> next-20160408 -> bad
>>
>> Bisect log of next-20160408 vs v4.6-rc2 ->
>> http://pastebin.ubuntu.com/15697856/
>>
>> # first bad commit: [2b629704a2b6a5b239f23750e5517a9d8c3a4e8c]
>> mm/slab: clean-up kmem_cache_node setup
>>
>
> Hello,
>
> I made a mistake on that patch. Could you try to test below one on
> top of it.
>
> Thanks.
>
> --------->8----------------
> From d3af3cc409527e9be6beb62ea395cde67f3c5029 Mon Sep 17 00:00:00 2001
> From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> Date: Mon, 11 Apr 2016 10:48:29 +0900
> Subject: [PATCH] mm/slab: clean-up kmem_cache_node setup-fix
>
> After calling free_block(), we need to re-calculate array_cache's
> avail counter. Fix it.
>
> And, it's better to free objects in shared array when it is
> really necessary. Check it before calling free_block().
>
> Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
> ---
> mm/slab.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/mm/slab.c b/mm/slab.c
> index fcd5fbb..27cb390 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -927,9 +927,10 @@ static int setup_kmem_cache_node(struct kmem_cache *cachep,
>
> n = get_node(cachep, node);
> spin_lock_irq(&n->list_lock);
> - if (n->shared) {
> + if (n->shared && force_change) {
> free_block(cachep, n->shared->entry,
> n->shared->avail, node, &list);
> + n->shared->avail = 0;
> }
>
> if (!n->shared || force_change) {
This also fixes a regression on -next for Tegra that was bisected down
to the same culprit. So ...
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Cheers
Jon
^ permalink raw reply
* [-next] BUG_ON in scsi_target_destroy()
From: Sergey Senozhatsky @ 2016-04-11 9:01 UTC (permalink / raw)
To: Johannes Thumshirn
Cc: Ewan D. Milne, Hannes Reinecke, James Bottomley,
Martin K. Petersen, Stephen Rothwell, linux-scsi, linux-kernel,
linux-usb, linux-next, Sergey Senozhatsky, Sergey Senozhatsky
Hello,
commit 7b106f2de6938c31ce5e9c86bc70ad3904666b96
Author: Johannes Thumshirn <jthumshirn@suse.de>
Date: Tue Apr 5 11:50:44 2016 +0200
scsi: Add intermediate STARGET_REMOVE state to scsi_target_state
BUG_ON()s (next-20160411) each time I remove a usb flash
[ 49.561600] [<ffffffffa0087f42>] scsi_target_destroy+0x5a/0xcb [scsi_mod]
[ 49.561607] [<ffffffffa0089099>] scsi_target_reap+0x4a/0x4f [scsi_mod]
[ 49.561613] [<ffffffffa008b453>] __scsi_remove_device+0xc3/0xd0 [scsi_mod]
[ 49.561619] [<ffffffffa0089d7b>] scsi_forget_host+0x52/0x63 [scsi_mod]
[ 49.561623] [<ffffffffa0080dbc>] scsi_remove_host+0x8c/0x102 [scsi_mod]
[ 49.561627] [<ffffffffa015c447>] usb_stor_disconnect+0x6b/0xab [usb_storage]
[ 49.561634] [<ffffffffa0013f73>] usb_unbind_interface+0x77/0x1ca [usbcore]
[ 49.561636] [<ffffffff813ae064>] __device_release_driver+0x9d/0x121
[ 49.561638] [<ffffffff813ae10b>] device_release_driver+0x23/0x30
[ 49.561639] [<ffffffff813ad2d1>] bus_remove_device+0xfb/0x10e
[ 49.561641] [<ffffffff813aac05>] device_del+0x164/0x1e6
[ 49.561648] [<ffffffffa0011b09>] ? remove_intf_ep_devs+0x3b/0x48 [usbcore]
[ 49.561655] [<ffffffffa001200e>] usb_disable_device+0x84/0x1a5 [usbcore]
[ 49.561661] [<ffffffffa000ac7b>] usb_disconnect+0x94/0x19f [usbcore]
[ 49.561667] [<ffffffffa000c2ab>] hub_event+0x5c1/0xdea [usbcore]
[ 49.561670] [<ffffffff810530b1>] process_one_work+0x1dc/0x37f
[ 49.561672] [<ffffffff81053dc5>] worker_thread+0x282/0x36d
[ 49.561673] [<ffffffff81053b43>] ? rescuer_thread+0x2ae/0x2ae
[ 49.561675] [<ffffffff810580a8>] kthread+0xd2/0xda
[ 49.561678] [<ffffffff814bbf92>] ret_from_fork+0x22/0x40
[ 49.561679] [<ffffffff81057fd6>] ? kthread_worker_fn+0x13e/0x13e
-ss
^ permalink raw reply
* next-20160411 build: 1 failures 17 warnings (next-20160411)
From: Build bot for Mark Brown @ 2016-04-11 7:22 UTC (permalink / raw)
To: kernel-build-reports, linaro-kernel, linux-next
Tree/Branch: next-20160411
Git describe: next-20160411
Commit: cb1c952669 Add linux-next specific files for 20160411
Build Time: 88 min 5 sec
Passed: 8 / 9 ( 88.89 %)
Failed: 1 / 9 ( 11.11 %)
Errors: 1
Warnings: 17
Section Mismatches: 0
Failed defconfigs:
arm-allmodconfig
Errors:
arm-allmodconfig
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
-------------------------------------------------------------------------------
defconfigs with issues (other than build errors):
3 warnings 0 mismatches : arm64-allnoconfig
12 warnings 0 mismatches : arm64-allmodconfig
2 warnings 0 mismatches : arm-multi_v5_defconfig
5 warnings 0 mismatches : arm-multi_v7_defconfig
14 warnings 0 mismatches : arm-allmodconfig
7 warnings 0 mismatches : arm64-defconfig
-------------------------------------------------------------------------------
Errors summary: 1
1 ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings Summary: 17
5 <stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
5 <stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
5 ../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
5 ../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
3 ../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
3 ../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
2 ../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
2 ../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
1 ../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
1 ../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
1 ../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
===============================================================================
Detailed per-defconfig build reports below:
-------------------------------------------------------------------------------
arm64-allnoconfig : PASS, 0 errors, 3 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
-------------------------------------------------------------------------------
arm64-allmodconfig : PASS, 0 errors, 12 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
arm-multi_v5_defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches
Warnings:
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-multi_v7_defconfig : PASS, 0 errors, 5 warnings, 0 section mismatches
Warnings:
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
-------------------------------------------------------------------------------
arm-allmodconfig : FAIL, 1 errors, 14 warnings, 0 section mismatches
Errors:
ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined!
Warnings:
../kernel/trace/bpf_trace.c:350:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../kernel/trace/bpf_trace.c:368:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
../lib/lz4/lz4hc_compress.c:514:1: warning: the frame size of 1472 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/gpu/drm/omapdrm/dss/dsi.c:1183:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/msm_drv.c:468:18: warning: unused variable 'kms' [-Wunused-variable]
../drivers/gpu/drm/omapdrm/dss/hdmi4.c:117:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/omapdrm/dss/hdmi5.c:134:2: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/dsi_host.c:329:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/gpu/drm/msm/dsi/phy/dsi_phy.c:181:3: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/mtd/chips/cfi_cmdset_0020.c:651:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../drivers/tty/serial/uartlite.c:348:21: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
../drivers/tty/serial/uartlite.c:354:22: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
-------------------------------------------------------------------------------
arm64-defconfig : PASS, 0 errors, 7 warnings, 0 section mismatches
Warnings:
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
../mm/gup.c:1510:20: warning: unused variable 'mm' [-Wunused-variable]
../drivers/regulator/core.c:2514:1: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
../include/linux/export.h:63:25: warning: 'regulator_can_change_voltage' is deprecated [-Wdeprecated-declarations]
<stdin>:1310:2: warning: #warning syscall preadv2 not implemented [-Wcpp]
<stdin>:1313:2: warning: #warning syscall pwritev2 not implemented [-Wcpp]
-------------------------------------------------------------------------------
Passed with no errors, warnings or mismatches:
x86_64-allnoconfig
arm-allnoconfig
x86_64-defconfig
^ permalink raw reply
* linux-next: Tree for Apr 11
From: Stephen Rothwell @ 2016-04-11 4:09 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
Hi all,
Changes since 20160408:
The akpm-current tree still had its build failure for which I applied
a patch.
Non-merge commits (relative to Linus' tree): 2971
2781 files changed, 115585 insertions(+), 69801 deletions(-)
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.
Below is a summary of the state of the merge.
I am currently merging 232 trees (counting Linus' and 35 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwell
$ git checkout master
$ git reset --hard stable
Merging origin/master (5b5b7fd185e9 Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging fixes/master (9735a22799b9 Linux 4.6-rc2)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
Merging arc-current/for-curr (0dee6c82c2aa ARC: [plat-axs103] Enable loop block devices)
Merging arm-current/fixes (208fae5c3b94 ARM: 8550/1: protect idiv patching against undefined gcc behavior)
Merging m68k-current/for-linus (7b8ba82ad4ad m68k/defconfig: Update defconfigs for v4.6-rc2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
Merging powerpc-fixes/fixes (71528d8bd7a8 powerpc: Correct used_vsr comment)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (5ec712934ce1 sparc: Write up preadv2/pwritev2 syscalls.)
Merging net/master (49dd48dafec6 sh_eth: re-enable-E-MAC interrupts in sh_eth_set_ringparam())
Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.)
Merging ipvs/master (7617a24f83b5 ipvs: correct initial offset of Call-ID header search in SIP persistence engine)
Merging wireless-drivers/master (15da5d11040c Merge tag 'iwlwifi-for-kalle-2016-03-30' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging mac80211/master (76e6abb5798a nl80211: check netlink protocol in socket release notification)
Merging sound-current/for-linus (b4203ff5464d ALSA: usb-audio: Add a quirk for Plantronics BT300)
Merging pci-current/for-linus (b2d7a9cd3ff8 Revert "PCI: imx6: Add support for active-low reset GPIO")
Merging driver-core.current/driver-core-linus (f55532a0c0b8 Linux 4.6-rc1)
Merging tty.current/tty-linus (5e00bbfbc5ec tty: Fix merge of "tty: Refactor tty_open()")
Merging usb.current/usb-linus (5b5b7fd185e9 Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging usb-gadget-fixes/fixes (adf9a3ab90eb usb: dwc3: keystone: drop dma_mask configuration)
Merging usb-serial-fixes/usb-linus (d48d5691ebf8 USB: option: add "D-Link DWM-221 B1" device id)
Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable)
Merging staging.current/staging-linus (53c43c5ca133 Revert "Staging: olpc_dcon: Remove obsolete driver")
Merging char-misc.current/char-misc-linus (053f78d35995 Merge tag 'lkdtm-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into char-misc-linus)
Merging input-current/for-linus (7eb5ca09e48e Input: clarify we want BTN_TOOL_<name> on proximity)
Merging crypto-current/master (47cd30608f3f hwrng: bcm63xx - fix device tree compilation)
Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling)
Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature)
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
Merging drm-intel-fixes/for-linux-next-fixes (42bf7b46a5de drm/i915: fix deadlock on lid open)
Merging asm-generic/master (a1cbaad75a8f asm-generic: remove old nonatomic-io wrapper files)
Merging arc/for-next (2a8ffcb18371 ARC: RIP arc_{get|set}_core_freq() clk API)
Merging arm/for-next (2c94ffb62d6b Merge branches 'fixes' and 'misc' into for-next)
Merging arm-perf/for-next/perf (f55532a0c0b8 Linux 4.6-rc1)
Merging arm-soc/for-next (35fe688abfcf arm-soc: document merges)
Merging at91/at91-next (503057c24478 Merge branches 'at91-4.7-soc' and 'at91-4.7-dt' into at91-next)
Merging bcm2835-dt/bcm2835-dt-next (48c3b1441a77 dt/bindings: bcm2835: correct description for DMA-int)
Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
Merging bcm2835-defconfig/bcm2835-defconfig-next (8d1a8c92a8c0 ARM: bcm2835: Enable CONFIG_PM.)
Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
Merging imx-mxs/for-next (f11671bc57fb Merge branch 'imx/defconfig' into for-next)
Merging keystone/next (1bdd5a9b339c ARM: dts: k2*: Rename the k2* files to keystone-k2* files)
Merging mvebu/for-next (550cd80600c7 Merge branch 'mvebu/defconfig' into mvebu/for-next)
Merging omap/for-next (6c19cf4fe33d Merge branch 'omap-for-v4.6/fixes' into for-next)
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
Merging qcom/for-next (28c3334242a9 ARM: dts: msm8974: Add SCM firmware node)
Merging renesas/next (6d5b4ac3dc09 Merge branch 'heads/fixes-for-v4.6' into next)
Merging rockchip/for-next (29254cec05b2 Merge branch 'v4.7-clk/next' into for-next)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1)
Merging samsung-krzk/for-next (c673f2334187 Merge branch 'next/dt' into for-next)
Merging sunxi/sunxi/for-next (93a96dc4ccc1 Merge branches 'sunxi/dt-for-4.7', 'sunxi/clocks-for-4.7' and 'sunxi/fixes-for-4.6' into sunxi/for-next)
Merging tegra/for-next (87e090966759 Merge branch for-4.7/arm64 into for-next)
Merging arm64/for-next/core (f55532a0c0b8 Linux 4.6-rc1)
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
Merging m68k/for-next (efbec135f11d m68k: Fix misspellings in comments.)
Merging m68knommu/for-next (275b0835d7d8 m68k/gpio: remove arch specific sysfs bus device)
Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
Merging microblaze/next (10f4b26deb41 microblaze/PCI: export isa_io_base to fix link errors)
Merging mips/mips-for-linux-next (d9365a0f8088 Merge branch '4.6-fixes' into mips-for-linux-next)
Merging nios2/for-next (8fe889274c7a nios2: Replace fdt_translate_address with of_flat_dt_translate_address)
Merging parisc-hd/for-next (b562e44f507e Linux 4.5)
Merging powerpc/next (6e669f085d59 powerpc: Fix unrecoverable SLB miss during restore_math())
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
Merging fsl/next (fba4e9f9898a powerpc/fsl/dts: Add "jedec,spi-nor" flash compatible)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
Merging s390/features (05f13c49f4b8 s390: Clarify pagefault interrupt)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
Merging tile/master (f98983bbba0d tile/defconfigs: Remove CONFIG_IPV6_PRIVACY)
Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs)
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant)
Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.)
Merging btrfs-kdave/for-next (4fb4e4aecb76 Merge branch 'for-next-4.6-20160407' into for-next-20160407)
CONFLICT (content): Merge conflict in fs/btrfs/volumes.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c
Merging ceph/master (2224d879c7c0 rbd: use GFP_NOIO consistently for request allocations)
Merging cifs/for-next (b562e44f507e Linux 4.5)
Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
Merging ext3/for_next (8f9e8f5fcc05 ocfs2: Fix Q_GETNEXTQUOTA for filesystem without quotas)
Merging ext4/dev (c325a67c7290 ext4: ignore quota mount options if the quota feature is enabled)
Merging f2fs/dev (0bc3d0fd7525 f2fs: add BUG_ON to avoid unnecessary flow)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
Merging fuse/for-next (742f992708df fuse: return patrial success from fuse_direct_io())
Merging gfs2/for-next (611526756a3d gfs2: Use gfs2 wrapper to sync inode before calling generic_file_splice_read())
Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats)
Merging nfs/linux-next (9735a22799b9 Linux 4.6-rc2)
Merging nfsd/nfsd-next (ac503e4a309a nfsd: use short read as well as i_size to set eof)
Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable)
Merging overlayfs/overlayfs-next (e3608e3f68f6 Btrfs: fix crash/invalid memory access on fsync when using overlayfs)
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header)
Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next)
Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
Merging vfs/for-next (489eda8cd1a6 Merge branches 'work.acl', 'work.const-path' and 'work.misc' into for-next)
Merging pci/next (9735a22799b9 Linux 4.6-rc2)
Merging hid/for-next (ab99ccb59bc1 Merge branch 'for-4.7/upstream' into for-next)
Merging i2c/i2c/for-next (caf280800aaf i2c: jz4780: really prevent potential division by zero)
Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
Merging hwmon-staging/hwmon-next (d8829bb60521 hwmon: (fam15h_power) Add platform check function)
Merging v4l-dvb/master (405ddbfa6817 [media] Revert "[media] media: au0828 change to use Managed Media Controller API")
Merging libata/for-next (f8193efa5cdc Merge branch 'for-4.7' into for-next)
Merging pm/linux-next (171912fdeb21 Merge branch 'pm-tools' into linux-next)
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
Merging thermal/next (81ad4276b505 Thermal: Ignore invalid trip points)
Merging thermal-soc/next (c960fe12d002 thermal: hisilicon: fix IRQ imbalance enabling)
Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64)
Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster())
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
Merging slave-dma/next (61ca65df0313 Merge branch 'topic/xilinx' into next)
Merging net-next/master (ae95d7126104 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
Merging ipvs-next/master (f6ca9f46f661 netfilter: ipvs: avoid unused variable warnings)
Merging wireless-drivers-next/master (20ac1b325d8d Merge ath-next from ath.git)
Merging bluetooth/master (8805eea2494a Bluetooth: hci_bcsp: fix code style)
Merging mac80211-next/master (fcfeed737254 cfg80211: Improve Connect/Associate command documentation)
Merging rdma/for-next (520a07bff6fb Merge branches 'i40iw', 'sriov' and 'hfi1' into k.o/for-4.6)
Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan)
Merging l2-mtd/master (08922f644878 mtd: devices: m25p80: add support for mmap read request)
Merging nand/nand/next (f50756d489fe mtd/ifc: Add support for IFC controller version 2.0)
Merging crypto/master (043809d8d25e hwrng: exynos - Fix misspelled Samsung address)
Merging drm/drm-next (d00b39c17573 Merge branch 'drm-next-analogix-dp-v2' of github.com:yakir-Yang/linux into drm-next)
Merging drm-panel/drm/panel/for-next (c8a3b2ae0713 drm/bridge: Make (pre/post) enable/disable callbacks optional)
Merging drm-intel/for-linux-next (5dd8e50c27cd drm/i915: Replace manual barrier() with READ_ONCE() in HWS accessor)
Merging drm-tegra/drm/tegra/for-next (3a9b33c6048a drm/tegra: Don't set a gamma table size)
Merging drm-misc/topic/drm-misc (249c4f538b1a drm: Add new DCS commands in the enum list)
Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
Merging drm-msm/msm-next (fcda50c8f484 drm/msm: rename hdmi symbols)
Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code)
Merging drm-vc4/drm-vc4-next (4abfa518f0a0 drm/vc4: Add DPI driver)
Merging kbuild/for-next (2468fc97cc45 Merge branch 'kbuild/kbuild' into kbuild/for-next)
Merging kconfig/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging regmap/for-next (1688fc1d5733 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next)
Merging sound/for-next (191227d99a28 ALSA: usb-audio: allow clock source validity interrupts)
Merging sound-asoc/for-next (1df1dcbf92e1 Merge remote-tracking branches 'asoc/topic/tas571x', 'asoc/topic/topology', 'asoc/topic/wm8960' and 'asoc/topic/wm8962' into asoc-next)
Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
Merging input/next (74813cebd678 Input: bcm_iproc_tsc - use syscon to access shared registers)
Merging block/for-next (258b83ad9930 Merge branch 'for-linus' into for-next)
Merging device-mapper/for-next (dfa4e82a05c3 dm mpath: eliminate use of spinlock in IO fast-paths)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
Merging mmc-uh/next (f6bc639ccf6c mmc: tmio: Remove redundant runtime PM calls)
Merging md/for-next (5b5b7fd185e9 Merge branch 'parisc-4.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
Merging mfd/for-mfd-next (a557a7a09b08 mfd: lp8788-irq: Uninitialized variable in irq handler)
Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry)
Merging omap_dss2/for-next (32ad61951574 video: fbdev: sis: remove unused variable)
Merging regulator/for-next (824e23e95487 Merge remote-tracking branches 'regulator/topic/s2mps11' and 'regulator/topic/twl' into regulator-next)
Merging security/next (9735a22799b9 Linux 4.6-rc2)
Merging integrity/next (95ee08fa373b ima: require signed IMA policy)
Merging keys/keys-next (88a1b564a20e Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
Merging selinux/next (61d612ea731e selinux: restrict kernel module loading)
Merging tpmdd/next (59f95b842ad0 Merge branch 'master' into next)
Merging watchdog/master (d1ed3ba4e3d7 watchdog: Ensure that wdd is not dereferenced if NULL)
Merging iommu/next (ba72c4136584 Merge branches 'iommu/fixes', 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'ppc/pamu' into next)
Merging dwmw2-iommu/master (46924008273e iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts)
Merging vfio/next (c4aec3101319 vfio/pci: return -EFAULT if copy_to_user fails)
Merging jc_docs/docs-next (4817ebb144ff serial: doc: Correct return type of mctrl_gpio_to_gpiod())
Merging trivial/for-next (d00cd819d7df drivers/rtc: broken link fix)
Merging audit/next (7ffb8e317bae audit: we don't need to __set_current_state(TASK_RUNNING))
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
Merging dt-rh/for-next (bc553986a2f7 dtc: turn off dtc unit address warnings by default)
Merging mailbox/mailbox-for-next (aca04ce5dbda Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging spi/for-next (c9bfa8286167 Merge remote-tracking branches 'spi/topic/pxa2xx' and 'spi/topic/xlp' into spi-next)
Merging tip/auto-latest (c6ddb3131c7f Merge branch 'x86/urgent')
Merging clockevents/clockevents/next (23cb25d0f407 clocksource/drivers/arm_global_timer: Register delay timer)
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
Merging edac-amd/for-next (2364d423a7b3 ARM: socfpga: Enable Arria10 OCRAM ECC on startup)
Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next)
Merging ftrace/for-next (7e6867bf831c tracing: Record and show NMI state)
Merging rcu/rcu/next (f74d79be23b4 Merge branches 'locktorture.2016.03.31d' and 'docmb.2016.03.31d' into HEAD)
Merging kvm/linux-next (316314cae15f KVM: x86: mask CPUID(0xD,0x1).EAX against host value)
Merging kvm-arm/next (b40c4892d175 arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit)
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
Merging kvm-ppc-paulus/kvm-ppc-next (58ded4201ff0 KVM: PPC: Add support for 64bit TCE windows)
Merging kvms390/next (c87ff1433aca KVM: s390: add clear I/O irq operation for FLIC)
Merging xen-tip/linux-next (85d1a29de8e4 Xen on ARM and ARM64: update MAINTAINERS info)
Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
Merging workqueues/for-next (22aceb317678 workqueue: Fix comment for work_on_cpu())
Merging drivers-x86/for-next (fffcad87d4e7 hp-wmi: Remove GPS rfkill support via pre-2009 interface)
Merging chrome-platform/for-next (1dc318166a9a platform/chrome: use to_platform_device())
Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
Merging leds/for-next (916fe619951f leds: trigger: Introduce a kernel panic LED trigger)
Merging ipmi/for-next (42a018c63aee ipmi: do not probe ACPI devices if si_tryacpi is unset)
Merging driver-core/driver-core-next (3a3a5fece6f2 fs: kernfs: Replace CURRENT_TIME by current_fs_time())
Merging tty/tty-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb/usb-next (9735a22799b9 Linux 4.6-rc2)
Merging usb-gadget/next (9735a22799b9 Linux 4.6-rc2)
Merging usb-serial/usb-next (f55532a0c0b8 Linux 4.6-rc1)
Merging usb-chipidea-next/ci-for-usb-next (01b8479400ab usb: chipidea: imx: avoid EPROBE_DEFER printed as error)
Merging staging/staging-next (148e45dc87cb staging: vme: fix bare use of 'unsigned')
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_request.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/osc_cache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/osc/lproc_osc.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdecho/echo_client.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/obdclass/class_obd.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_page.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/vvp_io.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_mmap.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (modify/delete): drivers/staging/lustre/lustre/lclient/lcommon_cl.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/lclient/lcommon_cl.c left in tree.
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/include/lu_object.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/selftest/brw_test.c
CONFLICT (modify/delete): drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h left in tree.
CONFLICT (content): Merge conflict in drivers/iio/gyro/bmg160_core.c
$ git rm -f drivers/staging/lustre/lustre/lclient/lcommon_cl.c drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
Applying: lustre: fix ups for PAGE_CACHE_... removal
Merging char-misc/char-misc-next (423de92f56bd mei: bus: use scnprintf in *_show)
Merging extcon/extcon-next (90b1907f4f28 extcon: usb-gpio: switch to use pm wakeirq apis)
Merging cgroup/for-next (08fb4e7f8d5f Merge branch 'for-4.6' into for-next)
Merging scsi/for-next (1a3583e425fb Merge branch 'misc' into for-next)
Merging target-updates/for-next (5e47f1985d71 target: Fix target_release_cmd_kref shutdown comp leak)
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
Merging pinctrl/for-next (ca1c8b640fe8 Merge branch 'devel' into for-next)
Merging vhost/linux-next (c00bbcf86289 virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
Merging rpmsg/for-next (9735a22799b9 Linux 4.6-rc2)
Merging gpio/for-next (9e72376659d9 Merge branch 'devel' into for-next)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
Merging pwm/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging dma-buf/for-next (8f496d3fcc9d dma-buf/fence: fix fence_is_later v2)
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1)
Merging clk/clk-next (d56f8994b6fb clk: Provide OF helper to mark clocks as CRITICAL)
Merging aio/master (b562e44f507e Linux 4.5)
Merging kselftest/next (f55532a0c0b8 Linux 4.6-rc1)
Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
Merging livepatching/for-next (0ee930b57e0c Merge branch 'for-4.7/arch-independent-klp-relocations' into for-next)
Merging coresight/next (a587ddafe387 coresight: removing gratuitous boot time log messages)
Merging rtc/rtc-next (26ec9313b537 rtc: m41t80: handle oscillator failure bit)
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
Merging nvdimm/libnvdimm-for-next (a390180291dd libnvdimm, pfn: fix nvdimm_namespace_add_poison() vs section alignment)
Merging akpm-current/current (6c454fa77b78 ipc/msg.c: use freezable blocking call)
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
$ git checkout -b akpm remotes/origin/akpm/master
Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
Merging akpm/master (0c30f58c3e17 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
^ permalink raw reply
* Re: next-20160401+: ARM: DRA7: linux-next regression: mm/slab: clean-up kmem_cache_node setup
From: Joonsoo Kim @ 2016-04-11 2:02 UTC (permalink / raw)
To: Nishanth Menon
Cc: Andrew Morton, Tony Lindgren, Russell King, linux-omap,
linux-arm-kernel@lists.infradead.org, lkml, linux-next
In-Reply-To: <570816F8.9070301@ti.com>
On Fri, Apr 08, 2016 at 03:39:20PM -0500, Nishanth Menon wrote:
> Hi,
>
> http://marc.info/?l=linux-omap&m=146014314115625&w=2 series works with
> v4.6-rc2 kernel, however, it fails with linux-next for suspend-to-ram
> (mem) on BeagleBoard-X15
>
> next-20160327 - good
> next-20160329 - good
> next-20160330 - Fails to boot - I2C crashes
> next-20160331- Fails to boot - USB crashes
> next-20160401 -> bad
> next-20160408 -> bad
>
> Bisect log of next-20160408 vs v4.6-rc2 ->
> http://pastebin.ubuntu.com/15697856/
>
> # first bad commit: [2b629704a2b6a5b239f23750e5517a9d8c3a4e8c]
> mm/slab: clean-up kmem_cache_node setup
>
Hello,
I made a mistake on that patch. Could you try to test below one on
top of it.
Thanks.
--------->8----------------
>From d3af3cc409527e9be6beb62ea395cde67f3c5029 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Date: Mon, 11 Apr 2016 10:48:29 +0900
Subject: [PATCH] mm/slab: clean-up kmem_cache_node setup-fix
After calling free_block(), we need to re-calculate array_cache's
avail counter. Fix it.
And, it's better to free objects in shared array when it is
really necessary. Check it before calling free_block().
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
mm/slab.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/slab.c b/mm/slab.c
index fcd5fbb..27cb390 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -927,9 +927,10 @@ static int setup_kmem_cache_node(struct kmem_cache *cachep,
n = get_node(cachep, node);
spin_lock_irq(&n->list_lock);
- if (n->shared) {
+ if (n->shared && force_change) {
free_block(cachep, n->shared->entry,
n->shared->avail, node, &list);
+ n->shared->avail = 0;
}
if (!n->shared || force_change) {
--
1.9.1
^ permalink raw reply related
* RE: Commit 'sched/cpuacct: Split usage accounting into user_usage and sys_usage' causing crashes
From: Zhao Lei @ 2016-04-11 1:26 UTC (permalink / raw)
To: 'Guenter Roeck', 'Dongsheng Yang'
Cc: linux-kernel, 'Peter Zijlstra', 'Tejun Heo',
'Ingo Molnar', linux-next
In-Reply-To: <20160410161430.GA32253@roeck-us.net>
Hi, Guenter,
> From: Guenter Roeck [mailto:linux@roeck-us.net]
> Sent: Monday, April 11, 2016 12:15 AM
> To: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
> Cc: linux-kernel@vger.kernel.org; Zhao Lei <zhaolei@cn.fujitsu.com>; Peter
> Zijlstra <peterz@infradead.org>; Tejun Heo <tj@kernel.org>; Ingo Molnar
> <mingo@kernel.org>; linux-next@vger.kernel.org
> Subject: Commit 'sched/cpuacct: Split usage accounting into user_usage and
> sys_usage' causing crashes
>
> Hi,
>
> your commit 'sched/cpuacct: Split usage accounting into user_usage and
> sys_usage' in -next causes crashes with several of my qemu tests (mac99,
> q3beige). Reverting the patch fixes the problem.
>
> Details and complete logs are available at
> http://kerneltests.org/builders/qemu-ppc-next
> The scripts are published at
> https://github.com/groeck/linux-build-test/tree/master/rootfs/ppc
>
> Crash log and bisect log are attached.
>
Thanks for report.
Seems it is same problem discussed in
https://lkml.org/lkml/2016/4/4/312
and fixed by:
https://lkml.org/lkml/2016/4/6/306
Thanks
Zhaolei
> Guenter
>
> ---
> Crash log:
>
> [ ... ]
> ftrace: allocating 20986 entries in 62 pages
> Unable to handle kernel paging request for data at address 0x00000084
> Faulting instruction address: 0xc0067188
> Oops: Kernel access of bad area, sig: 11 [#1]
> PREEMPT PowerMac
> Modules linked in:
> CPU: 0 PID: 2 Comm: kthreadd Not tainted
> 4.6.0-rc2-next-20160408-yocto-standard #1
> task: c78d0e00 ti: c78e8000 task.ti: c78e8000
> NIP: c0067188 LR: c005c0d0 CTR: c005cf84
> REGS: c78e9da0 TRAP: 0300 Not tainted
> (4.6.0-rc2-next-20160408-yocto-standard)
> MSR: 00001032 <ME,IR,DR,RI> CR: 82040002 XER: 00000000
> DAR: 00000084 DSISR: 40000000
> GPR00: c005c0d0 c78e9e50 c78d0e00 c78d0e00 00000000 00000000 000a25f0
> 0037ecae
> GPR08: ffffffff 00000000 00000000 0027ecae 22000008 00000000 c004decc
> 00000000
> GPR16: 00000000 00000000 00000000 00000000 00000000 00000000
> 00000000 00000000
> GPR24: 00000001 c78d0e00 c0918580 c78d0e30 00000000 c78d0e00
> 00000000 000a25f0
> NIP [c0067188] cpuacct_charge+0x2c/0x90
> LR [c005c0d0] update_curr+0x110/0x250
> Call Trace:
> [c78e9e70] [c005c0d0] update_curr+0x110/0x250
> [c78e9ea0] [c005d048] dequeue_task_fair+0xc4/0x27c
> [c78e9ed0] [c06c67d4] __schedule+0x338/0x770
> [c78e9f00] [c06c6c54] schedule+0x48/0xb8
> [c78e9f10] [c004e070] kthreadd+0x1a4/0x1dc
> [c78e9f40] [c0010540] ret_from_kernel_thread+0x5c/0x64
> Instruction dump:
> 4bffffd0 7c0802a6 90010004 60000000 9421ffe0 7c0802a6 bf810010 90010024
> 81230cb4 7c7d1b78 7cdf3378 7cbe2b78 <83890084> 4800fbfd 813d047c
> 6b9c4000
> ---[ end trace dc8fa200cb88537f ]---
>
>
> ---
> bisect:
>
> # bad: [6e5921edae25005c5c25a79bb2ff5335650c1b66] Add linux-next specific
> files
> # for 20160408
> # good: [9735a22799b9214d17d3c231fe377fc852f042e9] Linux 4.6-rc2
> git bisect start 'HEAD' 'v4.6-rc2'
> # good: [e61201ac50d9599aef64e8885d6bfa5b35d574d7] Merge
> remote-tracking branch
> # 'mac80211-next/master'
> git bisect good e61201ac50d9599aef64e8885d6bfa5b35d574d7
> # bad: [5c4015574ec4d63b7d3a9efbd8b77f90bcac88be] Merge
> remote-tracking branch
> # 'usb-chipidea-next/ci-for-usb-next'
> git bisect bad 5c4015574ec4d63b7d3a9efbd8b77f90bcac88be
> # good: [35fda07ad91c8d46253f6dd262800a747adcede9] Merge
> remote-tracking branch
> # 'sound-asoc/for-next'
> git bisect good 35fda07ad91c8d46253f6dd262800a747adcede9
> # good: [a2089aa1dcd0a33b8eb67d8db0e07f859b986e04] Merge
> remote-tracking branch
> # 'spi/for-next'
> git bisect good a2089aa1dcd0a33b8eb67d8db0e07f859b986e04
> # bad: [129f0d75057f9e78ad70e3e01f6c9edbc7de553c] Merge
> remote-tracking branch
> # 'irqchip/irqchip/for-next'
> git bisect bad 129f0d75057f9e78ad70e3e01f6c9edbc7de553c
> # bad: [9338637e6e2256ac26ac75391dc1349fb492d7c6] Merge branch
> 'x86/asm'
> git bisect bad 9338637e6e2256ac26ac75391dc1349fb492d7c6
> # good: [66d219014a4ee47ad4ca2b9db5fe6547353e2a56] perf/x86/intel/pt:
> Move
> # transaction start/stop to PMU start/stop callbacks
> git bisect good 66d219014a4ee47ad4ca2b9db5fe6547353e2a56
> # good: [5367d2a3279cd7aa40535efa526fe936ec24528d] Merge branch
> 'mm/urgent'
> git bisect good 5367d2a3279cd7aa40535efa526fe936ec24528d
> # bad: [2b8c41daba327c633228169e8bd8ec067ab443f8] sched/fair: Initiate a
> new
> # task's util avg to a bounded value
> git bisect bad 2b8c41daba327c633228169e8bd8ec067ab443f8
> # bad: [d02c071183e1c01a76811c878c8a52322201f81f] sched/fair: Reset
> # nr_balance_failed after active balancing
> git bisect bad d02c071183e1c01a76811c878c8a52322201f81f
> # bad: [d740037fac7052e49450f6fa1454f1144a103b55] sched/cpuacct: Split
> usage
> # accounting into user_usage and sys_usage
> git bisect bad d740037fac7052e49450f6fa1454f1144a103b55
> # good: [5ca3726af7f66a8cc71ce4414cfeb86deb784491] sched/cpuacct: Show
> all
> # possible CPUs in cpuacct output
> git bisect good 5ca3726af7f66a8cc71ce4414cfeb86deb784491
> # first bad commit: [d740037fac7052e49450f6fa1454f1144a103b55]
> sched/cpuacct:
> # Split usage accounting into user_usage and sys_usage
>
^ permalink raw reply
* Commit 'sched/cpuacct: Split usage accounting into user_usage and sys_usage' causing crashes
From: Guenter Roeck @ 2016-04-10 16:14 UTC (permalink / raw)
To: Dongsheng Yang
Cc: linux-kernel, Zhao Lei, Peter Zijlstra, Tejun Heo, Ingo Molnar,
linux-next
Hi,
your commit 'sched/cpuacct: Split usage accounting into user_usage and
sys_usage' in -next causes crashes with several of my qemu tests (mac99,
q3beige). Reverting the patch fixes the problem.
Details and complete logs are available at
http://kerneltests.org/builders/qemu-ppc-next
The scripts are published at
https://github.com/groeck/linux-build-test/tree/master/rootfs/ppc
Crash log and bisect log are attached.
Guenter
---
Crash log:
[ ... ]
ftrace: allocating 20986 entries in 62 pages
Unable to handle kernel paging request for data at address 0x00000084
Faulting instruction address: 0xc0067188
Oops: Kernel access of bad area, sig: 11 [#1]
PREEMPT PowerMac
Modules linked in:
CPU: 0 PID: 2 Comm: kthreadd Not tainted 4.6.0-rc2-next-20160408-yocto-standard #1
task: c78d0e00 ti: c78e8000 task.ti: c78e8000
NIP: c0067188 LR: c005c0d0 CTR: c005cf84
REGS: c78e9da0 TRAP: 0300 Not tainted
(4.6.0-rc2-next-20160408-yocto-standard)
MSR: 00001032 <ME,IR,DR,RI> CR: 82040002 XER: 00000000
DAR: 00000084 DSISR: 40000000
GPR00: c005c0d0 c78e9e50 c78d0e00 c78d0e00 00000000 00000000 000a25f0 0037ecae
GPR08: ffffffff 00000000 00000000 0027ecae 22000008 00000000 c004decc 00000000
GPR16: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
GPR24: 00000001 c78d0e00 c0918580 c78d0e30 00000000 c78d0e00 00000000 000a25f0
NIP [c0067188] cpuacct_charge+0x2c/0x90
LR [c005c0d0] update_curr+0x110/0x250
Call Trace:
[c78e9e70] [c005c0d0] update_curr+0x110/0x250
[c78e9ea0] [c005d048] dequeue_task_fair+0xc4/0x27c
[c78e9ed0] [c06c67d4] __schedule+0x338/0x770
[c78e9f00] [c06c6c54] schedule+0x48/0xb8
[c78e9f10] [c004e070] kthreadd+0x1a4/0x1dc
[c78e9f40] [c0010540] ret_from_kernel_thread+0x5c/0x64
Instruction dump:
4bffffd0 7c0802a6 90010004 60000000 9421ffe0 7c0802a6 bf810010 90010024
81230cb4 7c7d1b78 7cdf3378 7cbe2b78 <83890084> 4800fbfd 813d047c 6b9c4000
---[ end trace dc8fa200cb88537f ]---
---
bisect:
# bad: [6e5921edae25005c5c25a79bb2ff5335650c1b66] Add linux-next specific files
# for 20160408
# good: [9735a22799b9214d17d3c231fe377fc852f042e9] Linux 4.6-rc2
git bisect start 'HEAD' 'v4.6-rc2'
# good: [e61201ac50d9599aef64e8885d6bfa5b35d574d7] Merge remote-tracking branch
# 'mac80211-next/master'
git bisect good e61201ac50d9599aef64e8885d6bfa5b35d574d7
# bad: [5c4015574ec4d63b7d3a9efbd8b77f90bcac88be] Merge remote-tracking branch
# 'usb-chipidea-next/ci-for-usb-next'
git bisect bad 5c4015574ec4d63b7d3a9efbd8b77f90bcac88be
# good: [35fda07ad91c8d46253f6dd262800a747adcede9] Merge remote-tracking branch
# 'sound-asoc/for-next'
git bisect good 35fda07ad91c8d46253f6dd262800a747adcede9
# good: [a2089aa1dcd0a33b8eb67d8db0e07f859b986e04] Merge remote-tracking branch
# 'spi/for-next'
git bisect good a2089aa1dcd0a33b8eb67d8db0e07f859b986e04
# bad: [129f0d75057f9e78ad70e3e01f6c9edbc7de553c] Merge remote-tracking branch
# 'irqchip/irqchip/for-next'
git bisect bad 129f0d75057f9e78ad70e3e01f6c9edbc7de553c
# bad: [9338637e6e2256ac26ac75391dc1349fb492d7c6] Merge branch 'x86/asm'
git bisect bad 9338637e6e2256ac26ac75391dc1349fb492d7c6
# good: [66d219014a4ee47ad4ca2b9db5fe6547353e2a56] perf/x86/intel/pt: Move
# transaction start/stop to PMU start/stop callbacks
git bisect good 66d219014a4ee47ad4ca2b9db5fe6547353e2a56
# good: [5367d2a3279cd7aa40535efa526fe936ec24528d] Merge branch 'mm/urgent'
git bisect good 5367d2a3279cd7aa40535efa526fe936ec24528d
# bad: [2b8c41daba327c633228169e8bd8ec067ab443f8] sched/fair: Initiate a new
# task's util avg to a bounded value
git bisect bad 2b8c41daba327c633228169e8bd8ec067ab443f8
# bad: [d02c071183e1c01a76811c878c8a52322201f81f] sched/fair: Reset
# nr_balance_failed after active balancing
git bisect bad d02c071183e1c01a76811c878c8a52322201f81f
# bad: [d740037fac7052e49450f6fa1454f1144a103b55] sched/cpuacct: Split usage
# accounting into user_usage and sys_usage
git bisect bad d740037fac7052e49450f6fa1454f1144a103b55
# good: [5ca3726af7f66a8cc71ce4414cfeb86deb784491] sched/cpuacct: Show all
# possible CPUs in cpuacct output
git bisect good 5ca3726af7f66a8cc71ce4414cfeb86deb784491
# first bad commit: [d740037fac7052e49450f6fa1454f1144a103b55] sched/cpuacct:
# Split usage accounting into user_usage and sys_usage
^ permalink raw reply
* Re: Kernel crash on startup - bisected to commit 3b24d854cb35
From: Larry Finger @ 2016-04-09 16:58 UTC (permalink / raw)
To: Eric Dumazet
Cc: David S. Miller, linux-next, linux-netdev, LKML, linux-wireless
In-Reply-To: <CANn89iJ6sfeNgB4BBmAw5SewqSHe_50+6POLJn=fhTDnNcY6kQ@mail.gmail.com>
On 04/09/2016 12:33 AM, Eric Dumazet wrote:
> On Fri, Apr 8, 2016 at 10:28 PM, Larry Finger <Larry.Finger@lwfinger.net> wrote:
>> Following a recent pull of the wireless-drivers-next repo. my system got a
>> kernel panic on startup at native_apic_msr_write+0x27. The problem was
>> bisected to commit 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
>> under synflood"). I am confident of the bisection as a kernel built with the
>> previous commit (3a5d1c0) boots OK.
>>
>> I have not yet captured the entire traceback for the crash, but I do have a
>> crappy photo of the screen that I have attached. The RIP is at
>> native_apic_msr_write+0x27. As this crash is likely configuration dependent,
>> a copy of my .config is also attached. Note that IPv6 is turned off on my
>> machine.
>>
>> Please let me know if any other info is needed.
>
> Can you double check you have this fix ?
>
> commit 8501786929de4616b10b8059ad97abd304a7dddf
> Author: Eric Dumazet <edumazet@google.com>
> Date: Wed Apr 6 22:07:34 2016 -0700
>
> tcp/dccp: fix inet_reuseport_add_sock()
>
> David Ahern reported panics in __inet_hash() caused by my recent commit.
>
> The reason is inet_reuseport_add_sock() was still using
> sk_nulls_for_each_rcu() instead of sk_for_each_rcu().
> SO_REUSEPORT enabled listeners were causing an instant crash.
>
> While chasing this bug, I found that I forgot to clear SOCK_RCU_FREE
> flag, as it is inherited from the parent at clone time.
>
> Fixes: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
> under synflood")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Reported-by: David Ahern <dsa@cumulusnetworks.com>
> Tested-by: David Ahern <dsa@cumulusnetworks.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
No, I did not have that patch. After pulling from net-next to get it, my system
no longer panics.
Note to linux-wireless readers. At the moment, a system built from
wireless-drivers-next will have this problem.
Thanks,
Larry
^ permalink raw reply
* Re: Kernel crash on startup - bisected to commit 3b24d854cb35
From: Eric Dumazet @ 2016-04-09 5:33 UTC (permalink / raw)
To: Larry Finger; +Cc: David S. Miller, linux-next, linux-netdev, LKML
In-Reply-To: <570892F9.9030700@lwfinger.net>
On Fri, Apr 8, 2016 at 10:28 PM, Larry Finger <Larry.Finger@lwfinger.net> wrote:
> Following a recent pull of the wireless-drivers-next repo. my system got a
> kernel panic on startup at native_apic_msr_write+0x27. The problem was
> bisected to commit 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
> under synflood"). I am confident of the bisection as a kernel built with the
> previous commit (3a5d1c0) boots OK.
>
> I have not yet captured the entire traceback for the crash, but I do have a
> crappy photo of the screen that I have attached. The RIP is at
> native_apic_msr_write+0x27. As this crash is likely configuration dependent,
> a copy of my .config is also attached. Note that IPv6 is turned off on my
> machine.
>
> Please let me know if any other info is needed.
Can you double check you have this fix ?
commit 8501786929de4616b10b8059ad97abd304a7dddf
Author: Eric Dumazet <edumazet@google.com>
Date: Wed Apr 6 22:07:34 2016 -0700
tcp/dccp: fix inet_reuseport_add_sock()
David Ahern reported panics in __inet_hash() caused by my recent commit.
The reason is inet_reuseport_add_sock() was still using
sk_nulls_for_each_rcu() instead of sk_for_each_rcu().
SO_REUSEPORT enabled listeners were causing an instant crash.
While chasing this bug, I found that I forgot to clear SOCK_RCU_FREE
flag, as it is inherited from the parent at clone time.
Fixes: 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt
under synflood")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: David Ahern <dsa@cumulusnetworks.com>
Tested-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
^ 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