16 Jul, 2008

21 commits


15 Jul, 2008

19 commits

  • Commit 70f1bba4 ("x86: use ignore macro instead of hash comment") breaks
    the 64-bit x86 build on toolchains that have CONFIG_AS_CFI undefined with:

    arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined

    because now uses the ignore macro name itself. Fix this
    by changing to __cfi_ignore in dwarf2.h.

    Signed-off-by: Roland Dreier
    Signed-off-by: Linus Torvalds

    Roland Dreier
     
  • We're not updating the tg3 driver to use request_firmware() yet, but a
    reference to its firmware accidentally slipped in as part of commit
    c4667746 ("dabusb: use request_firmware()"). Remove it again.

    Signed-off-by: David Woodhouse
    Reported-by: Yinghai Lu
    Signed-off-by: Linus Torvalds

    David Woodhouse
     
  • 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