On Sun, Jul 08, 2012 at 07:34:21PM +0200, Andrew Lunn wrote: > On Tue, Jul 03, 2012 at 09:29:25AM -0700, Greg KH wrote: > > On Mon, Jul 02, 2012 at 06:53:33PM +0200, Andrew Lunn wrote: > > > On Fri, Jun 29, 2012 at 11:42:17PM -0400, [email protected] > > > wrote: > > > > > > > > This is a note to let you know that I've just added the patch titled > > > > > > > > ARM: Orion: Fix Virtual/Physical mixup with watchdog > > > > > > > > to the 3.4-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: > > > > arm-orion-fix-virtual-physical-mixup-with-watchdog.patch > > > > and it can be found in the queue-3.4 subdirectory. > > > > > > > > If you, or anyone else, feels it should not be added to the stable tree, > > > > please let <[email protected]> know about it. > > > > > > Hi Greg > > > > > > Please could you not apply this one yet. It breaks the build for dove > > > and mv78xx0. This patch needs combing with: > > > > > > http://www.mail-archive.com/[email protected]/msg10665.html > > > > > > which has not yet been accepted into mainline. > > > > Ok, now dropped, let me know when the other patch goes into Linus's tree > > that you also need this one there as well. > > Hi Greg > > The other patch landed in v3.5-rc6. > > commit 1e0c1ce00d83834d03f4d8d039734ca4703298df > Author: Andrew Lunn <[email protected]> > Date: Fri Jun 29 09:25:58 2012 +0200 > > ARM: Orion: Fix WDT compile for Dove and MV78xx0 > > Commit 0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521 (ARM: Orion: Fix > Virtual/Physical mixup with watchdog) broke the Dove & MV78xx0 > build. Although these two SoC don't use the watchdog, the shared > platform code still needs to build. Add the necessary defines. > > Cc: [email protected] > Reported-by: Nicolas Pitre <[email protected]> > Signed-off-by: Andrew Lunn <[email protected]> > Tested-by: Nicolas Pitre <[email protected]> > Signed-off-by: Arnd Bergmann <[email protected]> > > Please add both to stable at the same time. Do the stable rules allow > them to be squashed together?
I've added them both, I don't like squashing patches together, it hides how things were done in Linus's tree. thanks, greg k-h -- 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
