public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
@ 2004-07-16 17:08 Deepak Saxena
  2004-07-16 17:28 ` Jeff Garzik
  0 siblings, 1 reply; 8+ messages in thread
From: Deepak Saxena @ 2004-07-16 17:08 UTC (permalink / raw)
  To: greg; +Cc: linux-kernel


This is already in sf.net, just not upstream.

~Deepak


===== drivers/pci/pci.ids 1.64 vs edited =====
--- 1.64/drivers/pci/pci.ids	Sat Jun 12 11:29:20 2004
+++ edited/drivers/pci/pci.ids	Wed Jul 14 21:02:42 2004
@@ -8174,7 +8174,9 @@
 	84e6  460GX - 82466GX Wide and fast PCI eXpander Bridge (WXB)
 	84ea  460GX - 84460GX AGP Bridge (GXB function 1)
 	8500  IXP4xx Family  Network Processor (IXP420, 421, 422, 425 and IXC1100)
-	9000  Intel IXP2000 Familly Network Processor
+	9000  IXP2000 Family Network Processor
+	9001  IXP2400 Network Processor
+	9004  IXP2800 Network Processor
 	9621  Integrated RAID
 	9622  Integrated RAID
 	9641  Integrated RAID

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>

-- 
Deepak Saxena - dsaxena at plexity dot net - http://www.plexity.net/

"Unlike me, many of you have accepted the situation of your imprisonment and
 will die here like rotten cabbages." - Number 6

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-07-16 17:08 [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids Deepak Saxena
@ 2004-07-16 17:28 ` Jeff Garzik
  2004-07-16 19:46   ` Dave Jones
  0 siblings, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2004-07-16 17:28 UTC (permalink / raw)
  To: dsaxena; +Cc: greg, linux-kernel

Deepak Saxena wrote:
> This is already in sf.net, just not upstream.


Why not post a patch updating to latest sf.net?

We really need to keep the two in sync.

	Jeff



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-07-16 17:28 ` Jeff Garzik
@ 2004-07-16 19:46   ` Dave Jones
  2004-07-16 20:01     ` Dave Jones
  0 siblings, 1 reply; 8+ messages in thread
From: Dave Jones @ 2004-07-16 19:46 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: dsaxena, greg, linux-kernel

On Fri, Jul 16, 2004 at 01:28:00PM -0400, Jeff Garzik wrote:

 > >This is already in sf.net, just not upstream.
 > 
 > Why not post a patch updating to latest sf.net?
 > 
 > We really need to keep the two in sync.

This could be trivially automated to have a script
grab latest, generate diff, and send a mail to Linux-kernel
once a week/month/whatever.

I'll hack something up.

		Dave


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-07-16 19:46   ` Dave Jones
@ 2004-07-16 20:01     ` Dave Jones
  2004-08-02 22:10       ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Dave Jones @ 2004-07-16 20:01 UTC (permalink / raw)
  To: Jeff Garzik, dsaxena, greg, linux-kernel

On Fri, Jul 16, 2004 at 08:46:54PM +0100, Dave Jones wrote:
 > On Fri, Jul 16, 2004 at 01:28:00PM -0400, Jeff Garzik wrote:
 > 
 >  > >This is already in sf.net, just not upstream.
 >  > 
 >  > Why not post a patch updating to latest sf.net?
 >  > 
 >  > We really need to keep the two in sync.
 > 
 > This could be trivially automated to have a script
 > grab latest, generate diff, and send a mail to Linux-kernel
 > once a week/month/whatever.
 > 
 > I'll hack something up.

Nightly snapshots will appear here..
http://www.codemonkey.org.uk/projects/pci/

I've thought again on the regular sending.. as they can be
quite large diffs occasionally, it's probably better if
gregkh pulls this into his pci tree every so often,
that way it goes into mainline semi-automatically, and
also gets some visibility in -mm for a while.

How's that sound Greg? Or would you prefer I dump
this into a bk tree you can regularly pull from?
It's only a bit more scripting to do so..

