Eric Lee / smarc-ti-linux-kernel

14 Oct, 2008

8 commits

  • 7591103c0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (66 commits)
    ata: Add documentation for hard disk shock protection interface (v3)
    ide: Implement disk shock protection support (v4)
    ide-cd: fix printk format warning
    piix: add Hercules EC-900 mini-notebook to ich_laptop short cable list
    ide-atapi: assign taskfile flags per device type
    ide-cd: move cdrom_info.dma to ide_drive_t.dma
    ide: add ide_drive_t.dma flag
    ide-cd: add a debug_mask module parameter
    ide-cd: convert driver to new ide debugging macro (v3)
    ide: move SFF DMA code to ide-dma-sff.c
    ide: cleanup ide-dma.c
    ide: cleanup ide_build_dmatable()
    ide: remove needless includes from ide-dma.c
    ide: switch to DMA-mapping API part #2
    ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
    ide: make ide_dma_lost_irq() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
    ide: __ide_dma_end() -> ide_dma_end()
    pmac: remove needless pmac_ide_destroy_dmatable() wrapper
    pmac: remove superfluous pmif == NULL checks
    ide: Two fixes regarding memory allocation
    ...

    Linus Torvalds
     
  • 2be4ff2f0   Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
    pcmcia: ioctl-internal definitions
    pcmcia: cistpl header cleanup
    pcmcia: remove unused argument to pcmcia_parse_tuple()
    pcmcia: card services header cleanup
    pcmcia: device_id header cleanup
    pcmcia: encapsulate ioaddr_t
    pcmcia: cleanup device driver header file
    pcmcia: cleanup socket services header file
    pcmcia: merge ds_internal.h into cs_internal.h
    pcmcia: cleanup cs_internal.h
    pcmcia: cs_internal.h is internal
    pcmcia: use dev_printk for cs_error()
    pcmcia: remove CS_ error codes alltogether
    pcmcia: deprecate CS_BAD_TUPLE
    pcmcia: deprecate CS_BAD_ARGS
    pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
    pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
    pcmcia: deprecate CS_NO_MORE_ITEMS
    pcmcia: deprecate CS_IN_USE
    pcmcia: deprecate CS_CONFIGURATION_LOCKED
    ...

    Fix trivial conflict in drivers/pcmcia/ds.c manually

    Linus Torvalds
     
  • cf2fa6605   Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... Browse Code »

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits)
    V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards
    V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default
    V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default.
    V4L/DVB (9183): S2API: Return error of the caller provides 0 commands.
    V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY
    V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE
    V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP
    V4L/DVB (9179): S2API: frontend.h cleanup
    V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO.
    V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
    V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator.
    V4L/DVB (9175): Remove NULL pointer in stb6000 driver.
    V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator.
    V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
    V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API.
    V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API.
    V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod.
    V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams.
    V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote
    V4L/DVB: v4l2-dev: remove duplicated #include
    ...

    Linus Torvalds
     
  • 9c6102d44   ata: Add documentation for hard disk shock protection interface (v3) ... Browse Code »

    Put some information (and pointers to more) into the kernel's doc tree,
    describing briefly the interface to the kernel's disk head unloading
    facility. Information about how to set up a complete shock protection
    system under GNU/Linux can be found on the web and is referenced
    accordingly.

    v3:
    Here is some final polish including various spelling corrections
    pointed out by Grant Grundler and Peter Moulder. Also, I have added some
    information about the timing constraints related to disk head parking.
    The patch looks more impressive than it really is and I think it would
    be alright just to incorporate it into the original patch so as not to
    clutter up the git log.

    Signed-off-by: Elias Oltmanns
    Cc: Jeff Garzik
    Cc: Randy Dunlap
    Cc: Tejun Heo
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Elias Oltmanns
     
  • 54cebc68c   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (60 commits)
    Blackfin arch: make sure we include the fix for SPORT hysteresis when reprogramming clocks
    Blackfin arch: Fix bogus str_ident check in gpio code
    Blackfin arch: AD7879 Touchscreen driver
    Blackfin arch: introducing bfin_addr_dcachable
    Blackfin arch: fix a typo in comments
    Blackfin arch: Remove useless head file
    Blackfin arch: make sure L2 start and length are always defined (fixes building on BF542)
    Blackfin arch: use the Blackfin on-chip ROM to do software reset when possible
    Blackfin arch: update anomaly headers to match the latest sheet
    Blackfin arch: bfin_reset() is an internal reboot function ... everyone should go through machine_restart()
    Blackfin arch: print out error/warning if you are running on the incorrect CPU type
    Blackfin arch: remove non-bf54x ifdef logic since this file is only compiled on bf54x parts
    Blackfin arch: update board defconfigs
    Blackfin arch: Add optional verbose debug
    Blackfin arch: emulate a TTY over the EMUDAT/JTAG interface
    Blackfin arch: have is_user_addr_valid() check for overflows (like when address is -1)
    Blackfin arch: ptrace - fix off-by-one check on end of memory regions
    Blackfin arch: Enable framebuffer support for the BF526-EZkit TFT LCD display
    Blackfin arch: flash memory map and dm9000 resources updating
    Blackfin arch: early prink code still use uart core console functions to parse and set configure option string
    ...

    Linus Torvalds
     
  • 20272c899   Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc ... Browse Code »

    * 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
    proc: remove kernel.maps_protect
    proc: remove now unneeded ADDBUF macro
    [PATCH] proc: show personality via /proc/pid/personality
    [PATCH] signal, procfs: some lock_task_sighand() users do not need rcu_read_lock()
    proc: move PROC_PAGE_MONITOR to fs/proc/Kconfig
    proc: make grab_header() static
    proc: remove unused get_dma_list()
    proc: remove dummy vmcore_open()
    proc: proc_sys_root tweak
    proc: fix return value of proc_reg_open() in "too late" case

    Fixed up trivial conflict in removed file arch/sparc/include/asm/dma_32.h

    Linus Torvalds
     
  • e7f2f9918   Merge phase #5 (misc) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Browse Code »

    Merges oprofile, timers/hpet, x86/traps, x86/time, and x86/core misc items.

    * 'x86-core-v4-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (132 commits)
    x86: change early_ioremap to use slots instead of nesting
    x86: adjust dependencies for CONFIG_X86_CMOV
    dumpstack: x86: various small unification steps, fix
    x86: remove additional_cpus
    x86: remove additional_cpus configurability
    x86: improve UP kernel when CPU-hotplug and SMP is enabled
    dumpstack: x86: various small unification steps
    dumpstack: i386: make kstack= an early boot-param and add oops=panic
    dumpstack: x86: use log_lvl and unify trace formatting
    dumptrace: x86: consistently include loglevel, print stack switch
    dumpstack: x86: add "end" parameter to valid_stack_ptr and print_context_stack
    dumpstack: x86: make printk_address equal
    dumpstack: x86: move die_nmi to dumpstack_32.c
    traps: x86: finalize unification of traps.c
    traps: x86: make traps_32.c and traps_64.c equal
    traps: x86: various noop-changes preparing for unification of traps_xx.c
    traps: x86_64: use task_pid_nr(tsk) instead of tsk->pid in do_general_protection
    traps: i386: expand clear_mem_error and remove from mach_traps.h
    traps: x86_64: make io_check_error equal to the one on i386
    traps: i386: use preempt_conditional_sti/cli in do_int3
    ...

    Linus Torvalds
     
  • 02f11f392   coldfire: scheduled SERIAL_COLDFIRE removal ... Browse Code »

    This patch contains the scheduled removal of the obsolete
    SERIAL_COLDFIRE driver.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Adrian Bunk
     

