19 Oct, 2009

3 commits

  • 6941c3a0 disabled compilation of the legacy digest code but didn't
    actually remove it. Rectify this. Also, remove the crypto_hash_type
    extern declaration from algapi.h now that the struct is gone.

    Signed-off-by: Benjamin Gilbert
    Signed-off-by: Herbert Xu

    Benjamin Gilbert
     
  • Patch to add fips(ansi_cprng) alg, which is ansi_cprng plus a continuous test

    Signed-off-by: Neil Horman
    Acked-by: Jarod Wilson
    Signed-off-by: Herbert Xu

    Neil Horman
     
  • PCLMULQDQ is used to accelerate the most time-consuming part of GHASH,
    carry-less multiplication. More information about PCLMULQDQ can be
    found at:

    http://software.intel.com/en-us/articles/carry-less-multiplication-and-its-usage-for-computing-the-gcm-mode/

    Because PCLMULQDQ changes XMM state, its usage must be enclosed with
    kernel_fpu_begin/end, which can be used only in process context, the
    acceleration is implemented as crypto_ahash. That is, request in soft
    IRQ context will be defered to the cryptd kernel thread.

    Signed-off-by: Huang Ying
    Signed-off-by: Herbert Xu

    Huang Ying
     

22 Sep, 2009

1 commit

  • The PadLock hardware requires the output buffer for SHA to be
    128-bit aligned. We currentply place the buffer on the stack,
    and ask gcc to align it to 128 bits. That doesn't work on i386
    because the kernel stack is only aligned to 32 bits. This patch
    changes the code to align the buffer by hand so that the hardware
    doesn't fault on unaligned buffers.

    Reported-by: Séguier Régis
    Tested-by: Séguier Régis
    Signed-off-by: Herbert Xu

    Herbert Xu
     

19 Sep, 2009