Looking at the diff is actually quite handy, theres some
bogons that have crept in there. I'll fix those up.

		Dave


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-07-16 20:01     ` Dave Jones
@ 2004-08-02 22:10       ` Greg KH
  2004-08-02 23:36         ` Dave Jones
  0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2004-08-02 22:10 UTC (permalink / raw)
  To: Dave Jones, Jeff Garzik, dsaxena, linux-kernel

On Fri, Jul 16, 2004 at 09:01:13PM +0100, Dave Jones wrote:
> On Fri, Jul 16, 2004 at 08:46:54PM +0100, Dave Jones wrote:
>  > On Fri, Jul 16, 2004 at 01:28:00PM -0400, Jeff Garzik wrote:
>  > 
>  >  > >This is already in sf.net, just not upstream.
>  >  > 
>  >  > Why not post a patch updating to latest sf.net?
>  >  > 
>  >  > We really need to keep the two in sync.
>  > 
>  > This could be trivially automated to have a script
>  > grab latest, generate diff, and send a mail to Linux-kernel
>  > once a week/month/whatever.
>  > 
>  > I'll hack something up.
> 
> Nightly snapshots will appear here..
> http://www.codemonkey.org.uk/projects/pci/
> 
> I've thought again on the regular sending.. as they can be
> quite large diffs occasionally, it's probably better if
> gregkh pulls this into his pci tree every so often,
> that way it goes into mainline semi-automatically, and
> also gets some visibility in -mm for a while.
> 
> How's that sound Greg? Or would you prefer I dump
> this into a bk tree you can regularly pull from?
> It's only a bit more scripting to do so..

Sending me emails with the patches is fine for me.  Feel free to
automate it if you want to, that would really help out.

Do we have a way for patches to flow back into sf.net.  I remember we
had some "line too long" warnings that we had to fix up by hand in that
file that probably didn't make it upstream.

I'll go grab the latest version of the patch on your site to add to my
bk-pci tree right now...

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-08-02 22:10       ` Greg KH
@ 2004-08-02 23:36         ` Dave Jones
  2004-08-02 23:46           ` Greg KH
  0 siblings, 1 reply; 8+ messages in thread
From: Dave Jones @ 2004-08-02 23:36 UTC (permalink / raw)
  To: Greg KH; +Cc: Jeff Garzik, dsaxena, linux-kernel

On Mon, Aug 02, 2004 at 03:10:47PM -0700, Greg KH wrote:

 > > How's that sound Greg? Or would you prefer I dump
 > > this into a bk tree you can regularly pull from?
 > > It's only a bit more scripting to do so..
 > 
 > Sending me emails with the patches is fine for me.  Feel free to
 > automate it if you want to, that would really help out.

Ok, will do so.

 > Do we have a way for patches to flow back into sf.net.

You can send unified diffs to pciids@lists.sf.net and the robot
should automatically recognise them, and add them to the
"to be approved" queue. Then its just a matter of how long it
takes for someone with rights to approve entries.

 > I remember we
 > had some "line too long" warnings that we had to fix up by hand in that
 > file that probably didn't make it upstream.

Ah yes, I'd forgotten about those.  I'm not sure if they got fixed
upstream or not. Holler if you spot anything odd, and I'll try my
best to get changes to such entries approved quickly.

 > I'll go grab the latest version of the patch on your site to add to my
 > bk-pci tree right now...

Cool.

		Dave


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-08-02 23:36         ` Dave Jones
@ 2004-08-02 23:46           ` Greg KH
  2004-08-03  0:31             ` Dave Jones
  0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2004-08-02 23:46 UTC (permalink / raw)
  To: Dave Jones, Jeff Garzik, dsaxena, linux-kernel

On Tue, Aug 03, 2004 at 12:36:52AM +0100, Dave Jones wrote:
> On Mon, Aug 02, 2004 at 03:10:47PM -0700, Greg KH wrote:
>  > I remember we
>  > had some "line too long" warnings that we had to fix up by hand in that
>  > file that probably didn't make it upstream.
> 
> Ah yes, I'd forgotten about those.  I'm not sure if they got fixed
> upstream or not. Holler if you spot anything odd, and I'll try my
> best to get changes to such entries approved quickly.

I had to fix up a few older ones that your patch reverted, and changed a
new one that caused errors.  Once my patch makes it to Linus (after
2.6.8 comes out) it will be pretty easy for us to see the lines that
need to get pushed back to sf.net.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids
  2004-08-02 23:46           ` Greg KH
@ 2004-08-03  0:31             ` Dave Jones
  0 siblings, 0 replies; 8+ messages in thread
From: Dave Jones @ 2004-08-03  0:31 UTC (permalink / raw)
  To: Greg KH; +Cc: Jeff Garzik, dsaxena, linux-kernel

On Mon, Aug 02, 2004 at 04:46:36PM -0700, Greg KH wrote:

 > > Ah yes, I'd forgotten about those.  I'm not sure if they got fixed
 > > upstream or not. Holler if you spot anything odd, and I'll try my
 > > best to get changes to such entries approved quickly.
 > 
 > I had to fix up a few older ones that your patch reverted, and changed a
 > new one that caused errors.  Once my patch makes it to Linus (after
 > 2.6.8 comes out) it will be pretty easy for us to see the lines that
 > need to get pushed back to sf.net.

Cool. It should be easier to stay in sync if we do this more regularly
than has been done in the past.  I'll try and push them to you before
they grow into 58k monsters again 8-)

		Dave


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2004-08-03  0:33 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-16 17:08 [PATCH TRIVIAL] Add Intel IXP2400 & IXP2800 to PCI.ids Deepak Saxena
2004-07-16 17:28 ` Jeff Garzik
2004-07-16 19:46   ` Dave Jones
2004-07-16 20:01     ` Dave Jones
2004-08-02 22:10       ` Greg KH
2004-08-02 23:36         ` Dave Jones
2004-08-02 23:46           ` Greg KH
2004-08-03  0:31             ` Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox