15 Jul, 2008

40 commits

  • Remove subversion $Id lines and improve readability by fixing other
    coding style problems pointed out by checkpatch.pl.

    Signed-off-by: Dotan Barak
    Signed-off-by: Roland Dreier

    Dotan Barak
     
  • Signed-off-by: Robert P. J. Day
    Signed-off-by: Roland Dreier

    Robert P. J. Day
     
  • The idea is that for QPs with fixed size work requests (eg selective
    signaling QPs), before stamping the WQE, we read the value of the DS
    field, which gives the effective size of the descriptor as used in the
    previous post. Then we stamp only that area, since the rest of the
    descriptor is already stamped.

    When initializing the send queue buffer, make sure the DS field is
    initialized to the max descriptor size so that the subsequent stamping
    will be done on the entire descriptor area.

    Signed-off-by: Eli Cohen
    Signed-off-by: Roland Dreier

    Eli Cohen
     
  • This patch solves a race that occurs after an event occurs that causes
    the SA query module to flush its SM address handle (AH). When SM AH
    becomes invalid and needs an update it is handled by the global
    workqueue. On the other hand this event is also handled in the IPoIB
    driver by queuing work in the ipoib_workqueue that does multicast
    joins. Although queuing is in the right order, it is done to 2
    different workqueues and so there is no guarantee that the first to be
    queued is the first to be executed.

    This causes a problem because IPoIB may end up sending an request to
    the old SM, which will take a long time to time out (since the old SM
    is gone); this leads to a much longer than necessary interruption in
    multicast traffer.

    The patch sets the SA query module's SM AH to NULL when the event
    occurs, and until update_sm_ah() is done, any request that needs sm_ah
    fails with -EAGAIN return status.

    For consumers, the patch doesn't make things worse. Before the patch,
    MADs are sent to the wrong SM so the request gets lost. Consumers can
    be improved if they examine the return code and respond to EAGAIN
    properly but even without an improvement the situation is not getting
    worse.

    Signed-off-by: Moni Levy
    Signed-off-by: Moni Shoua
    Signed-off-by: Roland Dreier

    Moni Shoua
     
  • The license text for several files references a third software license
    that was inadvertently copied in. Update the license to what was
    intended. This update was based on a request from HP.

    Signed-off-by: Sean Hefty
    Signed-off-by: Roland Dreier

    Sean Hefty
     
  • Remove an explicit memset(..., 0, ...) of a 'listener' structure
    allocated with kzalloc().

    Signed-off-by: Christophe Jaillet
    Acked-by: Faisal Latif
    Signed-off-by: Roland Dreier

    Christophe Jaillet
     
  • The SRP initiator is currently using ib_find_cached_pkey() and
    ib_get_cached_gid() in situations where the uncached ib_find_pkey()
    and ib_query_gid() functions serve just as well: sleeping is allowed
    and performance is not an issue. Since we want to eliminate the
    cached operations in the long term, convert SRP to use the uncached
    variants.

    Signed-off-by: Roland Dreier

    Roland Dreier
     
  • When CONFIG_EXTRA_FIRMWARE_DIR gets changed, the filename in the .S file
    (which uses .incbin to include the binary) needs to change. When we
    renamed the BUILTIN_FIRMWARE_DIR option to EXTRA_FIRMWARE_DIR, we forgot
    to update the manual dependency in firmware/Makefile, so it was
    depending on a non-existent file in include/config/

    Signed-off-by: David Woodhouse
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • * 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
    firmware: convert sb16_csp driver to use firmware loader exclusively
    dsp56k: use request_firmware
    edgeport-ti: use request_firmware()
    edgeport: use request_firmware()
    vicam: use request_firmware()
    dabusb: use request_firmware()
    cpia2: use request_firmware()
    ip2: use request_firmware()
    firmware: convert Ambassador ATM driver to request_firmware()
    whiteheat: use request_firmware()
    ti_usb_3410_5052: use request_firmware()
    emi62: use request_firmware()
    emi26: use request_firmware()
    keyspan_pda: use request_firmware()
    keyspan: use request_firmware()
    ttusb-budget: use request_firmware()
    kaweth: use request_firmware()
    smctr: use request_firmware()
    firmware: convert ymfpci driver to use firmware loader exclusively
    firmware: convert maestro3 driver to use firmware loader exclusively
    ...

    Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
    drivers/char/ip2/ip2main.c manually.

    Linus Torvalds
     
  • * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (241 commits)
    [ARM] 5171/1: ep93xx: fix compilation of modules using clocks
    [ARM] 5133/2: at91sam9g20 defconfig file
    [ARM] 5130/4: Support for the at91sam9g20
    [ARM] 5160/1: IOP3XX: gpio/gpiolib support
    [ARM] at91: Fix NAND FLASH timings for at91sam9x evaluation kits.
    [ARM] 5084/1: zylonite: Register AC97 device
    [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration model
    [ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers
    [ARM] 5147/1: pxaficp_ir: drop pxa_gpio_mode calls, as pin setting
    [ARM] 5145/1: PXA2xx: provide api to control IrDA pins state
    [ARM] 5144/1: pxaficp_ir: cleanup includes
    [ARM] pxa: remove pxa_set_cken()
    [ARM] pxa: allow clk aliases
    [ARM] Feroceon: don't disable BPU on boot
    [ARM] Orion: LED support for HP mv2120
    [ARM] Orion: add RD88F5181L-FXO support
    [ARM] Orion: add RD88F5181L-GE support
    [ARM] Orion: add Netgear WNR854T support
    [ARM] s3c2410_defconfig: update for current build
    [ARM] Acer n30: Minor style and indentation fixes.
    ...

    Linus Torvalds
     
  • Conflicts:

    sound/pci/Kconfig

    David Woodhouse
     
  • This includes PXA work up to the SPI changes for the initial merge,
    since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
    tree being merged.

    Conflicts:

    arch/arm/configs/em_x270_defconfig
    arch/arm/configs/xm_x270_defconfig

    Russell King
     
  • * 'core/softirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    softirq: remove irqs_disabled warning from local_bh_enable
    softirq: remove initialization of static per-cpu variable
    Remove argument from open_softirq which is always NULL

    Linus Torvalds
     
  • * 'core/rodata' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    move BUG_TABLE into RODATA

    Linus Torvalds
     
  • * 'core/printk' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, generic: mark early_printk as asmlinkage
    printk: export console_drivers
    printk: remember the message level for multi-line output
    printk: refactor processing of line severity tokens
    printk: don't prefer unsuited consoles on registration
    printk: clean up recursion check related static variables
    namespacecheck: more kernel/printk.c fixes
    namespacecheck: fix kernel printk.c

    Linus Torvalds
     
  • Even the help-text makes it clear that normal people shouldn't enable
    it.

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'core/locking' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    lockdep: fix kernel/fork.c warning
    lockdep: fix ftrace irq tracing false positive
    lockdep: remove duplicate definition of STATIC_LOCKDEP_MAP_INIT
    lockdep: add lock_class information to lock_chain and output it
    lockdep: add lock_class information to lock_chain and output it
    lockdep: output lock_class key instead of address for forward dependency output
    __mutex_lock_common: use signal_pending_state()
    mutex-debug: check mutex magic before owner

    Fixed up conflict in kernel/fork.c manually

    Linus Torvalds
     
  • …linux/kernel/git/tip/linux-2.6-tip

    * 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    sched: add new API sched_setscheduler_nocheck: add a flag to control access checks

    Linus Torvalds
     
  • * 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (228 commits)
    ftrace: build fix for ftraced_suspend
    ftrace: separate out the function enabled variable
    ftrace: add ftrace_kill_atomic
    ftrace: use current CPU for function startup
    ftrace: start wakeup tracing after setting function tracer
    ftrace: check proper config for preempt type
    ftrace: trace schedule
    ftrace: define function trace nop
    ftrace: move sched_switch enable after markers
    ftrace: prevent ftrace modifications while being kprobe'd, v2
    fix "ftrace: store mcount address in rec->ip"
    mmiotrace broken in linux-next (8-bit writes only)
    ftrace: avoid modifying kprobe'd records
    ftrace: freeze kprobe'd records
    kprobes: enable clean usage of get_kprobe
    ftrace: store mcount address in rec->ip
    ftrace: build fix with gcc 4.3
    namespacecheck: fixes
    ftrace: fix "notrace" filtering priority
    ftrace: fix printout
    ...

    Linus Torvalds
     
  • * 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
    IB/umad: BKL is not needed for ib_umad_open()
    IB/uverbs: BKL is not needed for ib_uverbs_open()
    bf561-coreb: BKL unneeded for open()
    Call fasync() functions without the BKL
    snd/PCM: fasync BKL pushdown
    ipmi: fasync BKL pushdown
    ecryptfs: fasync BKL pushdown
    Bluetooth VHCI: fasync BKL pushdown
    tty_io: fasync BKL pushdown
    tun: fasync BKL pushdown
    i2o: fasync BKL pushdown
    mpt: fasync BKL pushdown
    Remove BKL from remote_llseek v2
    Make FAT users happier by not deadlocking
    x86-mce: BKL pushdown
    vmwatchdog: BKL pushdown
    vmcp: BKL pushdown
    via-pmu: BKL pushdown
    uml-random: BKL pushdown
    uml-mmapper: BKL pushdown
    ...

    Linus Torvalds
     
  • Signed-off-by: Jaswinder Singh
    Signed-off-by: David Woodhouse

    Jaswinder Singh
     
  • Signed-off-by: Jaswinder Singh
    Signed-off-by: David Woodhouse

    Jaswinder Singh
     
  • Firmware blob looks like this...
    uint8_t MajorVersion
    uint8_t MinorVersion
    __le16 BuildNumber
    uint8_t data[]

    Signed-off-by: Jaswinder Singh
    Signed-off-by: David Woodhouse

    Jaswinder Singh
     
  • Version number provided in first HEX record.

    Signed-off-by: Jaswinder Singh
    Signed-off-by: David Woodhouse

    Jaswinder Singh
     
  • Although it wasn't actually using ihex records before, we use the Intel
    HEX record format for this firmware -- because that gives us a simple
    way to split it into separate chunks internally as we need, without
    loading each part as a separate file.

    Signed-off-by: Jaswinder Singh
    Signed-off-by: David Woodhouse

    Jaswinder Singh
     
  • Signed-off-by: David Woodhouse

    David Woodhouse
     
  • Thanks for Jaswinder Singh for converting the firmware blob itself to ihex.

    Signed-off-by: David Woodhouse

    David Woodhouse
     
  • Jonathan Corbet
     
  • The following updates were recommended by Elias Oltmanns and Randy Dunlap.

    [ updates based on Andrew Morton's comments are still to come. ]

    Signed-off-by: Steven Rostedt
    Signed-off-by: Linus Torvalds

    Steven Rostedt
     
  • * 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (76 commits)
    sched_clock: and multiplier for TSC to gtod drift
    sched_clock: record TSC after gtod
    sched_clock: only update deltas with local reads.
    sched_clock: fix calculation of other CPU
    sched_clock: stop maximum check on NO HZ
    sched_clock: widen the max and min time
    sched_clock: record from last tick
    sched: fix accounting in task delay accounting & migration
    sched: add avg-overlap support to RT tasks
    sched: terminate newidle balancing once at least one task has moved over
    sched: fix warning
    sched: build fix
    sched: sched_clock_cpu() based cpu_clock(), lockdep fix
    sched: export cpu_clock
    sched: make sched_{rt,fair}.c ifdefs more readable
    sched: bias effective_load() error towards failing wake_affine().
    sched: incremental effective_load()
    sched: correct wakeup weight calculations
    sched: fix mult overflow
    sched: update shares on wakeup
    ...

    Linus Torvalds
     
  • * 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (821 commits)
    x86: make 64bit hpet_set_mapping to use ioremap too, v2
    x86: get x86_phys_bits early
    x86: max_low_pfn_mapped fix #4
    x86: change _node_to_cpumask_ptr to return const ptr
    x86: I/O APIC: remove an IRQ2-mask hack
    x86: fix numaq_tsc_disable calling
    x86, e820: remove end_user_pfn
    x86: max_low_pfn_mapped fix, #3
    x86: max_low_pfn_mapped fix, #2
    x86: max_low_pfn_mapped fix, #1
    x86_64: fix delayed signals
    x86: remove conflicting nx6325 and nx6125 quirks
    x86: Recover timer_ack lost in the merge of the NMI watchdog
    x86: I/O APIC: Never configure IRQ2
    x86: L-APIC: Always fully configure IRQ0
    x86: L-APIC: Set IRQ0 as edge-triggered
    x86: merge dwarf2 headers
    x86: use AS_CFI instead of UNWIND_INFO
    x86: use ignore macro instead of hash comment
    x86: use matching CFI_ENDPROC
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (50 commits)
    crypto: ixp4xx - Select CRYPTO_AUTHENC
    crypto: s390 - Respect STFL bit
    crypto: talitos - Add support for sha256 and md5 variants
    crypto: hash - Move ahash functions into crypto/hash.h
    crypto: crc32c - Add ahash implementation
    crypto: hash - Added scatter list walking helper
    crypto: prng - Deterministic CPRNG
    crypto: hash - Removed vestigial ahash fields
    crypto: hash - Fixed digest size check
    crypto: rmd - sparse annotations
    crypto: rmd128 - sparse annotations
    crypto: camellia - Use kernel-provided bitops, unaligned access helpers
    crypto: talitos - Use proper form for algorithm driver names
    crypto: talitos - Add support for 3des
    crypto: padlock - Make module loading quieter when hardware isn't available
    crypto: tcrpyt - Remove unnecessary kmap/kunmap calls
    crypto: ixp4xx - Hardware crypto support for IXP4xx CPUs
    crypto: talitos - Freescale integrated security engine (SEC) driver
    [CRYPTO] tcrypt: Add self test for des3_ebe cipher operating in cbc mode
    [CRYPTO] rmd: Use pointer form of endian swapping operations
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: (31 commits)
    avr32: Fix typo of IFSR in a comment in the PIO header file
    avr32: Power Management support ("standby" and "mem" modes)
    avr32: Add system device for the internal interrupt controller (intc)
    avr32: Add simple SRAM allocator
    avr32: Enable SDRAMC clock at startup
    rtc-at32ap700x: Enable wakeup
    macb: Basic suspend/resume support
    atmel_serial: Drain console TX shifter before suspending
    atmel_serial: Fix build on avr32 with CONFIG_PM enabled
    avr32: Use a quicklist for PTE allocation as well
    avr32: Use a quicklist for PGD allocation
    avr32: Cover the kernel page tables in the user PGDs
    avr32: Store virtual addresses in the PGD
    avr32: Remove useless zeroing of swapper_pg_dir at startup
    avr32: Clean up and optimize the TLB operations
    avr32: Rename at32ap.c -> pdc.c
    avr32: Move setup_platform() into chip-specific file
    avr32: Kill special exception handler sections
    avr32: Kill unneeded #include from asm/mmu_context.h
    avr32: Clean up time.c #includes
    ...

    Linus Torvalds
     
  • …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (25 commits)
    security: remove register_security hook
    security: remove dummy module fix
    security: remove dummy module
    security: remove unused sb_get_mnt_opts hook
    LSM/SELinux: show LSM mount options in /proc/mounts
    SELinux: allow fstype unknown to policy to use xattrs if present
    security: fix return of void-valued expressions
    SELinux: use do_each_thread as a proper do/while block
    SELinux: remove unused and shadowed addrlen variable
    SELinux: more user friendly unknown handling printk
    selinux: change handling of invalid classes (Was: Re: 2.6.26-rc5-mm1 selinux whine)
    SELinux: drop load_mutex in security_load_policy
    SELinux: fix off by 1 reference of class_to_string in context_struct_compute_av
    SELinux: open code sidtab lock
    SELinux: open code load_mutex
    SELinux: open code policy_rwlock
    selinux: fix endianness bug in network node address handling
    selinux: simplify ioctl checking
    SELinux: enable processes with mac_admin to get the raw inode contexts
    Security: split proc ptrace checking into read vs. attach
    ...

    Linus Torvalds
     
  • * 'drm-reorg' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
    drm: reorganise drm tree to be more future proof.

    Linus Torvalds
     
  • * 'for-linus' of git://git.alsa-project.org/alsa-kernel: (179 commits)
    ALSA: Release v1.0.17
    ALSA: correct kcalloc usage
    ALSA: ALSA driver for SGI O2 audio board
    ALSA: asoc: kbuild - only show menus for the current ASoC CPU platform.
    ALSA: ALSA driver for SGI HAL2 audio device
    ALSA: hda - Fix FSC V5505 model
    ALSA: hda - Fix missing init for unsol events on micsense model
    ALSA: hda - Fix internal mic vref pin setup
    ALSA: hda: 92hd71bxx PC Beep
    ALSA: HDA - HP dc7600 with pci sub IDs 0x103c/0x3011 belongs to hp-3013 model
    ALSA: usb-audio: add some Yamaha USB MIDI quirks
    ALSA: usb-audio: fix Yamaha KX quirk
    ALSA: ASoC: Au12x0/Au1550 PSC Audio support
    ALSA: Add Yamaha KX49 (USB MIDI controller) to usbquirks.h
    ALSA: ASoC: pxa2xx-ac97: fix warning due to missing argument in fuction declaration
    ALSA: tosa: fix compilation with new DAPM API
    ALSA: wavefront - add const
    ALSA: remove CONFIG_KMOD from sound
    ALSA: Fix a const to non-const assignment in the Digigram VXpocket sound driver
    ALSA: Fix a const pointer usage warning in the Digigram VX soundcard driver
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (71 commits)
    [S390] sclp_tty: Fix scheduling while atomic bug.
    [S390] sclp_tty: remove ioctl interface.
    [S390] Remove P390 support.
    [S390] Cleanup vmcp printk messages.
    [S390] Cleanup lcs printk messages.
    [S390] Cleanup kprobes printk messages.
    [S390] Cleanup vmwatch printk messages.
    [S390] Cleanup dcssblk printk messages.
    [S390] Cleanup zfcp dumper printk messages.
    [S390] Cleanup vmlogrdr printk messages.
    [S390] Cleanup s390 debug feature print messages.
    [S390] Cleanup monreader printk messages.
    [S390] Cleanup appldata printk messages.
    [S390] Cleanup smsgiucv printk messages.
    [S390] Cleanup cpacf printk messages.
    [S390] Cleanup qeth print messages.
    [S390] Cleanup netiucv printk messages.
    [S390] Cleanup iucv printk messages.
    [S390] Cleanup sclp printk messages.
    [S390] Cleanup zcrypt printk messages.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (23 commits)
    pcmcia: Fix ide-cs sparse warning
    pcmcia: ide-cs debugging bugfix
    pcmcia: allow for longer CIS firmware files
    pcmcia: cm40x0 cdev lock_kernel() pushdown
    pcmcia: (re)move {pcmcia,pccard}_get_status
    pcmcia: kill IN_CARD_SERVICES
    pcmcia: Remove unused header file code
    pcmcia: remove unused bulkmem.h
    pcmcia: simplify pccard_validate_cis
    pcmcia: carve out ioctl adjust function to pcmcia_ioctl
    pcmcia: irq probe can be done without risking an IRQ storm
    pcmcia: Fix ti12xx_2nd_slot_empty always failing
    pcmcia: check for pointer instead of pointer address
    pcmcia: switch cm4000_cs.c to unlocked_ioctl
    pcmcia: simplify rsrc_nonstatic attributes
    pcmcia: add support CompactFlash PCMCIA support for Blackfin.
    pcmcia: remove version.h
    pcmcia: cs: kill thread_wait
    pcmcia: i82365.c: check request_irq return value
    pcmcia: fix Alchemy warnings
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (37 commits)
    splice: fix generic_file_splice_read() race with page invalidation
    ramfs: enable splice write
    drivers/block/pktcdvd.c: avoid useless memset
    cdrom: revert commit 22a9189 (cdrom: use kmalloced buffers instead of buffers on stack)
    scsi: sr avoids useless buffer allocation
    block: blk_rq_map_kern uses the bounce buffers for stack buffers
    block: add blk_queue_update_dma_pad
    DAC960: push down BKL
    pktcdvd: push BKL down into driver
    paride: push ioctl down into driver
    block: use get_unaligned_* helpers
    block: extend queue_flag bitops
    block: request_module(): use format string
    Add bvec_merge_data to handle stacked devices and ->merge_bvec()
    block: integrity flags can't use bit ops on unsigned short
    cmdfilter: extend default read filter
    sg: fix odd style (extra parenthesis) introduced by cmd filter patch
    block: add bounce support to blk_rq_map_user_iov
    cfq-iosched: get rid of enable_idle being unused warning
    allow userspace to modify scsi command filter on per device basis
    ...

    Linus Torvalds
     
  • This simplifies the code significantly, and was the whole point of the
    exercise.

    Signed-off-by: Linus Torvalds

    Linus Torvalds