This is a note to let you know that I've just added the patch titled
linux-next: manual merge of the staging tree with the usb tree
to the 3.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
and it can be found in the queue-3.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From [email protected] Mon Apr 23 09:25:57 2012
From: Stephen Rothwell <[email protected]>
Date: Mon, 23 Apr 2012 15:11:46 +1000
Subject: linux-next: manual merge of the staging tree with the usb tree
To: Greg KH <[email protected]>
Cc: [email protected], [email protected], Masanari Iida
<[email protected]>
Message-ID: <[email protected]>
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/dt9812.c between commit de15fe3ed9c3
("USB: dt9812.c: remove err() usage") from the usb tree and commit
73e2918990c0 ("staging: Fix typo in multiple files") from the staging
tree.
The former supercedes the latter, so I used that.
--
Cheers,
Stephen Rothwell [email protected]
Patches currently in stable-queue which might be from [email protected] are
queue-3.3/linux-next-manual-merge-of-the-staging-tree-with-the-usb-tree.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