13 Oct, 2008

5 commits

  • 57f51dbc4   V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards ... Browse Code »

    Added support for Prof 7300 DVB-S/S2 card. The card
    based on cx24116 demodulator.

    Signed-off-by: Oleg Roitburd
    Signed-off-by: Steven Toth
    [mchehab@redhat.com: fixed CARDLIST.cx88 entry]
    Signed-off-by: Mauro Carvalho Chehab

    Oleg Roitburd
     
  • c00193f9f   Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4 Browse Code »
    Ingo Molnar
     
  • 3280fb313   Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 ... Browse Code »

    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
    ext4: fix kconfig typo and extra whitespace
    ext4: fix build failure without procfs
    ext4: add an option to control error handling on file data
    jbd2: don't dirty original metadata buffer on abort
    ext4: add checks for errors from jbd2
    jbd2: fix error handling for checkpoint io
    jbd2: abort when failed to log metadata buffers

    Linus Torvalds
     
  • 807f4f8cd   Merge branch 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kerne… ... Browse Code »

    …l/git/tip/linux-2.6-tip

    This merges in:

    x86/build, x86/microcode, x86/spinlocks, x86/memory-corruption-check,
    x86/early-printk, x86/xsave, x86/quirks, x86/setup, x86/signal,
    core/signal, x86/urgent, x86/xen

    * 'x86-core-v2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (142 commits)
    x86: make processor type select depend on CONFIG_EMBEDDED
    x86: extend processor type select help text
    x86, amd-iommu: propagate PCI device enabling error
    warnings: fix arch/x86/kernel/io_apic_64.c
    warnings: fix arch/x86/kernel/early_printk.c
    x86, fpu: check __clear_user() return value
    x86: memory corruption check - cleanup
    x86: ioperm user_regset
    xen: do not reserve 2 pages of padding between hypervisor and fixmap.
    xen: use spin_lock_nest_lock when pinning a pagetable
    x86: xsave: set FP, SSE bits in the xsave header in the user sigcontext
    x86: xsave: fix error condition in save_i387_xstate()
    x86: SB450: deprioritize DMI quirks
    x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC
    x86: replace a magic number with a named constant in the VESA boot code
    x86 setup: remove IMAGE_OFFSET
    x86 setup: remove DEF_INITSEG and DEF_SETUPSEG
    Revert "x86: fix ghost EDD devices in /sys again"
    x86 setup: fix ghost entries under /sys/firmware/edd take 3
    x86: signal: remove indent in restore_sigcontext()
    ...

    Linus Torvalds
     
  • 071048395   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (180 commits)
    leo: disable cursor when leaving graphics mode
    cg6: disable cursor when leaving graphics mode
    sparc32: sun4m interrupt mask cleanup
    drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32
    sparc: arch/sparc/kernel/pmc.c -- extra #include?
    sparc32: Add more extensive documentation of sun4m interrupts.
    sparc32: Kill irq_rcvreg from sun4m_irq.c
    sparc32: Delete master_l10_limit.
    sparc32: Use PROM device probing for sun4c timers.
    sparc32: Use PROM device probing for sun4c interrupt register.
    sparc32: Delete claim_ticker14().
    sparc32: Stop calling claim_ticker14() from sun4c_irq.c
    sparc32: Kill clear_profile_irq btfixup entry.
    sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c
    sparc32: Remove #if 0'd code from sun4c_irq.c
    sparc32: Remove some SMP ifdefs in sun4d_irq.c
    sparc32: Use PROM infrastructure for probing and mapping sun4d timers.
    sparc32: Use PROM device probing for sun4m irq registers.
    sparc32: Use PROM device probing for sun4m timer registers.
    sparc: Fix user_regset 'n' field values.
    ...

    Linus Torvalds
     

12 Oct, 2008

27 commits