public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik•org>
To: David Miller <davem@davemloft•net>
Cc: netdev@vger•kernel.org, Chris Snook <csnook@redhat•com>,
	Jay Cliburn <jacliburn@bellsouth•net>
Subject: Re: [git patches] net driver updates for .26
Date: Wed, 26 Mar 2008 00:07:21 -0400	[thread overview]
Message-ID: <47E9CBF9.3040700@garzik.org> (raw)
In-Reply-To: <20080322.183522.124237568.davem@davemloft.net>

David Miller wrote:
> From: Jeff Garzik <jeff@garzik•org>
> Date: Tue, 18 Mar 2008 03:59:02 -0400
> 
>> Just sent this upstream to davem for 2.6.26...  snipped the patch I
>> usually post along with a git push, due to mailing list restrictions.
>>
>> Please pull from 'upstream-net26' branch of
>> master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-net26
> 
> This fails an allmodconfig build:
> 
> drivers/net/8390.c: In function '__inittest':
> drivers/net/8390.c:60: error: 'ns8390_init_module' undeclared (first use in this function)
> drivers/net/8390.c:60: error: (Each undeclared identifier is reported only once
> drivers/net/8390.c:60: error: for each function it appears in.)
> 
> The fix was easy so I took care of it, this time...

hrm, indeed.  sorry about that.  Something clearly screwed up in my 
process, because part of that process is an x86-64 allmodconfig before 
pushing.


> There was also a merge conflict in drivers/s390/net/qeth_main.c
> (against a net-2.6.26 change, which is why you really should work
> against that for 2.6.26 bound changes not against Linus's head as you
> did here), which is easy to resolve by putting the conflicting change
> to qeth_main.c into the inetdev notifier in qeth_l3_main.c, which
> I took care of as well.
> 
> This time....

I mentioned this one on IRC ahead of time, when I asked if it was OK, as 
an exception, to base off Linus's HEAD.  This was because I had started 
my for-2.6.26 queue a while before you did.

And just to state the obvious, unless you and I agree on an exception 
(which I thought we had done this time), all changes from me will be 
based on top of your repo(s) rather than Linus's.


> There are also some new build warnings such as:
> 
> drivers/net/atlx/atl1.c:506: warning: 'atl1_phy_enter_power_saving' defined but not used

<checks>  doesn't appear in allmodconfig, so it looks like 
atl1_phy_enter_power_saving() just needs some CONFIG_PM wrappers

(hi Jay, Chris)


> Which I fixed up as well, but that atl1_phy_enter_power_saving()
> function is just a jumble of commented out code, yuck!  Please
> review some of this stuff :-/

I did not see anything wrong with a maintainer leaving in some 
commented-out placeholder code.

Some of this stuff should get filled in once Chris and Jay add atl2 
support to the existing atl1 stuff you see here.

That was a big impetus for this set of atl1 changes -- move things 
around and massage things so that it is trivial to drop in atl2 support.

	Jeff



  reply	other threads:[~2008-03-26  4:07 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-18  7:59 [git patches] net driver updates for .26 Jeff Garzik
2008-03-23  1:35 ` David Miller
2008-03-26  4:07   ` Jeff Garzik [this message]
2008-03-26 16:24     ` Chris Snook
2008-03-27  0:19     ` Jay Cliburn
  -- strict thread matches above, loose matches on Subject: below --
2008-05-13  5:56 Jeff Garzik
2008-05-13  8:18 ` David Miller

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=47E9CBF9.3040700@garzik.org \
    --to=jeff@garzik$(echo .)org \
    --cc=csnook@redhat$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=jacliburn@bellsouth$(echo .)net \
    --cc=netdev@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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