From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Stephen Hemminger <shemminger@vyatta.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Jeff Garzik <jeff@garzik.org>,
netdev@vger.kernel.org
Subject: Re: linux-next: Tree for July 18: sky2 WOL broken
Date: Sun, 20 Jul 2008 02:20:10 +0200 [thread overview]
Message-ID: <200807200220.11701.rjw@sisk.pl> (raw)
In-Reply-To: <20080718195352.e562a00f.sfr@canb.auug.org.au>
On Friday, 18 of July 2008, Stephen Rothwell wrote:
> Hi all,
>
> Changes since next-20080717:
>
> Restored tree: ttydev.
>
> Temporarily dropped tree: acpi (confusion about its source).
>
> Most of the differences were conflicts moving from tree to tree as some
> of the trees are now merged into Linus' tree. Most have been inflicted
> on the driver-core and usb trees. I have not notified these separately.
>
> Because of the moving of conflicts around it is difficult to tell when
> they are going away (though I assume some are).
>
> The driver-core tree gained a conflict against Linus' tree.
>
> The usb tree inherited a build fix patch from the pci tree.
>
> The x86 tree gained a trivial conflict against Linus' tree but it was in
> a commit that is still being reverted.
>
> The ocsf2 tree gained several conflicts against Linus' tree because what
> was sent to Linus was not the same as what is in linuxt-next.
>
> The vfs tree gained conflicts against Linus' tree, the sparc tree and the
> mips tree.
>
> The semaphore-removal tree gained conflicts against Linus' tree that
> required the reversion of two commits.
>
> The ttydev tree had two patches that didn't apply and gained conflicts
> against the wireless tree and the usb tree (4). It also required a build
> fix patch.
>
> Lots of conflicts have gone from the x86 and ubifs trees.
>
> I have also applied the following patches for known problems:
>
> sparc64: sysdev API change fallout
> sparc32: smp_call_function API change fallout (this has already
> been fixed in the upstream sparc tree and comes from an incomplete merge
> on my part).
>
> This tree fails to build for ARCH=sparc (i.e. 32bit) with a 64bit gcc
> v3.4.5 - it tries to use the 64bit header files. This may be an artifact
> of one of my merge fixups, but I don't actually think so.
>
> ----------------------------------------------------------------------------
commit db99b98885e717454feef1c6868b27d3f23c2e7c
Author: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed May 14 17:04:16 2008 -0700
sky2: put PHY in sleep when down
and
commit a068c0adf2fe28b324bca87f85d27af7f993cdaf
Author: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed May 14 17:04:17 2008 -0700
sky2: pci power savings
break Wake-on-LAN on my test box using sky2. More specifically, with these
two commits applied the box hangs solid during hibernation/power off
while executing the sky2 callbacks.
The adapter is reported as 88E8056 (Asus M3A32-MVP Deluxe mainboard).
Thanks,
Rafael
prev parent reply other threads:[~2008-07-20 0:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-18 9:53 linux-next: Tree for July 18 Stephen Rothwell
2008-07-19 7:28 ` linux-next: Tree for July 18: warning at kernel/lockdep.c:2068 trace_hardirqs_on_caller Mariusz Kozlowski
2008-07-19 9:55 ` Vegard Nossum
[not found] ` <19f34abd0807190255x304173d4wf2bfabb2d5bce511-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-07-19 12:56 ` Pekka Enberg
2008-07-19 12:59 ` Vegard Nossum
[not found] ` <19f34abd0807190559y2fe5ebf9h7095793e82de3122-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-07-19 13:22 ` Stephen Rothwell
2008-07-19 22:17 ` Greg KH
2008-07-19 22:27 ` Vegard Nossum
[not found] ` <19f34abd0807191527u61c5ed61kffe2279c8d46915d-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-07-19 22:41 ` Greg KH
2008-07-19 22:44 ` Vegard Nossum
[not found] ` <19f34abd0807191544nfd73be5nf7dde4b61992a7e8-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-07-19 22:58 ` Greg KH
2008-07-19 23:11 ` Vegard Nossum
[not found] ` <19f34abd0807191611y7cabf405iad307ba79591e04f-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-07-19 23:20 ` Greg KH
2008-07-20 12:51 ` Bernhard Walle
2008-07-20 9:01 ` Dave Hansen
2008-07-20 9:35 ` Thomas Meyer
2008-07-20 13:03 ` Bernhard Walle
[not found] ` <20080720150341.7cd381c2-Hxm9IJOWyO+kWa+peg0mPg@public.gmane.org>
2008-07-20 15:44 ` Bernhard Walle
2008-07-21 13:17 ` Vivek Goyal
[not found] ` <20080721131721.GB4451-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2008-07-21 13:25 ` Bernhard Walle
2008-07-21 13:39 ` Vivek Goyal
[not found] ` <20080721133937.GC4451-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2008-07-21 15:00 ` Bernhard Walle
[not found] ` <20080721170037.1a0046b1-oJhqVyG5NZ9bpigZmTR7Iw@public.gmane.org>
2008-07-22 6:15 ` Yasunori Goto
2008-07-20 12:48 ` Bernhard Walle
[not found] ` <20080718195352.e562a00f.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>
2008-07-19 7:39 ` linux-next: Tree for July 18: nfs problems Mariusz Kozlowski
2008-07-19 9:35 ` linux-next: Tree for July 18: powerpc g3 hangs Mariusz Kozlowski
2008-07-19 15:31 ` linux-next: Tree for July 18 (very early crash on x86_32) Bartlomiej Zolnierkiewicz
2008-07-20 0:20 ` Rafael J. Wysocki [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200807200220.11701.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=shemminger@vyatta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).