rpms/kernel/devel linux-2.6-header-cleanup-git.patch, 1.6, 1.7 linux-2.6-header-install-git.patch, 1.5, 1.6

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 27 16:21:56 UTC 2006


Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22042

Modified Files:
	linux-2.6-header-cleanup-git.patch 
	linux-2.6-header-install-git.patch 
Log Message:
blkpg.h, mii.h, ethtool.h, version.h fixes

linux-2.6-header-cleanup-git.patch:
 b/include/asm-i386/page.h                            |    5 
 b/include/asm-s390/ptrace.h                          |    6 
 b/include/asm-x86_64/page.h                          |    5 
 b/include/linux/elf-em.h                             |   44 ++++
 include/acpi/platform/aclinux.h                      |    1 
 include/acpi/processor.h                             |    1 
 include/asm-alpha/bitops.h                           |    1 
 include/asm-alpha/cache.h                            |    1 
 include/asm-alpha/cacheflush.h                       |    1 
 include/asm-alpha/core_cia.h                         |    1 
 include/asm-alpha/core_t2.h                          |    1 
 include/asm-alpha/dma-mapping.h                      |    1 
 include/asm-alpha/dma.h                              |    1 
 include/asm-alpha/floppy.h                           |    1 
 include/asm-alpha/hardirq.h                          |    1 
 include/asm-alpha/hw_irq.h                           |    1 
 include/asm-alpha/ide.h                              |    1 
 include/asm-alpha/io.h                               |    1 
 include/asm-alpha/irq.h                              |    1 
 include/asm-alpha/kmap_types.h                       |    1 
 include/asm-alpha/machvec.h                          |    1 
 include/asm-alpha/mmu_context.h                      |    1 
 include/asm-alpha/mmzone.h                           |    1 
 include/asm-alpha/page.h                             |    1 
 include/asm-alpha/param.h                            |    1 
 include/asm-alpha/pgalloc.h                          |    1 
 include/asm-alpha/pgtable.h                          |    1 
 include/asm-alpha/serial.h                           |    1 
 include/asm-alpha/smp.h                              |    1 
 include/asm-alpha/spinlock.h                         |    1 
 include/asm-alpha/system.h                           |    1 
 include/asm-alpha/tlbflush.h                         |    1 
 include/asm-arm/apm.h                                |    1 
 include/asm-arm/arch-aaec2000/memory.h               |    1 
 include/asm-arm/arch-cl7500/acornfb.h                |    1 
 include/asm-arm/arch-clps711x/hardware.h             |    1 
 include/asm-arm/arch-clps711x/memory.h               |    1 
 include/asm-arm/arch-clps711x/uncompress.h           |    1 
 include/asm-arm/arch-ebsa285/hardware.h              |    1 
 include/asm-arm/arch-ebsa285/memory.h                |    1 
 include/asm-arm/arch-ebsa285/vmalloc.h               |    1 
 include/asm-arm/arch-integrator/smp.h                |    1 
 include/asm-arm/arch-iop3xx/memory.h                 |    1 
 include/asm-arm/arch-iop3xx/timex.h                  |    1 
 include/asm-arm/arch-iop3xx/uncompress.h             |    1 
 include/asm-arm/arch-ixp4xx/dma.h                    |    1 
 include/asm-arm/arch-lh7a40x/constants.h             |    1 
 include/asm-arm/arch-lh7a40x/irqs.h                  |    1 
 include/asm-arm/arch-lh7a40x/registers.h             |    1 
 include/asm-arm/arch-omap/board.h                    |    1 
 include/asm-arm/arch-omap/hardware.h                 |    1 
 include/asm-arm/arch-omap/system.h                   |    1 
 include/asm-arm/arch-omap/uncompress.h               |    1 
 include/asm-arm/arch-pxa/idp.h                       |    1 
 include/asm-arm/arch-pxa/irqs.h                      |    1 
 include/asm-arm/arch-pxa/pxa-regs.h                  |    1 
 include/asm-arm/arch-pxa/timex.h                     |    1 
 include/asm-arm/arch-realview/smp.h                  |    1 
 include/asm-arm/arch-s3c2410/dma.h                   |    1 
 include/asm-arm/arch-s3c2410/uncompress.h            |    1 
 include/asm-arm/arch-sa1100/assabet.h                |    1 
 include/asm-arm/arch-sa1100/cerf.h                   |    1 
 include/asm-arm/arch-sa1100/collie.h                 |    1 
 include/asm-arm/arch-sa1100/dma.h                    |    1 
 include/asm-arm/arch-sa1100/hardware.h               |    1 
 include/asm-arm/arch-sa1100/ide.h                    |    1 
 include/asm-arm/arch-sa1100/irqs.h                   |    1 
 include/asm-arm/arch-sa1100/memory.h                 |    1 
 include/asm-arm/arch-sa1100/system.h                 |    1 
 include/asm-arm/atomic.h                             |    1 
 include/asm-arm/bug.h                                |    1 
 include/asm-arm/cacheflush.h                         |    1 
 include/asm-arm/cpu.h                                |    1 
 include/asm-arm/dma-mapping.h                        |    1 
 include/asm-arm/dma.h                                |    1 
 include/asm-arm/elf.h                                |    1 
 include/asm-arm/fpstate.h                            |    1 
 include/asm-arm/glue.h                               |    1 
 include/asm-arm/hardirq.h                            |    1 
 include/asm-arm/hardware/dec21285.h                  |    1 
 include/asm-arm/hardware/iomd.h                      |    1 
 include/asm-arm/leds.h                               |    1 
 include/asm-arm/mach/serial_at91rm9200.h             |    1 
 include/asm-arm/mach/serial_sa1100.h                 |    1 
 include/asm-arm/memory.h                             |    1 
 include/asm-arm/page.h                               |    1 
 include/asm-arm/pci.h                                |    1 
 include/asm-arm/proc-fns.h                           |    1 
 include/asm-arm/ptrace.h                             |    1 
 include/asm-arm/smp.h                                |    1 
 include/asm-arm/system.h                             |    1 
 include/asm-arm/tlbflush.h                           |    1 
 include/asm-arm26/atomic.h                           |    1 
 include/asm-arm26/bug.h                              |    1 
 include/asm-arm26/dma.h                              |    1 
 include/asm-arm26/hardirq.h                          |    1 
 include/asm-arm26/hardware.h                         |    1 
 include/asm-arm26/io.h                               |    1 
 include/asm-arm26/leds.h                             |    1 
 include/asm-arm26/mach-types.h                       |    1 
 include/asm-arm26/page.h                             |    1 
 include/asm-arm26/pgtable.h                          |    1 
 include/asm-arm26/serial.h                           |    1 
 include/asm-arm26/smp.h                              |    1 
 include/asm-arm26/sysirq.h                           |    1 
 include/asm-arm26/system.h                           |    1 
 include/asm-cris/arch-v10/io.h                       |    1 
 include/asm-cris/arch-v10/page.h                     |    1 
 include/asm-cris/arch-v10/system.h                   |    1 
 include/asm-cris/arch-v32/io.h                       |    1 
 include/asm-cris/arch-v32/irq.h                      |    1 
 include/asm-cris/arch-v32/page.h                     |    1 
 include/asm-cris/arch-v32/processor.h                |    1 
 include/asm-cris/arch-v32/system.h                   |    1 
 include/asm-cris/eshlibld.h                          |    1 
 include/asm-cris/etraxgpio.h                         |    1 
 include/asm-cris/fasttimer.h                         |    1 
 include/asm-cris/page.h                              |    1 
 include/asm-cris/pci.h                               |    1 
 include/asm-cris/pgtable.h                           |    1 
 include/asm-cris/processor.h                         |    1 
 include/asm-cris/rtc.h                               |    1 
 include/asm-cris/tlbflush.h                          |    1 
 include/asm-frv/atomic.h                             |    1 
 include/asm-frv/bitops.h                             |    1 
 include/asm-frv/bug.h                                |    1 
 include/asm-frv/cache.h                              |    1 
 include/asm-frv/dma.h                                |    1 
 include/asm-frv/elf.h                                |    1 
 include/asm-frv/fpu.h                                |    1 
 include/asm-frv/hardirq.h                            |    1 
 include/asm-frv/highmem.h                            |    1 
 include/asm-frv/ide.h                                |    1 
 include/asm-frv/io.h                                 |    1 
 include/asm-frv/irq.h                                |    1 
 include/asm-frv/mmu_context.h                        |    1 
 include/asm-frv/page.h                               |    1 
 include/asm-frv/pci.h                                |    1 
 include/asm-frv/pgalloc.h                            |    1 
 include/asm-frv/pgtable.h                            |    1 
 include/asm-frv/processor.h                          |    1 
 include/asm-frv/segment.h                            |    1 
 include/asm-frv/serial.h                             |    1 
 include/asm-frv/smp.h                                |    1 
 include/asm-frv/system.h                             |    1 
 include/asm-frv/tlbflush.h                           |    1 
 include/asm-frv/types.h                              |    1 
 include/asm-frv/unaligned.h                          |    1 
 include/asm-frv/virtconvert.h                        |    1 
 include/asm-generic/bug.h                            |    1 
 include/asm-generic/dma-mapping.h                    |    1 
 include/asm-generic/fcntl.h                          |    1 
 include/asm-generic/local.h                          |    1 
 include/asm-generic/signal.h                         |    7 
 include/asm-generic/tlb.h                            |    1 
 include/asm-h8300/bitops.h                           |    1 
 include/asm-h8300/dma.h                              |    1 
 include/asm-h8300/elf.h                              |    1 
 include/asm-h8300/hardirq.h                          |    1 
 include/asm-h8300/io.h                               |    1 
 include/asm-h8300/keyboard.h                         |    1 
 include/asm-h8300/mmu_context.h                      |    1 
 include/asm-h8300/page.h                             |    1 
 include/asm-h8300/page_offset.h                      |    1 
 include/asm-h8300/param.h                            |    1 
 include/asm-h8300/pgtable.h                          |    1 
 include/asm-h8300/processor.h                        |    1 
 include/asm-h8300/semaphore-helper.h                 |    1 
 include/asm-h8300/shm.h                              |    1 
 include/asm-h8300/system.h                           |    1 
 include/asm-h8300/unaligned.h                        |    1 
 include/asm-h8300/virtconvert.h                      |    1 
 include/asm-i386/apic.h                              |    1 
 include/asm-i386/atomic.h                            |    1 
 include/asm-i386/bitops.h                            |    1 
 include/asm-i386/bug.h                               |    1 
 include/asm-i386/bugs.h                              |    1 
 include/asm-i386/byteorder.h                         |    1 
 include/asm-i386/cache.h                             |    1 
 include/asm-i386/dma.h                               |    1 
 include/asm-i386/fixmap.h                            |    1 
 include/asm-i386/hardirq.h                           |    1 
 include/asm-i386/highmem.h                           |    1 
 include/asm-i386/hpet.h                              |    1 
 include/asm-i386/hw_irq.h                            |    1 
 include/asm-i386/ide.h                               |    1 
 include/asm-i386/io.h                                |    1 
 include/asm-i386/io_apic.h                           |    1 
 include/asm-i386/irq.h                               |    1 
 include/asm-i386/kmap_types.h                        |    1 
 include/asm-i386/mach-summit/mach_apic.h             |    1 
 include/asm-i386/mmu_context.h                       |    1 
 include/asm-i386/mtrr.h                              |    1 
 include/asm-i386/param.h                             |    1 
 include/asm-i386/pci.h                               |    1 
 include/asm-i386/pgalloc.h                           |    1 
 include/asm-i386/pgtable.h                           |    1 
 include/asm-i386/processor.h                         |    1 
 include/asm-i386/serial.h                            |    1 
 include/asm-i386/smp.h                               |    1 
 include/asm-i386/spinlock.h                          |    1 
 include/asm-i386/string.h                            |    1 
 include/asm-i386/system.h                            |    1 
 include/asm-i386/thread_info.h                       |    1 
 include/asm-i386/timex.h                             |    1 
 include/asm-i386/tlbflush.h                          |    1 
 include/asm-i386/types.h                             |    1 
 include/asm-i386/uaccess.h                           |    1 
 include/asm-ia64/asmmacro.h                          |    1 
 include/asm-ia64/cache.h                             |    1 
 include/asm-ia64/delay.h                             |    1 
 include/asm-ia64/dma-mapping.h                       |    1 
 include/asm-ia64/dma.h                               |    1 
 include/asm-ia64/elf.h                               |    1 
 include/asm-ia64/hardirq.h                           |    1 
 include/asm-ia64/ia32.h                              |    1 
 include/asm-ia64/ide.h                               |    1 
 include/asm-ia64/intrinsics.h                        |    1 
 include/asm-ia64/kmap_types.h                        |    1 
 include/asm-ia64/machvec.h                           |    1 
 include/asm-ia64/meminit.h                           |    1 
 include/asm-ia64/nodedata.h                          |    1 
 include/asm-ia64/numa.h                              |    1 
 include/asm-ia64/page.h                              |    1 
 include/asm-ia64/param.h                             |    1 
 include/asm-ia64/percpu.h                            |    1 
 include/asm-ia64/pgalloc.h                           |    1 
 include/asm-ia64/pgtable.h                           |    1 
 include/asm-ia64/processor.h                         |    1 
 include/asm-ia64/ptrace.h                            |    1 
 include/asm-ia64/smp.h                               |    1 
 include/asm-ia64/sn/simulator.h                      |    1 
 include/asm-ia64/sn/sn_cpuid.h                       |    1 
 include/asm-ia64/sn/sn_sal.h                         |    1 
 include/asm-ia64/sn/xpc.h                            |    1 
 include/asm-ia64/string.h                            |    1 
 include/asm-ia64/system.h                            |    1 
 include/asm-ia64/tlb.h                               |    1 
 include/asm-ia64/tlbflush.h                          |    1 
 include/asm-ia64/unistd.h                            |    1 
 include/asm-m32r/assembler.h                         |    1 
 include/asm-m32r/atomic.h                            |    1 
 include/asm-m32r/bitops.h                            |    1 
 include/asm-m32r/cacheflush.h                        |    1 
 include/asm-m32r/hardirq.h                           |    1 
 include/asm-m32r/ide.h                               |    1 
 include/asm-m32r/irq.h                               |    1 
 include/asm-m32r/kmap_types.h                        |    1 
 include/asm-m32r/m32104ut/m32104ut_pld.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lan.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_lcd.h             |    1 
 include/asm-m32r/m32700ut/m32700ut_pld.h             |    1 
 include/asm-m32r/m32r.h                              |    1 
 include/asm-m32r/mmu.h                               |    1 
 include/asm-m32r/mmu_context.h                       |    2 
 include/asm-m32r/opsput/opsput_lan.h                 |    1 
 include/asm-m32r/opsput/opsput_lcd.h                 |    1 
 include/asm-m32r/opsput/opsput_pld.h                 |    1 
 include/asm-m32r/page.h                              |    1 
 include/asm-m32r/pgalloc.h                           |    1 
 include/asm-m32r/pgtable-2level.h                    |    1 
 include/asm-m32r/pgtable.h                           |    1 
 include/asm-m32r/processor.h                         |    1 
 include/asm-m32r/ptrace.h                            |    1 
 include/asm-m32r/rtc.h                               |    1 
 include/asm-m32r/semaphore.h                         |    1 
 include/asm-m32r/serial.h                            |    1 
 include/asm-m32r/sigcontext.h                        |    1 
 include/asm-m32r/smp.h                               |    1 
 include/asm-m32r/spinlock.h                          |    1 
 include/asm-m32r/system.h                            |    1 
 include/asm-m32r/timex.h                             |    1 
 include/asm-m32r/tlbflush.h                          |    1 
 include/asm-m32r/uaccess.h                           |    1 
 include/asm-m68k/atomic.h                            |    1 
 include/asm-m68k/bug.h                               |    1 
 include/asm-m68k/dma-mapping.h                       |    1 
 include/asm-m68k/dma.h                               |    1 
 include/asm-m68k/dvma.h                              |    1 
 include/asm-m68k/elf.h                               |    1 
 include/asm-m68k/entry.h                             |    1 
 include/asm-m68k/fpu.h                               |    1 
 include/asm-m68k/hardirq.h                           |    1 
 include/asm-m68k/ide.h                               |    1 
 include/asm-m68k/io.h                                |    1 
 include/asm-m68k/irq.h                               |    1 
 include/asm-m68k/mc146818rtc.h                       |    1 
 include/asm-m68k/mmu_context.h                       |    1 
 include/asm-m68k/motorola_pgtable.h                  |    1 
 include/asm-m68k/openprom.h                          |    1 
 include/asm-m68k/page.h                              |    1 
 include/asm-m68k/page_offset.h                       |    1 
 include/asm-m68k/pgalloc.h                           |    1 
 include/asm-m68k/pgtable.h                           |    1 
 include/asm-m68k/processor.h                         |    1 
 include/asm-m68k/semaphore-helper.h                  |    1 
 include/asm-m68k/serial.h                            |    1 
 include/asm-m68k/setup.h                             |    1 
 include/asm-m68k/shm.h                               |    1 
 include/asm-m68k/system.h                            |    1 
 include/asm-m68k/tlbflush.h                          |    1 
 include/asm-m68k/virtconvert.h                       |    1 
 include/asm-m68knommu/bitops.h                       |    1 
 include/asm-m68knommu/coldfire.h                     |    1 
 include/asm-m68knommu/commproc.h                     |    1 
 include/asm-m68knommu/dma-mapping.h                  |    1 
 include/asm-m68knommu/dma.h                          |    1 
 include/asm-m68knommu/elf.h                          |    1 
 include/asm-m68knommu/elia.h                         |    1 
 include/asm-m68knommu/entry.h                        |    1 
 include/asm-m68knommu/fpu.h                          |    1 
 include/asm-m68knommu/hardirq.h                      |    1 
 include/asm-m68knommu/io.h                           |    1 
 include/asm-m68knommu/irq.h                          |    1 
 include/asm-m68knommu/m5206sim.h                     |    1 
 include/asm-m68knommu/m520xsim.h                     |    1 
 include/asm-m68knommu/m523xsim.h                     |    1 
 include/asm-m68knommu/m5272sim.h                     |    1 
 include/asm-m68knommu/m527xsim.h                     |    1 
 include/asm-m68knommu/m528xsim.h                     |    1 
 include/asm-m68knommu/mcfcache.h                     |    1 
 include/asm-m68knommu/mcfdma.h                       |    1 
 include/asm-m68knommu/mcfmbus.h                      |    1 
 include/asm-m68knommu/mcfne.h                        |    1 
 include/asm-m68knommu/mcfpci.h                       |    1 
 include/asm-m68knommu/mcfpit.h                       |    1 
 include/asm-m68knommu/mcfsim.h                       |    1 
 include/asm-m68knommu/mcfsmc.h                       |    1 
 include/asm-m68knommu/mcftimer.h                     |    1 
 include/asm-m68knommu/mcfuart.h                      |    1 
 include/asm-m68knommu/mcfwdebug.h                    |    1 
 include/asm-m68knommu/mmu_context.h                  |    1 
 include/asm-m68knommu/nettel.h                       |    1 
 include/asm-m68knommu/page.h                         |    1 
 include/asm-m68knommu/page_offset.h                  |    1 
 include/asm-m68knommu/param.h                        |    1 
 include/asm-m68knommu/pgtable.h                      |    1 
 include/asm-m68knommu/processor.h                    |    1 
 include/asm-m68knommu/semaphore-helper.h             |    1 
 include/asm-m68knommu/system.h                       |    1 
 include/asm-m68knommu/unaligned.h                    |    1 
 include/asm-mips/a.out.h                             |    1 
 include/asm-mips/addrspace.h                         |    1 
 include/asm-mips/arc/types.h                         |    1 
 include/asm-mips/asm.h                               |    1 
 include/asm-mips/asmmacro.h                          |    1 
 include/asm-mips/atomic.h                            |    1 
 include/asm-mips/bcache.h                            |    1 
 include/asm-mips/bitops.h                            |    1 
 include/asm-mips/bug.h                               |    1 
 include/asm-mips/bugs.h                              |    1 
 include/asm-mips/byteorder.h                         |    1 
 include/asm-mips/cache.h                             |    1 
 include/asm-mips/checksum.h                          |    1 
 include/asm-mips/cpu-features.h                      |    1 
 include/asm-mips/cpu-info.h                          |    1 
 include/asm-mips/ddb5xxx/ddb5477.h                   |    1 
 include/asm-mips/ddb5xxx/ddb5xxx.h                   |    1 
 include/asm-mips/debug.h                             |    1 
 include/asm-mips/dec/prom.h                          |    1 
 include/asm-mips/delay.h                             |    1 
 include/asm-mips/dma.h                               |    1 
 include/asm-mips/elf.h                               |    1 
 include/asm-mips/fcntl.h                             |    1 
 include/asm-mips/fixmap.h                            |    1 
 include/asm-mips/fpu.h                               |    1 
 include/asm-mips/futex.h                             |    1 
 include/asm-mips/hazards.h                           |    1 
 include/asm-mips/highmem.h                           |    1 
 include/asm-mips/interrupt.h                         |    1 
 include/asm-mips/io.h                                |    1 
 include/asm-mips/ip32/machine.h                      |    1 
 include/asm-mips/irq.h                               |    1 
 include/asm-mips/isadep.h                            |    1 
 include/asm-mips/jmr3927/irq.h                       |    1 
 include/asm-mips/kmap_types.h                        |    1 
 include/asm-mips/local.h                             |    1 
 include/asm-mips/mach-au1x00/au1000.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx.h                |    1 
 include/asm-mips/mach-au1x00/au1xxx_dbdma.h          |    1 
 include/asm-mips/mach-au1x00/au1xxx_ide.h            |    1 
 include/asm-mips/mach-au1x00/au1xxx_psc.h            |    1 
 include/asm-mips/mach-au1x00/ioremap.h               |    1 
 include/asm-mips/mach-cobalt/cpu-feature-overrides.h |    1 
 include/asm-mips/mach-db1x00/db1x00.h                |    1 
 include/asm-mips/mach-generic/ide.h                  |    1 
 include/asm-mips/mach-generic/kmalloc.h              |    1 
 include/asm-mips/mach-generic/spaces.h               |    1 
 include/asm-mips/mach-ip22/spaces.h                  |    1 
 include/asm-mips/mach-ip32/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-ip32/kmalloc.h                 |    1 
 include/asm-mips/mach-mips/cpu-feature-overrides.h   |    1 
 include/asm-mips/mach-mips/irq.h                     |    1 
 include/asm-mips/mach-pb1x00/pb1550.h                |    1 
 include/asm-mips/mach-sim/cpu-feature-overrides.h    |    1 
 include/asm-mips/mips-boards/generic.h               |    1 
 include/asm-mips/mipsregs.h                          |    1 
 include/asm-mips/mmu_context.h                       |    1 
 include/asm-mips/mmzone.h                            |    1 
 include/asm-mips/module.h                            |    1 
 include/asm-mips/msgbuf.h                            |    1 
 include/asm-mips/paccess.h                           |    1 
 include/asm-mips/page.h                              |    1 
 include/asm-mips/pci.h                               |    1 
 include/asm-mips/pgalloc.h                           |    1 
 include/asm-mips/pgtable-32.h                        |    1 
 include/asm-mips/pgtable-64.h                        |    1 
 include/asm-mips/pgtable-bits.h                      |    1 
 include/asm-mips/pgtable.h                           |    1 
 include/asm-mips/prefetch.h                          |    1 
 include/asm-mips/processor.h                         |    1 
 include/asm-mips/ptrace.h                            |    1 
 include/asm-mips/reg.h                               |    1 
 include/asm-mips/resource.h                          |    1 
 include/asm-mips/serial.h                            |    1 
 include/asm-mips/sgiarcs.h                           |    1 
 include/asm-mips/sibyte/board.h                      |    1 
 include/asm-mips/sibyte/carmel.h                     |    1 
 include/asm-mips/sibyte/sentosa.h                    |    1 
 include/asm-mips/sibyte/swarm.h                      |    1 
 include/asm-mips/siginfo.h                           |    1 
 include/asm-mips/signal.h                            |    1 
 include/asm-mips/sim.h                               |    1 
 include/asm-mips/smp.h                               |    1 
 include/asm-mips/sn/addrs.h                          |    1 
 include/asm-mips/sn/agent.h                          |    1 
 include/asm-mips/sn/arch.h                           |    1 
 include/asm-mips/sn/io.h                             |    1 
 include/asm-mips/sn/klconfig.h                       |    1 
 include/asm-mips/sn/kldir.h                          |    1 
 include/asm-mips/sn/launch.h                         |    1 
 include/asm-mips/sn/mapped_kernel.h                  |    1 
 include/asm-mips/sn/sn0/addrs.h                      |    1 
 include/asm-mips/sn/sn0/arch.h                       |    1 
 include/asm-mips/sn/sn0/hubmd.h                      |    1 
 include/asm-mips/stackframe.h                        |    1 
 include/asm-mips/string.h                            |    1 
 include/asm-mips/system.h                            |    1 
 include/asm-mips/thread_info.h                       |    1 
 include/asm-mips/tlbflush.h                          |    1 
 include/asm-mips/tx4927/toshiba_rbtx4927.h           |    1 
 include/asm-mips/types.h                             |    1 
 include/asm-mips/uaccess.h                           |    1 
 include/asm-mips/unistd.h                            |    1 
 include/asm-mips/vr41xx/vrc4173.h                    |    1 
 include/asm-mips/war.h                               |    1 
 include/asm-mips/wbflush.h                           |    1 
 include/asm-parisc/atomic.h                          |    1 
 include/asm-parisc/cache.h                           |    1 
 include/asm-parisc/cacheflush.h                      |    1 
 include/asm-parisc/dma-mapping.h                     |    1 
 include/asm-parisc/dma.h                             |    1 
 include/asm-parisc/io.h                              |    1 
 include/asm-parisc/irq.h                             |    1 
 include/asm-parisc/kmap_types.h                      |    1 
 include/asm-parisc/page.h                            |    1 
 include/asm-parisc/param.h                           |    1 
 include/asm-parisc/pci.h                             |    1 
 include/asm-parisc/pdc.h                             |    1 
 include/asm-parisc/pgtable.h                         |    1 
 include/asm-parisc/processor.h                       |    1 
 include/asm-parisc/psw.h                             |    1 
 include/asm-parisc/smp.h                             |    1 
 include/asm-parisc/system.h                          |    1 
 include/asm-parisc/tlbflush.h                        |    1 
 include/asm-powerpc/abs_addr.h                       |    1 
 include/asm-powerpc/cache.h                          |    1 
 include/asm-powerpc/dma-mapping.h                    |    1 
 include/asm-powerpc/dma.h                            |    1 
 include/asm-powerpc/eeh.h                            |    1 
 include/asm-powerpc/elf.h                            |    7 
 include/asm-powerpc/floppy.h                         |    1 
 include/asm-powerpc/hw_irq.h                         |    1 
 include/asm-powerpc/ide.h                            |    1 
 include/asm-powerpc/iommu.h                          |    1 
 include/asm-powerpc/irq.h                            |    1 
 include/asm-powerpc/iseries/iseries_io.h             |    1 
 include/asm-powerpc/machdep.h                        |    1 
 include/asm-powerpc/mmzone.h                         |    1 
 include/asm-powerpc/paca.h                           |    1 
 include/asm-powerpc/page.h                           |    1 
 include/asm-powerpc/pgtable.h                        |    1 
 include/asm-powerpc/ppc_asm.h                        |    1 
 include/asm-powerpc/prom.h                           |    1 
 include/asm-powerpc/smp.h                            |    1 
 include/asm-powerpc/smu.h                            |    1 
 include/asm-powerpc/spu.h                            |    1 
 include/asm-powerpc/thread_info.h                    |    1 
 include/asm-powerpc/time.h                           |    1 
 include/asm-powerpc/timex.h                          |    1 
 include/asm-powerpc/tlb.h                            |    1 
 include/asm-powerpc/tlbflush.h                       |    1 
 include/asm-powerpc/topology.h                       |    1 
 include/asm-powerpc/types.h                          |    1 
 include/asm-powerpc/unistd.h                         |    1 
 include/asm-powerpc/vga.h                            |    1 
 include/asm-powerpc/vio.h                            |    1 
 include/asm-ppc/amigahw.h                            |    1 
 include/asm-ppc/bootinfo.h                           |    1 
 include/asm-ppc/commproc.h                           |    1 
 include/asm-ppc/ibm403.h                             |    1 
 include/asm-ppc/ibm44x.h                             |    1 
 include/asm-ppc/ibm4xx.h                             |    1 
 include/asm-ppc/io.h                                 |    1 
 include/asm-ppc/machdep.h                            |    1 
 include/asm-ppc/mmu.h                                |    1 
 include/asm-ppc/mmu_context.h                        |    1 
 include/asm-ppc/mpc8260.h                            |    1 
 include/asm-ppc/mpc83xx.h                            |    1 
 include/asm-ppc/mpc85xx.h                            |    1 
 include/asm-ppc/mpc8xx.h                             |    1 
 include/asm-ppc/mv64x60.h                            |    1 
 include/asm-ppc/ocp.h                                |    1 
 include/asm-ppc/open_pic.h                           |    1 
 include/asm-ppc/page.h                               |    2 
 include/asm-ppc/pc_serial.h                          |    1 
 include/asm-ppc/pgalloc.h                            |    1 
 include/asm-ppc/pgtable.h                            |    1 
 include/asm-ppc/ppc4xx_dma.h                         |    1 
 include/asm-ppc/ppc4xx_pic.h                         |    1 
 include/asm-ppc/serial.h                             |    1 
 include/asm-ppc/smp.h                                |    1 
 include/asm-ppc/time.h                               |    1 
 include/asm-s390/bitops.h                            |    1 
 include/asm-s390/debug.h                             |    1 
 include/asm-s390/hardirq.h                           |    1 
 include/asm-s390/idals.h                             |    1 
 include/asm-s390/local.h                             |    1 
 include/asm-s390/lowcore.h                           |    1 
 include/asm-s390/page.h                              |    6 
 include/asm-s390/pgalloc.h                           |    1 
 include/asm-s390/sfp-machine.h                       |    1 
 include/asm-s390/smp.h                               |    1 
 include/asm-s390/system.h                            |    1 
 include/asm-s390/tlbflush.h                          |    1 
 include/asm-s390/types.h                             |    1 
 include/asm-s390/unistd.h                            |    1 
 include/asm-sh/bug.h                                 |    1 
 include/asm-sh/checksum.h                            |    1 
 include/asm-sh/dma-mapping.h                         |    1 
 include/asm-sh/dma.h                                 |    1 
 include/asm-sh/fixmap.h                              |    1 
 include/asm-sh/hardirq.h                             |    1 
 include/asm-sh/hd64461/hd64461.h                     |    1 
 include/asm-sh/hd64465/hd64465.h                     |    1 
 include/asm-sh/ide.h                                 |    1 
 include/asm-sh/io.h                                  |    1 
 include/asm-sh/irq.h                                 |    1 
 include/asm-sh/keyboard.h                            |    1 
 include/asm-sh/kmap_types.h                          |    1 
 include/asm-sh/machvec.h                             |    1 
 include/asm-sh/machvec_init.h                        |    1 
 include/asm-sh/mpc1211/dma.h                         |    1 
 include/asm-sh/overdrive/overdrive.h                 |    1 
 include/asm-sh/page.h                                |    1 
 include/asm-sh/pgtable.h                             |    1 
 include/asm-sh/serial.h                              |    1 
 include/asm-sh/smp.h                                 |    1 
 include/asm-sh/system.h                              |    1 
 include/asm-sh/types.h                               |    1 
 include/asm-sh/watchdog.h                            |    1 
 include/asm-sh64/bug.h                               |    1 
 include/asm-sh64/dma-mapping.h                       |    1 
 include/asm-sh64/hardirq.h                           |    1 
 include/asm-sh64/ide.h                               |    1 
 include/asm-sh64/irq.h                               |    1 
 include/asm-sh64/mmu_context.h                       |    1 
 include/asm-sh64/page.h                              |    1 
 include/asm-sh64/param.h                             |    1 
 include/asm-sh64/pgtable.h                           |    1 
 include/asm-sh64/system.h                            |    1 
 include/asm-sparc/asmmacro.h                         |    1 
 include/asm-sparc/atomic.h                           |    1 
 include/asm-sparc/bugs.h                             |    1 
 include/asm-sparc/cacheflush.h                       |    1 
 include/asm-sparc/delay.h                            |    1 
 include/asm-sparc/dma-mapping.h                      |    1 
 include/asm-sparc/dma.h                              |    1 
 include/asm-sparc/elf.h                              |    1 
 include/asm-sparc/fixmap.h                           |    1 
 include/asm-sparc/hardirq.h                          |    1 
 include/asm-sparc/ide.h                              |    1 
 include/asm-sparc/irq.h                              |    1 
 include/asm-sparc/mostek.h                           |    1 
 include/asm-sparc/page.h                             |    1 
 include/asm-sparc/pgalloc.h                          |    1 
 include/asm-sparc/pgtable.h                          |    1 
 include/asm-sparc/sfp-machine.h                      |    1 
 include/asm-sparc/smp.h                              |    1 
 include/asm-sparc/system.h                           |    2 
 include/asm-sparc/timer.h                            |    1 
 include/asm-sparc/tlbflush.h                         |    1 
 include/asm-sparc/vac-ops.h                          |    1 
 include/asm-sparc/winmacro.h                         |    1 
 include/asm-sparc64/atomic.h                         |    1 
 include/asm-sparc64/bitops.h                         |    1 
 include/asm-sparc64/bugs.h                           |    1 
 include/asm-sparc64/cacheflush.h                     |    1 
 include/asm-sparc64/delay.h                          |    1 
 include/asm-sparc64/dma-mapping.h                    |    1 
 include/asm-sparc64/dma.h                            |    1 
 include/asm-sparc64/floppy.h                         |    1 
 include/asm-sparc64/ide.h                            |    1 
 include/asm-sparc64/irq.h                            |    1 
 include/asm-sparc64/kprobes.h                        |    1 
 include/asm-sparc64/mc146818rtc.h                    |    1 
 include/asm-sparc64/mmu.h                            |    1 
 include/asm-sparc64/oplib.h                          |    1 
 include/asm-sparc64/page.h                           |    1 
 include/asm-sparc64/param.h                          |    1 
 include/asm-sparc64/pgalloc.h                        |    1 
 include/asm-sparc64/pgtable.h                        |    1 
 include/asm-sparc64/processor.h                      |    1 
 include/asm-sparc64/siginfo.h                        |    1 
 include/asm-sparc64/signal.h                         |    1 
 include/asm-sparc64/smp.h                            |    1 
 include/asm-sparc64/spinlock.h                       |    1 
 include/asm-sparc64/system.h                         |    1 
 include/asm-sparc64/timer.h                          |    1 
 include/asm-sparc64/tlb.h                            |    1 
 include/asm-sparc64/tlbflush.h                       |    1 
 include/asm-sparc64/ttable.h                         |    1 
 include/asm-um/a.out.h                               |    1 
 include/asm-um/cache.h                               |    1 
 include/asm-um/elf-ppc.h                             |    1 
 include/asm-um/fixmap.h                              |    1 
 include/asm-um/hardirq.h                             |    1 
 include/asm-um/linkage.h                             |    1 
 include/asm-um/mmu_context.h                         |    1 
 include/asm-um/page.h                                |    1 
 include/asm-um/pgalloc.h                             |    1 
 include/asm-um/processor-generic.h                   |    1 
 include/asm-um/ptrace-generic.h                      |    1 
 include/asm-um/smp.h                                 |    1 
 include/asm-um/thread_info.h                         |    1 
 include/asm-v850/atomic.h                            |    1 
 include/asm-v850/bitops.h                            |    1 
 include/asm-v850/dma-mapping.h                       |    1 
 include/asm-v850/hardirq.h                           |    1 
 include/asm-v850/machdep.h                           |    1 
 include/asm-v850/pgtable.h                           |    1 
 include/asm-v850/processor.h                         |    1 
 include/asm-v850/serial.h                            |    1 
 include/asm-v850/v850e_uart.h                        |    1 
 include/asm-x86_64/apic.h                            |    1 
 include/asm-x86_64/atomic.h                          |    1 
 include/asm-x86_64/bitops.h                          |    1 
 include/asm-x86_64/bugs.h                            |    1 
 include/asm-x86_64/cache.h                           |    1 
 include/asm-x86_64/calling.h                         |    1 
 include/asm-x86_64/dma-mapping.h                     |    1 
 include/asm-x86_64/dma.h                             |    1 
 include/asm-x86_64/dwarf2.h                          |    1 
 include/asm-x86_64/fixmap.h                          |    1 
 include/asm-x86_64/hardirq.h                         |    1 
 include/asm-x86_64/hw_irq.h                          |    1 
 include/asm-x86_64/ia32.h                            |    1 
 include/asm-x86_64/io.h                              |    1 
 include/asm-x86_64/io_apic.h                         |    1 
 include/asm-x86_64/mmu_context.h                     |    1 
 include/asm-x86_64/mmzone.h                          |    1 
 include/asm-x86_64/mtrr.h                            |    1 
 include/asm-x86_64/param.h                           |    1 
 include/asm-x86_64/pci.h                             |    1 
 include/asm-x86_64/processor.h                       |    1 
 include/asm-x86_64/serial.h                          |    1 
 include/asm-x86_64/smp.h                             |    1 
 include/asm-x86_64/spinlock.h                        |    1 
 include/asm-x86_64/swiotlb.h                         |    1 
 include/asm-x86_64/system.h                          |    1 
 include/asm-x86_64/tlbflush.h                        |    1 
 include/asm-x86_64/topology.h                        |    1 
 include/asm-x86_64/uaccess.h                         |    1 
 include/asm-xtensa/atomic.h                          |    1 
 include/asm-xtensa/checksum.h                        |    1 
 include/asm-xtensa/delay.h                           |    1 
 include/asm-xtensa/dma.h                             |    1 
 include/asm-xtensa/hardirq.h                         |    1 
 include/asm-xtensa/ide.h                             |    1 
 include/asm-xtensa/io.h                              |    1 
 include/asm-xtensa/irq.h                             |    1 
 include/asm-xtensa/mmu_context.h                     |    1 
 include/asm-xtensa/page.h                            |    1 
 include/asm-xtensa/pgalloc.h                         |    1 
 include/asm-xtensa/platform.h                        |    1 
 include/asm-xtensa/system.h                          |    1 
 include/linux/acct.h                                 |    3 
 include/linux/acpi.h                                 |    1 
 include/linux/agpgart.h                              |    3 
 include/linux/amba/clcd.h                            |    1 
 include/linux/atmdev.h                               |    1 
 include/linux/audit.h                                |    4 
 include/linux/blkdev.h                               |    1 
 include/linux/blkpg.h                                |    1 
 include/linux/blktrace_api.h                         |    1 
 include/linux/blockgroup_lock.h                      |    1 
 include/linux/cache.h                                |    1 
 include/linux/coda.h                                 |    1 
 include/linux/compat.h                               |    1 
 include/linux/cpufreq.h                              |    1 
 include/linux/crypto.h                               |    1 
 include/linux/cyclomx.h                              |    1 
 include/linux/dcookies.h                             |    1 
 include/linux/devfs_fs_kernel.h                      |    1 
 include/linux/device.h                               |    1 
 include/linux/dmi.h                                  |    1 
 include/linux/dnotify.h                              |    1 
 include/linux/elf.h                                  |   59 ------
 include/linux/errqueue.h                             |    1 
 include/linux/ethtool.h                              |  169 +++++++++----------
 include/linux/ext2_fs.h                              |    2 
 include/linux/ext3_fs.h                              |    7 
 include/linux/fs.h                                   |    1 
 include/linux/ftape.h                                |    1 
 include/linux/gameport.h                             |    6 
 include/linux/generic_serial.h                       |    6 
 include/linux/genhd.h                                |   12 -
 include/linux/gfp.h                                  |    1 
 include/linux/hardirq.h                              |    1 
 include/linux/highmem.h                              |    1 
 include/linux/highuid.h                              |    1 
 include/linux/i2c-algo-ite.h                         |    7 
 include/linux/i2c.h                                  |    9 -
 include/linux/ide.h                                  |    1 
 include/linux/if_frad.h                              |    1 
 include/linux/if_tr.h                                |    1 
 include/linux/init.h                                 |    1 
 include/linux/inotify.h                              |    1 
 include/linux/interrupt.h                            |    1 
 include/linux/ipmi.h                                 |    2 
 include/linux/ipv6.h                                 |    1 
 include/linux/irq.h                                  |    1 
 include/linux/irq_cpustat.h                          |    1 
 include/linux/isapnp.h                               |    1 
 include/linux/isdn.h                                 |    1 
 include/linux/isdn/tpam.h                            |    1 
 include/linux/isdn_ppp.h                             |    1 
 include/linux/isdnif.h                               |    1 
 include/linux/kallsyms.h                             |    1 
 include/linux/kernel_stat.h                          |    1 
 include/linux/kmod.h                                 |    1 
 include/linux/kprobes.h                              |    1 
 include/linux/linkage.h                              |    1 
 include/linux/lockd/lockd.h                          |    1 
 include/linux/lockd/nlm.h                            |    1 
 include/linux/mempolicy.h                            |    1 
 include/linux/migrate.h                              |    1 
 include/linux/mii.h                                  |   30 +--
 include/linux/mm.h                                   |    1 
 include/linux/mman.h                                 |   12 -
 include/linux/mmzone.h                               |    1 
 include/linux/module.h                               |    1 
 include/linux/msg.h                                  |    2 
 include/linux/mtd/cfi.h                              |    1 
 include/linux/mtd/map.h                              |    1 
 include/linux/mtd/mtd.h                              |    1 
 include/linux/mtd/nand.h                             |    1 
 include/linux/mtd/physmap.h                          |    1 
 include/linux/mtd/xip.h                              |    1 
 include/linux/ncp_fs.h                               |    5 
 include/linux/net.h                                  |    3 
 include/linux/netdevice.h                            |    1 
 include/linux/netfilter.h                            |    1 
 include/linux/netfilter_arp.h                        |    1 
 include/linux/netfilter_bridge.h                     |    1 
 include/linux/netfilter_ipv4.h                       |    1 
 include/linux/netfilter_ipv4/ip_conntrack.h          |    1 
 include/linux/netfilter_ipv4/listhelp.h              |    1 
 include/linux/nfs.h                                  |    8 
 include/linux/nfs4.h                                 |    6 
 include/linux/nfs_fs.h                               |   39 ++--
 include/linux/nfsd/nfsd.h                            |    1 
 include/linux/nfsd/nfsfh.h                           |    1 
 include/linux/nfsd/syscall.h                         |    1 
 include/linux/numa.h                                 |    1 
 include/linux/parport.h                              |    1 
 include/linux/pci.h                                  |    1 
 include/linux/percpu_counter.h                       |    1 
 include/linux/pm.h                                   |    1 
 include/linux/pm_legacy.h                            |    1 
 include/linux/pmu.h                                  |    1 
 include/linux/preempt.h                              |    1 
 include/linux/proc_fs.h                              |    1 
 include/linux/profile.h                              |    1 
 include/linux/quota.h                                |    4 
 include/linux/quotaops.h                             |    1 
 include/linux/reiserfs_xattr.h                       |    3 
 include/linux/relay.h                                |    1 
 include/linux/rio.h                                  |    1 
 include/linux/rio_drv.h                              |    1 
 include/linux/rmap.h                                 |    1 
 include/linux/rtnetlink.h                            |    1 
 include/linux/rwsem.h                                |    1 
 include/linux/scc.h                                  |    1 
 include/linux/sched.h                                |   94 +++++-----
 include/linux/seccomp.h                              |    1 
 include/linux/sem.h                                  |    2 
 include/linux/seqlock.h                              |    1 
 include/linux/serialP.h                              |    1 
 include/linux/serial_core.h                          |    1 
 include/linux/signal.h                               |    4 
 include/linux/skbuff.h                               |    1 
 include/linux/slab.h                                 |    1 
 include/linux/smb_fs.h                               |    4 
 include/linux/smp.h                                  |    1 
 include/linux/smp_lock.h                             |    1 
 include/linux/socket.h                               |    2 
 include/linux/spinlock.h                             |    1 
 include/linux/stop_machine.h                         |    1 
 include/linux/sunrpc/auth.h                          |    1 
 include/linux/sunrpc/debug.h                         |   24 +-
 include/linux/sunrpc/stats.h                         |    1 
 include/linux/suspend.h                              |    1 
 include/linux/swap.h                                 |    1 
 include/linux/syscalls.h                             |    1 
 include/linux/sysrq.h                                |    1 
 include/linux/tcp.h                                  |    1 
 include/linux/threads.h                              |    1 
 include/linux/timer.h                                |    1 
 include/linux/timex.h                                |    1 
 include/linux/tty.h                                  |    1 
 include/linux/types.h                                |    1 
 include/linux/udp.h                                  |    1 
 include/linux/usb.h                                  |    1 
 include/linux/usb_usual.h                            |    1 
 include/linux/usbdevice_fs.h                         |    2 
 include/linux/vt_buffer.h                            |    1 
 include/linux/vt_kern.h                              |    1 
 include/linux/wait.h                                 |    1 
 include/linux/wanrouter.h                            |    4 
 include/mtd/mtd-abi.h                                |    5 
 include/net/addrconf.h                               |    1 
 include/net/af_unix.h                                |    1 
 include/net/ax25.h                                   |    1 
 include/net/compat.h                                 |    1 
 include/net/dst.h                                    |    1 
 include/net/icmp.h                                   |    1 
 include/net/inet6_hashtables.h                       |    1 
 include/net/inet_hashtables.h                        |    1 
 include/net/inet_sock.h                              |    1 
 include/net/inet_timewait_sock.h                     |    1 
 include/net/ip.h                                     |    1 
 include/net/ip_fib.h                                 |    1 
 include/net/ip_mp_alg.h                              |    1 
 include/net/ip_vs.h                                  |    1 
 include/net/ipv6.h                                   |    1 
 include/net/irda/irda.h                              |    1 
 include/net/irda/irda_device.h                       |    1 
 include/net/irda/irlap.h                             |    1 
 include/net/irda/irlmp.h                             |    1 
 include/net/irda/irlmp_frame.h                       |    1 
 include/net/irda/qos.h                               |    1 
 include/net/ndisc.h                                  |    1 
 include/net/netfilter/nf_conntrack.h                 |    1 
 include/net/pkt_act.h                                |    1 
 include/net/protocol.h                               |    1 
 include/net/raw.h                                    |    1 
 include/net/red.h                                    |    1 
 include/net/route.h                                  |    1 
 include/net/sch_generic.h                            |    1 
 include/net/sctp/sctp.h                              |    1 
 include/net/sock.h                                   |    1 
 include/net/tcp.h                                    |    1 
 include/pcmcia/ss.h                                  |    1 
 include/scsi/scsi_transport_fc.h                     |    1 
 include/scsi/scsi_transport_spi.h                    |    1 
 include/sound/driver.h                               |    1 
 include/video/edid.h                                 |    1 
 include/video/vga.h                                  |    1 
 869 files changed, 312 insertions(+), 1143 deletions(-)

