1. 18 Sep, 2009 12 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 2511817c
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext3: Flush disk caches on fsync when needed
        ext3: Add locking to ext3_do_update_inode
        ext3: Fix possible deadlock between ext3_truncate() and ext3_get_blocks()
        jbd: Annotate transaction start also for journal_restart()
        jbd: Journal block numbers can ever be only 32-bit use unsigned int for them
        ext3: Update MAINTAINERS for ext3 and JBD
        JBD: round commit timer up to avoid uncommitted transaction
      2511817c
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · 714af069
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
        [CPUFREQ] Fix NULL ptr regression in powernow-k8
        [CPUFREQ] Create a blacklist for processors that should not load the acpi-cpufreq module.
        [CPUFREQ] Powernow-k8: Enable more than 2 low P-states
        [CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)
        [CPUFREQ] ondemand - Use global sysfs dir for tuning settings
        [CPUFREQ] Introduce global, not per core: /sys/devices/system/cpu/cpufreq
        [CPUFREQ] Bail out of cpufreq_add_dev if the link for a managed CPU got created
        [CPUFREQ] Factor out policy setting from cpufreq_add_dev
        [CPUFREQ] Factor out interface creation from cpufreq_add_dev
        [CPUFREQ] Factor out symlink creation from cpufreq_add_dev
        [CPUFREQ] cleanup up -ENOMEM handling in cpufreq_add_dev
        [CPUFREQ] Reduce scope of cpu_sys_dev in cpufreq_add_dev
        [CPUFREQ] update Doc for cpuinfo_cur_freq and scaling_cur_freq
      714af069
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a03fdb76
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (34 commits)
        time: Prevent 32 bit overflow with set_normalized_timespec()
        clocksource: Delay clocksource down rating to late boot
        clocksource: clocksource_select must be called with mutex locked
        clocksource: Resolve cpu hotplug dead lock with TSC unstable, fix crash
        timers: Drop a function prototype
        clocksource: Resolve cpu hotplug dead lock with TSC unstable
        timer.c: Fix S/390 comments
        timekeeping: Fix invalid getboottime() value
        timekeeping: Fix up read_persistent_clock() breakage on sh
        timekeeping: Increase granularity of read_persistent_clock(), build fix
        time: Introduce CLOCK_REALTIME_COARSE
        x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown
        clocksource: Avoid clocksource watchdog circular locking dependency
        clocksource: Protect the watchdog rating changes with clocksource_mutex
        clocksource: Call clocksource_change_rating() outside of watchdog_lock
        timekeeping: Introduce read_boot_clock
        timekeeping: Increase granularity of read_persistent_clock()
        timekeeping: Update clocksource with stop_machine
        timekeeping: Add timekeeper read_clock helper functions
        timekeeping: Move NTP adjusted clock multiplier to struct timekeeper
        ...
      
      Fix trivial conflict due to MIPS lemote -> loongson renaming.
      a03fdb76
    • Linus Torvalds's avatar
      pty_write: don't do a tty_wakeup() when the buffers are full · 202c4675
      Linus Torvalds authored
      Commit ac89a917 ("pty: don't limit the writes to 'pty_space()' inside
      'pty_write()'") removed the pty_space() checking, in order to let the
      regular tty buffer code limit the buffering itself.
      
      That was all good, but as a subtle side effect it meant that we'd be
      doing a tty_wakeup() even in the case where the buffers were all filled
      up, and didn't actually make any progress on the write.
      
      Which sounds innocuous, but it interacts very badly with the ppp_async
      code, which has an infinite loop in ppp_async_push() that tries to push
      out data to the tty.  When we call tty_wakeup(), that loop ends up
      thinking that progress was made (see the subtle interactions between
      XMIT_WAKEUP and 'tty_stuffed' for details).  End result: one unhappy ppp
      user.
      
      Fixed by noticing when tty_insert_flip_string() didn't actually do
      anything, and then not doing any more processing (including, very much
      not calling tty_wakeup()).
      Bisected-and-tested-by: default avatarPeter Volkov <pva@gentoo.org>
      Cc: stable@kernel.org (2.6.31)
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      202c4675
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · df58bee2
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
        x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
        x86, mce: CE in last bank prevents panic by unknown MCE
        x86, mce: Fake panic support for MCE testing
        x86, mce: Move debugfs mce dir creating to mce.c
        x86, mce: Support specifying raise mode for software MCE injection
        x86, mce: Support specifying context for software mce injection
        x86, mce: fix reporting of Thermal Monitoring mechanism enabled
        x86, mce: remove never executed code
        x86, mce: add missing __cpuinit tags
        x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
        x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
        x86: mce: Lower maximum number of banks to architecture limit
        x86: mce: macros to compute banks MSRs
        x86: mce: Move per bank data in a single datastructure
        x86: mce: Move code in mce.c
        x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
        x86: mce: Remove old i386 machine check code
        x86: mce: Update X86_MCE description in x86/Kconfig
        x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE
        x86, mce: use atomic_inc_return() instead of add by 1
        ...
      
      Manually fixed up trivial conflicts:
      	Documentation/feature-removal-schedule.txt
      	arch/x86/kernel/cpu/mcheck/mce.c
      df58bee2
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · dcbf77b9
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
        sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
        sched: Stop buddies from hogging the system
        sched: Add new wakeup preemption mode: WAKEUP_RUNNING
        sched: Fix TASK_WAKING & loadaverage breakage
        sched: Disable wakeup balancing
        sched: Rename flags to wake_flags
        sched: Clean up the load_idx selection in select_task_rq_fair
        sched: Optimize cgroup vs wakeup a bit
        sched: x86: Name old_perf in a unique way
        sched: Implement a gentler fair-sleepers feature
        sched: Add SD_PREFER_LOCAL
        sched: Add a few SYNC hint knobs to play with
        sched: Fix sync wakeups again
        sched: Add WF_FORK
        sched: Rename sync arguments
        sched: Rename select_task_rq() argument
        sched: Feature to disable APERF/MPERF cpu_power
        x86: sched: Provide arch implementations using aperf/mperf
        x86: Add generic aperf/mperf code
        x86: Move APERF/MPERF into a X86_FEATURE
        ...
      
      Fix up trivial conflict in arch/x86/include/asm/processor.h due to
      nearby addition of amd_get_nb_id() declaration from the EDAC merge.
      dcbf77b9
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · ca043a66
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, pat: don't use rb-tree based lookup in reserve_memtype()
        x86: Increase MIN_GAP to include randomized stack
      ca043a66
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 1218259b
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
        vsnprintf: remove duplicate comment of vsnprintf
        softirq: add BLOCK_IOPOLL to softirq_to_name
        oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP
        tracing: switch function prints from %pf to %ps
        vsprintf: add %ps that is the same as %pS but is like %pf
        tracing: Fix minor bugs for __unregister_ftrace_function_probe
        tracing: remove notrace from __kprobes annotation
        tracing: optimize global_trace_clock cachelines
        MAINTAINERS: Update tracing tree details
        ftrace: document function and function graph implementation
        tracing: make testing syscall events a separate configuration
        tracing: remove some unused macros
        ftrace: add compile-time check on F_printk()
        tracing: fix F_printk() typos
        tracing: have TRACE_EVENT macro use __flags to not shadow parameter
        tracing: add static to generated TRACE_EVENT functions
        ring-buffer: typecast cmpxchg to fix PowerPC warning
        tracing: add filter event logic to special, mmiotrace and boot tracers
        tracing: remove trace_event_types.h
        tracing: use the new trace_entries.h to create format files
        ...
      1218259b
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · ca9a702e
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
        pata_amd: do not filter out valid modes in nv_mode_filter
        sata_promise: update reset code
        sata_promise: disable hotplug on 1st gen chips
        libata: fix spurious WARN_ON_ONCE() on port freeze
        ahci: restore pci_intx() handling
      ca9a702e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · bbe5a96f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Update defconfigs.
        sparc: Kill PROM console driver.
      bbe5a96f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f205ce83
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
        be2net: fix some cmds to use mccq instead of mbox
        atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
        pkt_sched: Fix qstats.qlen updating in dump_stats
        ipv6: Log the affected address when DAD failure occurs
        wl12xx: Fix print_mac() conversion.
        af_iucv: fix race when queueing skbs on the backlog queue
        af_iucv: do not call iucv_sock_kill() twice
        af_iucv: handle non-accepted sockets after resuming from suspend
        af_iucv: fix race in __iucv_sock_wait()
        iucv: use correct output register in iucv_query_maxconn()
        iucv: fix iucv_buffer_cpumask check when calling IUCV functions
        iucv: suspend/resume error msg for left over pathes
        wl12xx: switch to %pM to print the mac address
        b44: the poll handler b44_poll must not enable IRQ unconditionally
        ipv6: Ignore route option with ROUTER_PREF_INVALID
        bonding: make ab_arp select active slaves as other modes
        cfg80211: fix SME connect
        rc80211_minstrel: fix contention window calculation
        ssb/sdio: fix printk format warnings
        p54usb: add Zcomax XG-705A usbid
        ...
      f205ce83
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 3dc95666
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
        MIPS: BCM63xx: Add integrated ethernet mac support.
        MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.
        MIPS: BCM63xx: Add Broadcom 63xx CPU definitions.
        MIPS: Octeon:  Move some platform device registration to its own file.
        MIPS: Don't corrupt page tables on vmalloc fault.
        MIPS: Shrink the size of tlb handler
        MIPS: Alchemy: override loops_per_jiffy detection
        MIPS: hw_random: Add hardware RNG for Octeon SOCs.
        MIPS: Octeon:  Add hardware RNG platform device.
        MIPS: Remove useless zero initializations.
        MIPS: Alchemy: get rid of allow_au1k_wait
        MIPS: Octeon: Set kernel_uses_llsc to false on non-SMP builds.
        MIPS: Allow kernel use of LL/SC to be separate from the presence of LL/SC.
        MIPS: Get rid of CONFIG_CPU_HAS_LLSC
        MIPS: Malta: Remove pointless use use of CONFIG_CPU_HAS_LLSC
        MIPS: Rewrite clearing of ll_bit on context switch in C
        MIPS: Rewrite sysmips(MIPS_ATOMIC_SET, ...) in C with inline assembler
        MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file.
        MIPS: Clean up linker script using new linker script macros.
        MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE.
        ...
      3dc95666
  2. 17 Sep, 2009 28 commits