22 commits

  • …el/git/tip/linux-2.6-tip

    * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (38 commits)
    x86: Move get/set_wallclock to x86_platform_ops
    x86: platform: Fix section annotations
    x86: apic namespace cleanup
    x86: Distangle ioapic and i8259
    x86: Add Moorestown early detection
    x86: Add hardware_subarch ID for Moorestown
    x86: Add early platform detection
    x86: Move tsc_init to late_time_init
    x86: Move tsc_calibration to x86_init_ops
    x86: Replace the now identical time_32/64.c by time.c
    x86: time_32/64.c unify profile_pc
    x86: Move calibrate_cpu to tsc.c
    x86: Make timer setup and global variables the same in time_32/64.c
    x86: Remove mca bus ifdef from timer interrupt
    x86: Simplify timer_ack magic in time_32.c
    x86: Prepare unification of time_32/64.c
    x86: Remove do_timer hook
    x86: Add timer_init to x86_init_ops
    x86: Move percpu clockevents setup to x86_init_ops
    x86: Move xen_post_allocator_init into xen_pagetable_setup_done
    ...

    Fix up conflicts in arch/x86/include/asm/io_apic.h

    Linus Torvalds
     
  • Signed-off-by: Geoffrey Thomas
    Signed-off-by: Tim Abbott
    Acked-by: Sam Ravnborg
    Acked-by: David S. Miller
    Signed-off-by: Linus Torvalds

    Geoffrey Thomas
     
  • This is largely a straightforward conversion. The patch results in
    fewer output sections, and some data being reordered, but should have
    no functional impact.

    Also, note that this patch moves some data (namely, init_task and
    cacheline-aligned) inside [_sdata,_edata].

    Because frv already builds using -ffunction-sections -fdata-sections,
    we can't use BSS_SECTION or RW_DATA_SECTION yet, since they do not
    currently include the required .bss.* and .data.* sections.

    Signed-off-by: Nelson Elhage
    Acked-by: David Howells
    Signed-off-by: Tim Abbott
    Acked-by: Sam Ravnborg
    Signed-off-by: Linus Torvalds

    Nelson Elhage
     
  • It appears that frv copied the .altinstructions definitions in its linker
    script from x86. Since frv doesn't put anything in those sections, this
    is just dead code.

    Signed-off-by: Nelson Elhage
    Acked-by: David Howells
    Signed-off-by: Tim Abbott
    Acked-by: Sam Ravnborg
    Signed-off-by: Linus Torvalds

    Nelson Elhage
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (64 commits)
    ext4: Update documentation about quota mount options
    ext4: replace MAX_DEFRAG_SIZE with EXT_MAX_BLOCK
    ext4: Fix the alloc on close after a truncate hueristic
    ext4: Add a tracepoint for ext4_alloc_da_blocks()
    ext4: store EXT4_EXT_MIGRATE in i_state instead of i_flags
    ext4: limit block allocations for indirect-block files to < 2^32
    ext4: Fix different block exchange issue in EXT4_IOC_MOVE_EXT
    ext4: Add null extent check to ext_get_path
    ext4: Replace BUG_ON() with ext4_error() in move_extents.c
    ext4: Replace get_ext_path macro with an inline funciton
    ext4: Fix include/trace/events/ext4.h to work with Systemtap
    ext4: Fix initalization of s_flex_groups
    ext4: Always set dx_node's fake_dirent explicitly.
    ext4: Fix async commit mode to be safe by using a barrier
    ext4: Don't update superblock write time when filesystem is read-only
    ext4: Clarify the locking details in mballoc
    ext4: check for need init flag in ext4_mb_load_buddy
    ext4: move ext4_mb_init_group() function earlier in the mballoc.c
    ext4: Make non-journal fsync work properly
    ext4: Assure that metadata blocks are written during fsync in no journal mode
    ...

    Linus Torvalds
     
  • Remove net/genetlink.h inclusion, now sched.c won't be recompiled
    because of some networking changes.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • Allow the short description after symbol name and dash in a kernel-doc
    comment to span multiple lines, e.g. like this:

    /**
    * unmap_mapping_range - unmap the portion of all mmaps in the
    * specified address_space corresponding to the specified
    * page range in the underlying file.
    * @mapping: the address space containing mmaps to be unmapped.
    * ...
    */

    The short description ends with a parameter description, an empty line
    or the end of the comment block.

    Signed-off-by: Johannes Weiner
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Johannes Weiner
     
  • 'current' is a pointer, so the right form is 'down_write(¤t->mm->mmap_sem)'.

    Signed-off-by: Jianjun Kong
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Jianjun Kong
     
  • The kref_put() already occurs after the out label

    Signed-off-by: Roel Kluin
    Signed-off-by: Randy Dunlap
    Signed-off-by: Linus Torvalds

    Roel Kluin
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
    [WATCHDOG] sizeof cleanup
    [WATCHDOG] wdt_pci: fix printk and variable type
    [WATCHDOG] wdt_pci - use pci_request_region
    [WATCHDOG] ar7_wdt: Fix error handling during probe.
    [WATCHDOG] ar7_wdt: convert to become a platform driver
    [WATCHDOG] fix book E watchdog to take WDIOC_SETTIMEOUT arg in seconds
    [WATCHDOG] davinci: use clock framework for timer frequency
    [WATCHDOG] Use DIV_ROUND_UP() macro in the coh901327 WDT
    [WATCHDOG] Add support for WM831x watchdog
    [WATCHDOG] Add watchdog driver for NUC900
    [WATCHDOG] add SBC-FITPC2 watchdog driver

    Linus Torvalds
     
  • * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: (22 commits)
    score: add TIF_NOTIFY_RESUME define in asm/thread_info.h
    score: make init_thread_union align to THREAD_SIZE
    score: update files according to review comments.
    score: add old syscall support
    score: add MEMORY_START and MEMORY_SIZE define, to make the code clear
    score: update inconsistent declare after .c was changed
    score: remove unused code, add include files in .c
    score: clean up mm/init.c
    score: make irq.h definitions local
    score: cleanups: dead code, 0 as pointer, shadowed variables
    score: fix function prototypes
    score: add address space annotations
    score: add missing #includes
    score: move save arg5 and arg6 instruction in front of enable_irq
    score: add prototypes for wrapped syscalls
    score: remove init_mm
    score: add generic sys_call_table
    score: remove __{put,get}_user_unknown
    score: unset __ARCH_WANT_IPC_PARSE_VERSION
    score: update files according to review comments
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (262 commits)
    sh: mach-ecovec24: Add user debug switch support
    sh: Kill off unused se_skipped in alignment trap notification code.
    sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
    video: sh_mobile_lcdcfb: use both register sets for display panning
    video: sh_mobile_lcdcfb: implement display panning
    sh: Fix up sh7705 flush_dcache_page() build.
    sh: kfr2r09: document the PLL/FLL RF relationship.
    sh: mach-ecovec24: need asm/clock.h.
    sh: mach-ecovec24: deassert usb irq on boot.
    sh: Add KEYSC support for EcoVec24
    sh: add kycr2_delay for sh_keysc
    sh: cpufreq: Include CPU id in info messages.
    sh: multi-evt support for SH-X3 proto CPU.
    sh: clkfwk: remove bogus set_bus_parent() from SH7709.
    sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
    sh: Add EcoVec24 romImage defconfig
    sh: USB disable process is needed if romImage boot for EcoVec24
    sh: EcoVec24: add HIZA setting for LED
    sh: EcoVec24: write MAC address in boot
    sh: Add romImage support for EcoVec24
    ...

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] Clean up linker script using standard macros.
    [IA64] Use standard macros for page-aligned data.
    [IA64] Use .ref.text, not .text.init for start_ap.
    [IA64] sgi-xp: fix printk format warnings
    [IA64] ioc4_serial: fix printk format warnings
    [IA64] mbcs: fix printk format warnings
    [IA64] pci_br, fix infinite loop in find_free_ate()
    [IA64] kdump: Short path to freeze CPUs
    [IA64] kdump: Try INIT regardless of
    [IA64] kdump: Mask INIT first in panic-kdump path
    [IA64] kdump: Don't return APs to SAL from kdump
    [IA64] kexec: Unregister MCA handler before kexec
    [IA64] kexec: Make INIT safe while transition to
    [IA64] kdump: Mask MCA/INIT on frozen cpus

    Fix up conflict in arch/ia64/kernel/vmlinux.lds.S as per Tony's
    suggestion.

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
    fuse: add fusectl interface to max_background
    fuse: limit user-specified values of max background requests
    fuse: use drop_nlink() instead of direct nlink manipulation
    fuse: document protocol version negotiation
    fuse: make the number of max background requests and congestion threshold tunable

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (55 commits)
    regulator: Voltage count for AB3100
    mfd: Convert WM8350 to use request_threaded_irq()
    mfd: Update MAINTAINERS patterns for WM831x
    mfd: Fix twl4030-power warnings
    regulator: AB3100 support
    rtc: AB3100 RTC support
    mfd: Fix ab3100-otp build failure
    mfd: OMAP: Board-specifc twl4030 DPS scripts for RX51 board
    mfd: Print warning for twl4030 out-of-order script loading
    mfd: Add support for TWL4030/5030 dynamic power switching
    mfd: AB3100 OTP readout
    regulator: Add Freescale MC13783 driver
    mfd: Add Freescale MC13783 driver
    mfd: AB3100 disable irq nosync
    mfd: AB3100 alter default setting
    mfd: AB3100 propagate error
    mfd: AB3100 accessor function cleanups
    rtc: Add support for RTCs on Wolfson WM831x devices
    regulator: get pcap data from the parent device
    input: PCAP2 misc input driver
    ...

    Linus Torvalds
     
  • Signed-off-by: Jan Kara
    Signed-off-by: "Theodore Ts'o"

    Jan Kara
     
  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
    DaVinci: DM646x - platform changes for vpif capture and display drivers
    davinci: DM355 - platform changes for vpfe capture
    davinci: DM644x platform changes for vpfe capture
    davinci: audio: move tlv320aic33 i2c setup into board files
    DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
    DaVinci: DM365: Adding entries for DM365 IRQ's
    DaVinci: DM355: Adding PINMUX entries for DM355 Display
    davinci: Handle pinmux conflict between mmc/sd and nor flash
    davinci: Add NOR flash support for da850/omap-l138
    davinci: Add NAND flash support for DA850/OMAP-L138
    davinci: Add MMC/SD support for da850/omap-l138
    davinci: Add platform support for da850/omap-l138 GLCD
    davinci: Macro to convert GPIO signal to GPIO pin number
    davinci: Audio support for DA850/OMAP-L138 EVM
    davinci: Audio support for DA830 EVM
    davinci: Correct the number of GPIO pins for da850/omap-l138
    davinci: Configure MDIO pins for EMAC
    DaVinci: DM365: Add Support for new Revision of silicon
    DaVinci: DM365: Fix Compilation issue due to PINMUX entry
    DaVinci: EDMA: Updating default queue handling
    ...

    Linus Torvalds
     
  • * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (47 commits)
    OMAP clock: use debugfs_remove_recursive() for rewinding
    OMAP2/3/4 core: create omap_device layer
    OMAP: omap_hwmod: call omap_hwmod init at boot; create interconnects
    OMAP2/3/4: create omap_hwmod layer
    OMAP2/3 board-*.c files: read bootloader configuration earlier
    OMAP2/3/4 PRCM: add module IDLEST wait code
    OMAP2/3 PM: create the OMAP PM interface and add a default OMAP PM no-op layer
    OMAP3 clock: remove superfluous calls to omap2_init_clk_clkdm
    OMAP clock: associate MPU clocks with the mpu_clkdm
    OMAP3 clock: Fixed processing of bootarg 'mpurate'
    OMAP: SDRC: Add several new register definitions
    OMAP: powerdomain: Fix overflow when doing powerdomain deps lookups.
    OMAP: PM: Added suspend target state control to debugfs for OMAP3
    OMAP: PM debug: Add PRCM register dump support
    OMAP: PM debug: make powerdomains use PM-debug counters
    OMAP: PM: Add pm-debug counters
    OMAP: PM: Add closures to clkdm_for_each and pwrdm_for_each.
    OMAP: PM: Hook into PM counters
    OMAP: PM counter infrastructure.
    OMAP3: PM: fix lockdep warning caused by omap3_pm_init
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
    dlm: use kernel_sendpage
    dlm: fix connection close handling
    dlm: fix double-release of socket in error exit path

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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

    Linus Torvalds
     
  • * '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.

    Linus Torvalds
     