Index: linux-2.6-header-cleanup-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-cleanup-git.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:00:17 -0000	1.6
+++ linux-2.6-header-cleanup-git.patch	27 Apr 2006 16:21:54 -0000	1.7
@@ -10246,7 +10246,6 @@
  #endif
 +
 +#endif /* __ASM_GENERIC_SIGNAL_H */
-only in patch2:
 unchanged:
 --- a/include/linux/blkpg.h
 +++ b/include/linux/blkpg.h
@@ -10258,3 +10257,402 @@
  #include <linux/ioctl.h>
  
  #define BLKPG      _IO(0x12,105)
+only in patch2:
+unchanged:
+--- a/include/linux/ethtool.h
++++ b/include/linux/ethtool.h
+@@ -15,24 +15,24 @@ #define _LINUX_ETHTOOL_H
+ 
+ /* This should work for both 32 and 64 bit userland. */
+ struct ethtool_cmd {
+-	u32	cmd;
+-	u32	supported;	/* Features this interface supports */
+-	u32	advertising;	/* Features this interface advertises */
+-	u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
+-	u8	duplex;		/* Duplex, half or full */
+-	u8	port;		/* Which connector port */
+-	u8	phy_address;
+-	u8	transceiver;	/* Which transceiver to use */
+-	u8	autoneg;	/* Enable or disable autonegotiation */
+-	u32	maxtxpkt;	/* Tx pkts before generating tx int */
+-	u32	maxrxpkt;	/* Rx pkts before generating rx int */
+-	u32	reserved[4];
++	__u32	cmd;
++	__u32	supported;	/* Features this interface supports */
++	__u32	advertising;	/* Features this interface advertises */
++	__u16	speed;		/* The forced speed, 10Mb, 100Mb, gigabit */
++	__u8	duplex;		/* Duplex, half or full */
++	__u8	port;		/* Which connector port */
++	__u8	phy_address;
++	__u8	transceiver;	/* Which transceiver to use */
++	__u8	autoneg;	/* Enable or disable autonegotiation */
++	__u32	maxtxpkt;	/* Tx pkts before generating tx int */
++	__u32	maxrxpkt;	/* Rx pkts before generating rx int */
++	__u32	reserved[4];
+ };
+ 
+ #define ETHTOOL_BUSINFO_LEN	32
+ /* these strings are set to whatever the driver author decides... */
+ struct ethtool_drvinfo {
+-	u32	cmd;
++	__u32	cmd;
+ 	char	driver[32];	/* driver short name, "tulip", "eepro100" */
+ 	char	version[32];	/* driver version string */
+ 	char	fw_version[32];	/* firmware version string, if applicable */
+@@ -40,53 +40,53 @@ struct ethtool_drvinfo {
+ 				/* For PCI devices, use pci_name(pci_dev). */
+ 	char	reserved1[32];
+ 	char	reserved2[16];
+-	u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
+-	u32	testinfo_len;
+-	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
+-	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
++	__u32	n_stats;	/* number of u64's from ETHTOOL_GSTATS */
++	__u32	testinfo_len;
++	__u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
++	__u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
+ };
+ 
+ #define SOPASS_MAX	6
+ /* wake-on-lan settings */
+ struct ethtool_wolinfo {
+-	u32	cmd;
+-	u32	supported;
+-	u32	wolopts;
+-	u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
++	__u32	cmd;
++	__u32	supported;
++	__u32	wolopts;
++	__u8	sopass[SOPASS_MAX]; /* SecureOn(tm) password */
+ };
+ 
+ /* for passing single values */
+ struct ethtool_value {
+-	u32	cmd;
+-	u32	data;
++	__u32	cmd;
++	__u32	data;
+ };
+ 
+ /* for passing big chunks of data */
+ struct ethtool_regs {
+-	u32	cmd;
+-	u32	version; /* driver-specific, indicates different chips/revs */
+-	u32	len; /* bytes */
+-	u8	data[0];
++	__u32	cmd;
++	__u32	version; /* driver-specific, indicates different chips/revs */
++	__u32	len; /* bytes */
++	__u8	data[0];
+ };
+ 
+ /* for passing EEPROM chunks */
+ struct ethtool_eeprom {
+-	u32	cmd;
+-	u32	magic;
+-	u32	offset; /* in bytes */
+-	u32	len; /* in bytes */
+-	u8	data[0];
++	__u32	cmd;
++	__u32	magic;
++	__u32	offset; /* in bytes */
++	__u32	len; /* in bytes */
++	__u8	data[0];
+ };
+ 
+ /* for configuring coalescing parameters of chip */
+ struct ethtool_coalesce {
+-	u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
++	__u32	cmd;	/* ETHTOOL_{G,S}COALESCE */
+ 
+ 	/* How many usecs to delay an RX interrupt after
+ 	 * a packet arrives.  If 0, only rx_max_coalesced_frames
+ 	 * is used.
+ 	 */
+-	u32	rx_coalesce_usecs;
++	__u32	rx_coalesce_usecs;
+ 
+ 	/* How many packets to delay an RX interrupt after
+ 	 * a packet arrives.  If 0, only rx_coalesce_usecs is
+@@ -94,21 +94,21 @@ struct ethtool_coalesce {
+ 	 * to zero as this would cause RX interrupts to never be
+ 	 * generated.
+ 	 */
+-	u32	rx_max_coalesced_frames;
++	__u32	rx_max_coalesced_frames;
+ 
+ 	/* Same as above two parameters, except that these values
+ 	 * apply while an IRQ is being serviced by the host.  Not
+ 	 * all cards support this feature and the values are ignored
+ 	 * in that case.
+ 	 */
+-	u32	rx_coalesce_usecs_irq;
+-	u32	rx_max_coalesced_frames_irq;
++	__u32	rx_coalesce_usecs_irq;
++	__u32	rx_max_coalesced_frames_irq;
+ 
+ 	/* How many usecs to delay a TX interrupt after
+ 	 * a packet is sent.  If 0, only tx_max_coalesced_frames
+ 	 * is used.
+ 	 */
+-	u32	tx_coalesce_usecs;
++	__u32	tx_coalesce_usecs;
+ 
+ 	/* How many packets to delay a TX interrupt after
+ 	 * a packet is sent.  If 0, only tx_coalesce_usecs is
+@@ -116,22 +116,22 @@ struct ethtool_coalesce {
+ 	 * to zero as this would cause TX interrupts to never be
+ 	 * generated.
+ 	 */
+-	u32	tx_max_coalesced_frames;
++	__u32	tx_max_coalesced_frames;
+ 
+ 	/* Same as above two parameters, except that these values
+ 	 * apply while an IRQ is being serviced by the host.  Not
+ 	 * all cards support this feature and the values are ignored
+ 	 * in that case.
+ 	 */
+-	u32	tx_coalesce_usecs_irq;
+-	u32	tx_max_coalesced_frames_irq;
++	__u32	tx_coalesce_usecs_irq;
++	__u32	tx_max_coalesced_frames_irq;
+ 
+ 	/* How many usecs to delay in-memory statistics
+ 	 * block updates.  Some drivers do not have an in-memory
+ 	 * statistic block, and in such cases this value is ignored.
+ 	 * This value must not be zero.
+ 	 */
+-	u32	stats_block_coalesce_usecs;
++	__u32	stats_block_coalesce_usecs;
+ 
+ 	/* Adaptive RX/TX coalescing is an algorithm implemented by
+ 	 * some drivers to improve latency under low packet rates and
+@@ -140,18 +140,18 @@ struct ethtool_coalesce {
+ 	 * not implemented by the driver causes these values to be
+ 	 * silently ignored.
+ 	 */
+-	u32	use_adaptive_rx_coalesce;
+-	u32	use_adaptive_tx_coalesce;
++	__u32	use_adaptive_rx_coalesce;
++	__u32	use_adaptive_tx_coalesce;
+ 
+ 	/* When the packet rate (measured in packets per second)
+ 	 * is below pkt_rate_low, the {rx,tx}_*_low parameters are
+ 	 * used.
+ 	 */
+-	u32	pkt_rate_low;
+-	u32	rx_coalesce_usecs_low;
+-	u32	rx_max_coalesced_frames_low;
+-	u32	tx_coalesce_usecs_low;
+-	u32	tx_max_coalesced_frames_low;
++	__u32	pkt_rate_low;
++	__u32	rx_coalesce_usecs_low;
++	__u32	rx_max_coalesced_frames_low;
++	__u32	tx_coalesce_usecs_low;
++	__u32	tx_max_coalesced_frames_low;
+ 
+ 	/* When the packet rate is below pkt_rate_high but above
+ 	 * pkt_rate_low (both measured in packets per second) the
+@@ -162,43 +162,43 @@ struct ethtool_coalesce {
+ 	 * is above pkt_rate_high, the {rx,tx}_*_high parameters are
+ 	 * used.
+ 	 */
+-	u32	pkt_rate_high;
+-	u32	rx_coalesce_usecs_high;
+-	u32	rx_max_coalesced_frames_high;
+-	u32	tx_coalesce_usecs_high;
+-	u32	tx_max_coalesced_frames_high;
++	__u32	pkt_rate_high;
++	__u32	rx_coalesce_usecs_high;
++	__u32	rx_max_coalesced_frames_high;
++	__u32	tx_coalesce_usecs_high;
++	__u32	tx_max_coalesced_frames_high;
+ 
+ 	/* How often to do adaptive coalescing packet rate sampling,
+ 	 * measured in seconds.  Must not be zero.
+ 	 */
+-	u32	rate_sample_interval;
++	__u32	rate_sample_interval;
+ };
+ 
+ /* for configuring RX/TX ring parameters */
+ struct ethtool_ringparam {
+-	u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
++	__u32	cmd;	/* ETHTOOL_{G,S}RINGPARAM */
+ 
+ 	/* Read only attributes.  These indicate the maximum number
+ 	 * of pending RX/TX ring entries the driver will allow the
+ 	 * user to set.
+ 	 */
+-	u32	rx_max_pending;
+-	u32	rx_mini_max_pending;
+-	u32	rx_jumbo_max_pending;
+-	u32	tx_max_pending;
++	__u32	rx_max_pending;
++	__u32	rx_mini_max_pending;
++	__u32	rx_jumbo_max_pending;
++	__u32	tx_max_pending;
+ 
+ 	/* Values changeable by the user.  The valid values are
+ 	 * in the range 1 to the "*_max_pending" counterpart above.
+ 	 */
+-	u32	rx_pending;
+-	u32	rx_mini_pending;
+-	u32	rx_jumbo_pending;
+-	u32	tx_pending;
++	__u32	rx_pending;
++	__u32	rx_mini_pending;
++	__u32	rx_jumbo_pending;
++	__u32	tx_pending;
+ };
+ 
+ /* for configuring link flow control parameters */
+ struct ethtool_pauseparam {
+-	u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
++	__u32	cmd;	/* ETHTOOL_{G,S}PAUSEPARAM */
+ 
+ 	/* If the link is being auto-negotiated (via ethtool_cmd.autoneg
+ 	 * being true) the user may set 'autonet' here non-zero to have the
+@@ -210,9 +210,9 @@ struct ethtool_pauseparam {
+ 	 * then {rx,tx}_pause force the driver to use/not-use pause
+ 	 * flow control.
+ 	 */
+-	u32	autoneg;
+-	u32	rx_pause;
+-	u32	tx_pause;
++	__u32	autoneg;
++	__u32	rx_pause;
++	__u32	tx_pause;
+ };
+ 
+ #define ETH_GSTRING_LEN		32
+@@ -223,10 +223,10 @@ enum ethtool_stringset {
+ 
+ /* for passing string sets for data tagging */
+ struct ethtool_gstrings {
+-	u32	cmd;		/* ETHTOOL_GSTRINGS */
+-	u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
+-	u32	len;		/* number of strings in the string set */
+-	u8	data[0];
++	__u32	cmd;		/* ETHTOOL_GSTRINGS */
++	__u32	string_set;	/* string set id e.c. ETH_SS_TEST, etc*/
++	__u32	len;		/* number of strings in the string set */
++	__u8	data[0];
+ };
+ 
+ enum ethtool_test_flags {
+@@ -236,26 +236,28 @@ enum ethtool_test_flags {
+ 
+ /* for requesting NIC test and getting results*/
+ struct ethtool_test {
+-	u32	cmd;		/* ETHTOOL_TEST */
+-	u32	flags;		/* ETH_TEST_FL_xxx */
+-	u32	reserved;
+-	u32	len;		/* result length, in number of u64 elements */
+-	u64	data[0];
++	__u32	cmd;		/* ETHTOOL_TEST */
++	__u32	flags;		/* ETH_TEST_FL_xxx */
++	__u32	reserved;
++	__u32	len;		/* result length, in number of u64 elements */
++	__u64	data[0];
+ };
+ 
+ /* for dumping NIC-specific statistics */
+ struct ethtool_stats {
+-	u32	cmd;		/* ETHTOOL_GSTATS */
+-	u32	n_stats;	/* number of u64's being returned */
+-	u64	data[0];
++	__u32	cmd;		/* ETHTOOL_GSTATS */
++	__u32	n_stats;	/* number of u64's being returned */
++	__u64	data[0];
+ };
+ 
+ struct ethtool_perm_addr {
+-	u32	cmd;		/* ETHTOOL_GPERMADDR */
+-	u32	size;
+-	u8	data[0];
++	__u32	cmd;		/* ETHTOOL_GPERMADDR */
++	__u32	size;
++	__u8	data[0];
+ };
+ 
++#ifdef __KERNEL__
++
+ struct net_device;
+ 
+ /* Some generic methods drivers may use in their ethtool_ops */
+@@ -371,6 +373,7 @@ struct ethtool_ops {
+ 	u32     (*get_ufo)(struct net_device *);
+ 	int     (*set_ufo)(struct net_device *, u32);
+ };
++#endif /* __KERNEL__ */
+ 
+ /* CMDs currently supported */
+ #define ETHTOOL_GSET		0x00000001 /* Get settings. */
+only in patch2:
+unchanged:
+--- a/include/linux/mii.h
++++ b/include/linux/mii.h
+@@ -9,7 +9,6 @@ #ifndef __LINUX_MII_H__
+ #define __LINUX_MII_H__
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+ 
+ /* Generic MII registers. */
+ 
+@@ -136,6 +135,20 @@ #define LPA_1000REMRXOK         0x1000  
+ #define LPA_1000FULL            0x0800  /* Link partner 1000BASE-T full duplex */
+ #define LPA_1000HALF            0x0400  /* Link partner 1000BASE-T half duplex */
+ 
++/* This structure is used in all SIOCxMIIxxx ioctl calls */
++struct mii_ioctl_data {
++	__u16		phy_id;
++	__u16		reg_num;
++	__u16		val_in;
++	__u16		val_out;
++};
++
++#ifdef __KERNEL__ 
++
++#include <linux/if.h>
++
++struct ethtool_cmd;
++
+ struct mii_if_info {
+ 	int phy_id;
+ 	int advertising;
+@@ -151,9 +164,6 @@ struct mii_if_info {
+ 	void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val);
+ };
+ 
+-struct ethtool_cmd;
+-struct mii_ioctl_data;
+-
+ extern int mii_link_ok (struct mii_if_info *mii);
+ extern int mii_nway_restart (struct mii_if_info *mii);
+ extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd);
+@@ -168,16 +178,6 @@ extern int generic_mii_ioctl(struct mii_
+ 			     unsigned int *duplex_changed);
+ 
+ 
+-
+-/* This structure is used in all SIOCxMIIxxx ioctl calls */
+-struct mii_ioctl_data {
+-	u16		phy_id;
+-	u16		reg_num;
+-	u16		val_in;
+-	u16		val_out;
+-};
+-
+-
+ static inline struct mii_ioctl_data *if_mii(struct ifreq *rq)
+ {
+ 	return (struct mii_ioctl_data *) &rq->ifr_ifru;
+@@ -235,5 +235,5 @@ static inline unsigned int mii_duplex (u
+ 	return 0;
+ }
+ 
+-
++#endif /* __KERNEL__ */
+ #endif /* __LINUX_MII_H__ */

linux-2.6-header-install-git.patch:
 Makefile                              |   17 ++++
 include/Kbuild                        |    2 
 include/asm-alpha/Kbuild              |    9 ++
 include/asm-arm/Kbuild                |    7 +
 include/asm-arm26/Kbuild              |    8 ++
 include/asm-cris/Kbuild               |    6 +
 include/asm-cris/arch-v10/Kbuild      |    3 
 include/asm-generic/Kbuild            |    3 
 include/asm-generic/Kbuild.asm        |   11 +++
 include/asm-h8300/Kbuild              |    6 +
 include/asm-i386/Kbuild               |    5 +
 include/asm-ia64/Kbuild               |    7 +
 include/asm-m32r/Kbuild               |    7 +
 include/asm-m68k/Kbuild               |   17 ++++
 include/asm-m68knommu/Kbuild          |   12 +++
 include/asm-mips/Kbuild               |   15 ++++
 include/asm-parisc/Kbuild             |    8 ++
 include/asm-powerpc/Kbuild            |   10 ++
 include/asm-ppc/Kbuild                |    8 ++
 include/asm-s390/Kbuild               |    4 +
 include/asm-sh/Kbuild                 |    6 +
 include/asm-sh64/Kbuild               |    6 +
 include/asm-sparc/Kbuild              |   13 +++
 include/asm-sparc64/Kbuild            |   16 ++++
 include/asm-um/Kbuild                 |   14 +++
 include/asm-v850/Kbuild               |   10 ++
 include/asm-x86_64/Kbuild             |   11 +++
 include/linux/Kbuild                  |   63 +++++++++++++++++
 include/linux/byteorder/Kbuild        |    1 
 include/linux/dvb/Kbuild              |    2 
 include/linux/hdlc/Kbuild             |    1 
 include/linux/isdn/Kbuild             |    1 
 include/linux/netfilter/Kbuild        |   11 +++
 include/linux/netfilter_arp/Kbuild    |    2 
 include/linux/netfilter_bridge/Kbuild |    4 +
 include/linux/netfilter_ipv4/Kbuild   |   21 +++++
 include/linux/netfilter_ipv6/Kbuild   |    5 +
 include/linux/nfsd/Kbuild             |    2 
 include/linux/raid/Kbuild             |    1 
 include/linux/sunrpc/Kbuild           |    1 
 include/linux/tc_act/Kbuild           |    1 
 include/linux/tc_ematch/Kbuild        |    1 
 include/media/Kbuild                  |    2 
 include/mtd/Kbuild                    |    2 
 include/rdma/Kbuild                   |    1 
 include/scsi/Kbuild                   |    2 
 include/sound/Kbuild                  |    2 
 include/video/Kbuild                  |    1 
 scripts/Makefile.headersinst          |  124 ++++++++++++++++++++++++++++++++++
 scripts/hdrcheck.sh                   |    8 ++
 50 files changed, 500 insertions(+)

Index: linux-2.6-header-install-git.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-header-install-git.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-header-install-git.patch	27 Apr 2006 12:42:19 -0000	1.5
+++ linux-2.6-header-install-git.patch	27 Apr 2006 16:21:54 -0000	1.6
@@ -11,7 +11,7 @@
 +export INSTALL_HDR_PATH
 +
 +.PHONY: headers_install
-+headers_install: .kernelrelease
++headers_install: include/linux/version.h
 +	@unifdef -Ux /dev/null
 +	@rm -rf $(INSTALL_HDR_PATH)/include
 +	$(Q)$(MAKE) -rR -f $(srctree)/scripts/Makefile.headersinst obj=include
@@ -449,7 +449,7 @@
 +	resource.h rose.h sctp.h smbno.h snmp.h sockios.h som.h		\
 +	sound.h statfs.h stddef.h synclink.h telephony.h ticable.h	\
 +	times.h tiocl.h tipc.h toshiba.h ultrasound.h un.h unistd.h	\
-+	utime.h utsname.h video_decoder.h		\
++	utime.h utsname.h version.h video_decoder.h			\
 +	video_encoder.h videotext.h vt.h wavefront.h wireless.h		\
 +	xattr.h x25.h zorro_ids.h
 +




More information about the fedora-cvs-commits mailing list