[Letux-kernel] Letux-4.8-rc1

Andreas Kemnade andreas at kemnade.info
Tue Aug 9 17:10:26 CEST 2016


On Tue, 9 Aug 2016 07:25:35 +0200
"H. Nikolaus Schaller" <hns at goldelico.com> wrote:

> Hi,
> I have merged v4.8-rc1 and fixed conflicts plus some issues:

some conflict resolvment was buggy, this is the suggested change:

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 616f02c..74fc306 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -2517,7 +2511,6 @@ static int musb_suspend(struct device *dev)
 	spin_unlock_irqrestore(&musb->lock, flags);
-	musb_save_context(musb);
 	return 0;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.goldelico.com/pipermail/letux-kernel/attachments/20160809/03cc21a7/attachment.asc>

More information about the Letux-kernel mailing list