Skip to content
Commits on Oct 12, 2007
  1. @NigelCunningham
  2. Fix up more bio fallout

    Al Viro committed with Linus Torvalds Oct 12, 2007
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/…

    Linus Torvalds committed Oct 12, 2007
    …davem/net-2.6
    
    * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
      [ZLIB]: Fix external builds of zlib_inflate code.
      [TG3]: Fix APE induced regression
      [SKY2]: version 1.19
      [SKY2]: use netdevice stats struct
      [SKY2]: fiber advertise bits initialization (trivial)
      [SKY2]: fix power settings on Yukon XL
      [SKY2]: ethtool register reserved area blackout
  4. @NigelCunningham

    Let's start heading for 3.0.

    NigelCunningham committed Oct 12, 2007
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  5. @NigelCunningham

    Remove bd_release from close_bdev.

    NigelCunningham committed Oct 12, 2007
    We aren't doing a bd_claim, and shouldn't because we may not have exclusive
    use of the device (especially when hibernating).
    
    Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
  6. missed bio_endio() in axonram

    Al Viro committed with Linus Torvalds Oct 12, 2007
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. [ZLIB]: Fix external builds of zlib_inflate code.

    David S. Miller committed Oct 11, 2007
    Move zlib_inflate_blob() out into it's own source file,
    infutil.c, so that things like the powerpc zImage builder
    in arch/powerpc/boot/Makefile don't end up trying to
    compile it.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. [TG3]: Fix APE induced regression

    Matt Carlson committed with David S. Miller Oct 11, 2007
    This patch fixes a bug caused by the recent APE support added for 5761
    devices.
    
    Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. [SKY2]: version 1.19

    Stephen Hemminger committed with David S. Miller Oct 11, 2007
    Update version to keep track of new changes.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. [SKY2]: use netdevice stats struct

    Stephen Hemminger committed with David S. Miller Oct 11, 2007
    Use builtin statistics structure from net device.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. [SKY2]: fiber advertise bits initialization (trivial)

    Stephen Hemminger committed with David S. Miller Oct 11, 2007
    Put initialization in sequential order (same as other constants).
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. [SKY2]: fix power settings on Yukon XL

    Stephen Hemminger committed with David S. Miller Oct 11, 2007
    Make sure PCI register for PHY power gets set correctly.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  13. [SKY2]: ethtool register reserved area blackout

    Stephen Hemminger committed with David S. Miller Oct 11, 2007
    Make sure and not dump reserved areas of device space.
    Touching some of these causes machine check exceptions on boards
    like D-Link DGE-550SX.
    
    Coding note, used a complex switch statement rather than bitmap
    because it is easier to relate the block values to the documentation
    rather than looking at a encoded bitmask.
    
    Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  14. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    Linus Torvalds committed Oct 11, 2007
    …t/paulus/powerpc
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
      [POWERPC] Add memchr() to the bootwrapper
      [POWERPC] Implement logging of unhandled signals
      [POWERPC] Add legacy serial support for OPB with flattened device tree
      [POWERPC] Use 1TB segments
      [POWERPC] XilinxFB: Allow fixed framebuffer base address
      [POWERPC] XilinxFB: Add support for custom screen resolution
      [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
      [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
      [POWERPC] 4xx: Kilauea defconfig file
      [POWERPC] 4xx: Kilauea DTS
      [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
      [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
      [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
      [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
      [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
      [POWERPC] 85xx: Killed <asm/mpc85xx.h>
      [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
      [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
      [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
      [POWERPC] Make clockevents work on PPC601 processors
      ...
    
    Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.
  15. Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/ker…

    Linus Torvalds committed Oct 11, 2007
    …nel/git/jgarzik/libata-dev
    
    * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      [libata] sata_mv: more S/G fixes
  16. [libata] sata_mv: more S/G fixes

    Jeff Garzik committed Oct 12, 2007
    * corruption fix: we only want the lower 16 bits of length (0 == 64kb)
    
    * ditto: the upper layer sets max-phys-segments to LIBATA_MAX_PRD,
      so we must reset it to own hw-specific length.
    
    * delete unused mv_fill_sg() return value
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  17. JFS: fix bio-related build breakage

    Jeff Garzik committed with Linus Torvalds Oct 12, 2007
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18. @dgibson @paulusmack

    [POWERPC] Add memchr() to the bootwrapper

    dgibson committed with paulusmack Oct 12, 2007
    This adds a memchr() implementation to the bootwrapper, which will
    be needed when libfdt is merged in.
    
    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  19. @olofj @paulusmack

    [POWERPC] Implement logging of unhandled signals

    olofj committed with paulusmack Oct 12, 2007
    Implement show_unhandled_signals sysctl + support to print when a process
    is killed due to unhandled signals just as i386 and x86_64 does.
    
    Default to having it off, unlike x86 that defaults on.
    
    Signed-off-by: Olof Johansson <olof@lixom.net>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  20. @paulusmack

    [POWERPC] Add legacy serial support for OPB with flattened device tree

    Valentine Barshak committed with paulusmack Oct 12, 2007
    Currently find_legacy_serial_ports() can find no serial ports on the
    OPB with flattened device tree.  Thus no legacy boot console can be
    initialized.  Just the early udbg console works, which is initialized
    with udbg_init_44x_as1 on the UART's physical address specified in
    kernel config.  This happens because we look for ns16750 serial
    devices only and expect opb node to have a device type property.  This
    patch makes it look for ns16550-compatible devices and use
    of_device_is_compatible() for opb in case device type is not
    specified.
    
    Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  21. @paulusmack

    [POWERPC] Use 1TB segments

    paulusmack committed Oct 11, 2007
    This makes the kernel use 1TB segments for all kernel mappings and for
    user addresses of 1TB and above, on machines which support them
    (currently POWER5+, POWER6 and PA6T).
    
    We detect that the machine supports 1TB segments by looking at the
    ibm,processor-segment-sizes property in the device tree.
    
    We don't currently use 1TB segments for user addresses < 1T, since
    that would effectively prevent 32-bit processes from using huge pages
    unless we also had a way to revert to using 256MB segments.  That
    would be possible but would involve extra complications (such as
    keeping track of which segment size was used when HPTEs were inserted)
    and is not addressed here.
    
    Parts of this patch were originally written by Ben Herrenschmidt.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  22. @paulusmack

    [POWERPC] XilinxFB: Allow fixed framebuffer base address

    Grant Likely committed with paulusmack Oct 11, 2007
    Allow a fixed framebuffer address to be assigned to the framebuffer device
    instead of allocating the framebuffer from the consistent memory pool.
    
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  23. @paulusmack

    [POWERPC] XilinxFB: Add support for custom screen resolution

    Grant Likely committed with paulusmack Oct 11, 2007
    Some custom implementations of the xilinx fb can use resolutions other
    than 640x480.  This patch allows the resolution to be specified in the
    device tree or the xilinx_platform_data structure.
    
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  24. @paulusmack

    [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters

    Grant Likely committed with paulusmack Oct 11, 2007
    The call to xilinxfb_assign is getting unwieldy when adding features
    to the Xilinx framebuffer driver.  Change xilinxfb_assign() to accept
    a pointer to a xilinxfb_platform_data structure to prepare for adding
    additition configuration options.
    
    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  25. @paulusmack

    [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci

    Valentine Barshak committed with paulusmack Oct 8, 2007
    Add 64-bit physical address support to setup_indirect_pci().
    
    Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
    Acked-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
  26. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds committed Oct 11, 2007
    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (87 commits)
      mlx4_core: Fix section mismatches
      IPoIB: Allow setting policy to ignore multicast groups
      IB/mthca: Mark error paths as unlikely() in post_srq_recv functions
      IB/ipath: Minor fix to ordering of freeing and zeroing of tid pages.
      IB/ipath: Remove redundant link state checks
      IB/ipath: Fix IB_EVENT_PORT_ERR event
      IB/ipath: Better handling of unexpected GPIO interrupts
      IB/ipath: Maintain active time on all chips
      IB/ipath: Fix QHT7040 serial number check
      IB/ipath: Indicate a couple of chip bugs to userspace
      IB/ipath: iba6110 rev4 no longer needs recv header overrun workaround
      IB/ipath: Use counters in ipath_poll and cleanup interrupts in ipath_close
      IB/ipath: Remove duplicate copy of LMC
      IB/ipath: Add ability to set the LMC via the sysfs debugging interface
      IB/ipath: Optimize completion queue entry insertion and polling
      IB/ipath: Implement IB_EVENT_QP_LAST_WQE_REACHED
      IB/ipath: Generate flush CQE when QP is in error state
      IB/ipath: Remove redundant code
      IB/ipath: Future proof eeprom checksum code (contents reading)
      IB/ipath: UC RDMA WRITE with IMMEDIATE doesn't send the immediate
      ...
  27. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    Linus Torvalds committed Oct 11, 2007
    …t/davem/net-2.6
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
      [SKY2]: status polling loop (post merge)
      [NET]: Fix NAPI completion handling in some drivers.
      [TCP]: Limit processing lost_retrans loop to work-to-do cases
      [TCP]: Fix lost_retrans loop vs fastpath problems
      [TCP]: No need to re-count fackets_out/sacked_out at RTO
      [TCP]: Extract tcp_match_queue_to_sack from sacktag code
      [TCP]: Kill almost unused variable pcount from sacktag
      [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
      [TCP]: Add bytes_acked (ABC) clearing to FRTO too
      [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
      [NETFILTER]: x_tables: add missing ip6t_modulename aliases
      [NETFILTER]: nf_conntrack_tcp: fix connection reopening
      [QETH]: fix qeth_main.c
      [NETLINK]: fib_frontend build fixes
      [IPv6]: Export userland ND options through netlink (RDNSS support)
      [9P]: build fix with !CONFIG_SYSCTL
      [NET]: Fix dev_put() and dev_hold() comments
      [NET]: make netlink user -> kernel interface synchronious
      [NET]: unify netlink kernel socket recognition
      [NET]: cleanup 3rd argument in netlink_sendskb
      ...
    
    Fix up conflicts manually in Documentation/feature-removal-schedule.txt
    and my new least favourite crap, the "mod_devicetable" support in the
    files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.
    
    (The latter files seem to be explicitly _designed_ to get conflicts when
    different subsystems work with them - that have an absolutely horrid
    lack of subsystem separation!)
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  28. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    Linus Torvalds committed Oct 11, 2007
    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
      [MIPS] tlbex.c: Cleanup __init usage.
      [MIPS] WRPPMC serial support move to platform device
      [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
      [MIPS] VPE: reimplement ELF loader.
      [MIPS] cleanup WRPPMC include files
      [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
      [MIPS] SMP: Use ISO C struct initializer for local structs.
      [MIPS] SMP: Kill useless casts.
      [MIPS] Kill num_online_cpus() loops.
      [MIPS] SMP: Implement smp_call_function_mask().
      [MIPS] Make facility to convert CPU types to strings generally available.
      [MIPS] Convert list of CPU types from #define to enum.
      [MIPS] Optimize get_unaligned / put_unaligned implementations.
      [MIPS] checkfiles: Fix "need space after that ','" errors.
      [MIPS] Fix "no space between function name and open parenthesis" warnings.
      [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
      [MIPS] tlbex: Size optimize code by declaring a few functions inline.
      [MIPS] pg-r4k.c: Dump the generated code
      [MIPS] Cobalt: Remove cobalt_machine_power_off()
      [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
      ...
  29. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    Linus Torvalds committed Oct 11, 2007
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (24 commits)
      ide: use only ->set_pio_mode method for programming PIO modes (take 2)
      sis5513: don't change UDMA settings when programming PIO
      it8213/piix/slc90e66: don't change DMA settings when programming PIO
      alim15x3: PIO mode setup fixes
      siimage: fix ->set_pio_mode method to select PIO data transfer
      cs5520: don't enable VDMA in ->speedproc
      sc1200: remove redundant warning message from sc1200_tune_chipset()
      ide-pmac: PIO mode setup fixes (take 3)
      icside: fix ->speedproc to return on unsupported modes (take 5)
      sgiioc4: use ide_tune_dma()
      amd74xx/via82cxxx: use ide_tune_dma()
      ide: add ide_set{_max}_pio() (take 4)
      ide: Kconfig face-lift
      ide: move ide_rate_filter() calls to the upper layer (take 2)
      sis5513: add ->udma_filter method for chipset_family >= ATA_133
      ide: mode limiting fixes for user requested speed changes
      ide: add missing ide_rate_filter() calls to ->speedproc()-s
      ide: call udma_filter() before resorting to the UltraDMA mask
      ide: make jmicron match vendor and device class
      pdc202xx_new: switch to using pci_get_slot() (take 2)
      ...
  30. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

    Linus Torvalds committed Oct 11, 2007
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
      leds: Update Cobalt Qube series front LED support
      leds: Add Cobalt Raq series LEDs support
      leds: Rename leds-cobalt driver
  31. Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

    Linus Torvalds committed Oct 11, 2007
    * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
      backlight: Convert corgi backlight driver into a more generic driver
      backlight: Add Samsung LTV350QV LCD driver
      backlight: Fix cr_bllcd allocations and error paths
      backlight/leds: Make two structs static
  32. Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds committed Oct 11, 2007
    …/git/jgarzik/misc-2.6
    
    * 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
      drivers/firmware: const-ify DMI API and internals
  33. Merge branch 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6…

    Linus Torvalds committed Oct 11, 2007
    …-block
    
    * 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block: (37 commits)
      [BLOCK] Fix failing compile with BLK_DEV_IO_TRACE=n
      compat_ioctl: move floppy handlers to block/compat_ioctl.c
      compat_ioctl: move cdrom handlers to block/compat_ioctl.c
      compat_ioctl: move BLKPG handling to block/compat_ioctl.c
      compat_ioctl: move hdio calls to block/compat_ioctl.c
      compat_ioctl: handle blk_trace ioctls
      compat_ioctl: add compat_blkdev_driver_ioctl()
      compat_ioctl: move common block ioctls to compat_blkdev_ioctl
      Sysace: Don't enable IRQ until after interrupt handler is registered
      Sysace: sparse fixes
      Sysace: Minor coding convention fixup
      drivers/block/umem: use DRIVER_NAME where appropriate
      drivers/block/umem: trim trailing whitespace
      drivers/block/umem: minor cleanups
      drivers/block/umem: use dev_printk()
      drivers/block/umem: move private include away from include/linux
      Sysace: Labels in C code should not be indented.
      Sysace: Add of_platform_bus binding
      Sysace: Move IRQ handler registration to occur after FSM is initialized
      Sysace: minor rework and cleanup changes
      ...
  34. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds committed Oct 11, 2007
    …/git/hskinnemoen/avr32-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
      [AVR32] Fix random segfault with preemption
      [AVR32] Don't use __builtin_xchg()
      [AVR32] ngw100 i2c-gpio tweaks
      [AVR32] Ignore a few irrelevant syscalls
      [AVR32] SMC configuration in clock cycles
      [AVR32] Drop support for redundant "keepinitrd" boot-time parm.
      [AVR32] Make dma_sync_*_for_cpu no-ops
      [AVR32] Remove unneeded 8K alignment of .text section
      [AVR32] Kill a few hardcoded constants in vmlinux.lds
      [AVR32] rename vmlinux.lds
      [AVR32] fix command line parsing in early_parse_fbmem
      [AVR32] checkstack support
      [AVR32] Wire up USBA device
      [AVR32] add multidrive support for pio driver
      [AVR32] /sys/kernel/debug/at32ap_clk
      [AVR32] Move AT32_PM_BASE definition into pm.h
  35. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    Linus Torvalds committed Oct 11, 2007
    …/git/cooloney/blackfin-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (74 commits)
      Blackfin serial driver: pending a unique anomaly id, tie the break flood issue to ANOMALY_05000230
      blackfin enable arbitary speed serial setting
      Blackfin arch: Remove cruft - CONFIG_DEBUG_SERIAL_EARLY_INIT and DEBUG_KERNEL_START
      Blackfin arch: fix typo in register name
      Blackfin arch: trim the Blackfin arch MAINTAINERS list
      Blackfin arch: fix bug libstdc++ calling writev with an iovec containing { NULL, 0 } fails on Blackfin
      Blackfin arch: Export strcpy - occasionally get module link failures otherwise
      Blackfin arch: the load address is not safe to point to as a workaround for ANOMALY 05000281
      Blackfin arch: show_mem can not be marked as init, since it is called during OOM condition
      Blackfin arch: flush/inv the correct range when using write back cache and fix bugs find by dmacopy
      Blackfin arch: update kgdb patch
      Blackfin arch: Comply with revised Anomaly Workarounds for BF533 05000311 and BF561 05000323
      Blackfin arch: Print out debug info, as early as possible
      Blackfin arch: Enable earlyprintk earlier - so any error after our interrupt tables are set up will print out
      Blackfin arch: fix endless loop bug when a double fault happens
      Blackfin arch: Initial patch to add earlyprintk support
      Blackfin arch: add TWIx_REGBASE and SPIx_REGBASE to specific CPU header files, use the new REGBASE for board platform resources
      Blackfin arch: modify the insX/outsX and dma_insX/dma_outsX to be compatible with other archs
      Blackfin arch: add more common defines for output sections
      Blackfin arch: cleanup IO and DMA_IO API function definitions according to other arches
      ...
Something went wrong with that request. Please try again.