18 Sep, 2009

14 commits

  • Commit ac89a9174 ("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: Peter Volkov
    Cc: stable@kernel.org (2.6.31)
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Use sizeof(*) instead of sizeof * (See Codingstyle documentation).

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • Fix printk format warning:
    drivers/watchdog/wdt_pci.c:652: warning: format '%04x' expects type 'unsigned int', but argument 2 has type 'resource_size_t'

    and then use resource_size_t for the "io" variable as well
    so that it won't be truncated.

    Signed-off-by: Randy Dunlap
    Signed-off-by: Wim Van Sebroeck

    Randy Dunlap
     
  • Use pci_request_region instead of request_region for this pci_driver.

    Signed-off-by: Wim Van Sebroeck

    Wim Van Sebroeck
     
  • Fix error handling in the probe function.

    Signed-off-by: Wim Van Sebroeck
    Tested-by: Florian Fainelli

    Wim Van Sebroeck
     
  • This patch converts the ar7_wdt driver to become
    a platform driver. The AR7 SoC specific identification
    and base register calculation is performed by the board
    code, therefore we no longer need to have access to
    ar7_chip_id. We also remove the reboot notifier code to
    use the platform shutdown method as Wim suggested.

    Signed-off-by: Florian Fainelli
    Signed-off-by: Wim Van Sebroeck

    Florian Fainelli
     
  • The WDIOC_SETTIMEOUT argument is supposed to be a "seconds" value.
    However, the book E wdt currently treats it as a "period" which is
    interpreted in a board-specific way.

    This patch allows the user to pass in a "seconds" value and the driver
    will set the smallest timeout that is at least as large as specified
    by the user. It's been tested on e500 hardware and works as
    expected.

    The patch only modifies the CONFIG_FSL_BOOKE case, the CONFIG_4xx case
    is left unmodified as I don't have any hardware to test it on.

    Signed-off-by: Chris Friesen
    Cc: Kumar Gala
    Signed-off-by: Andrew Morton
    Signed-off-by: Wim Van Sebroeck

    Chris Friesen
     
  • Remove use of CLOCK_TICK_RATE in favor of using clock framework
    for getting timer frequency.

    Signed-off-by: Kevin Hilman
    Signed-off-by: Russell King
    Signed-off-by: Wim Van Sebroeck

    Kevin Hilman
     
  • I saw Julia Lawalls various commits fixing up the use of rounding
    macros and since my already submitted patch was not caught in this
    I took it upon myself to fix it up for this driver as well.

    Signed-off-by: Linus Walleij
    Signed-off-by: Wim Van Sebroeck

    Linus Walleij
     
  • The WM831x series of devices provide a watchdog with configurable
    behaviour on timer expiry.

    Currently this driver support refreshes via a register or GPIO line and
    autonomous refreshes from a hardware source (eg, a clock).

    Signed-off-by: Mark Brown
    Signed-off-by: Wim Van Sebroeck

    Mark Brown
     
  • Add watchdog device driver for the Nuvoton NUC900 series SoCs.

    Signed-off-by: Wan ZongShun
    Signed-off-by: Wim Van Sebroeck

    Wan ZongShun
     
  • Add support for watchdog found on SBC-FITPC2 board.

    Signed-off-by: Denis Turischev
    Signed-off-by: Mike Rapoport
    Signed-off-by: Wim Van Sebroeck
    Signed-off-by: Andrew Morton

    Denis Turischev
     
  • * '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

    Linus Torvalds
     
  • …/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.

    Linus Torvalds