1. 17 Jan, 2012 2 commits
  2. 08 Jan, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 02550d61
      Linus Torvalds authored
      devicetree/next changes queued for v3.3 merge window
      
      * tag 'devicetree-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
        ARM: prom.h: Fix build error by removing unneeded header file
        irq: check domain hwirq range for DT translate
        dt: add empty of_get_node/of_put_node functions
        of/pdt: fix section mismatch warning
        i2c-designware: add OF binding support
        dt/i2c: Enumerate some of the known trivial i2c devices
        dt: reform for_each_property to for_each_property_of_node
        ARM/of: allow *machine_desc.dt_compat to be const
        of/base: Take NULL string into account for property with multiple strings
        OF/device-tree: Add some entries to vendor-prefixes.txt
      
      Fix up trivial add-add conflicts in include/linux/of.h
      02550d61
    • Linus Torvalds's avatar
      Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 2d51daaa
      Linus Torvalds authored
      spi changes queued up for v3.3 merge window
      
      * tag 'spi-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
        spi: Fix device unregistration when unregistering the bus master
        spi-topcliff-pch: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
        spi-topcliff-pch: Support new device LAPIS Semiconductor ML7831 IOH
        spi/omap: Correct the error path
        spi/omap: call pm_runtime_disable in error path and remove
        spi/omap: Use a workqueue per omap2_mcspi controller
      2d51daaa
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 · fbce1c23
      Linus Torvalds authored
      Changes queued in gpio/next for the start of the 3.3 merge window
      
      * tag 'gpio-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
        gpio: Add decode of WM8994 GPIO configuration
        gpio: Convert GPIO drivers to module_platform_driver
        gpio: Fix typo in comment in Samsung driver
        gpio: Explicitly index samsung_gpio_cfgs
        gpio: Add Linus Walleij as gpio co-maintainer
        of: Add device tree selftests
        of: create of_phandle_args to simplify return of phandle parsing data
        gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()
        gpio/microblaze: Eliminate duplication of of_get_named_gpio_flags()
        gpiolib: output basic details and consolidate gpio device drivers
        pch_gpio: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
        pch_gpio: Support new device LAPIS Semiconductor ML7831 IOH
        spi/pl022: make the chip deselect handling thread safe
        spi/pl022: add support for pm_runtime autosuspend
        spi/pl022: disable the PL022 block when unused
        spi/pl022: move device disable to workqueue thread
        spi/pl022: skip default configuration before suspending
        spi/pl022: fix build warnings
        spi/pl022: only enable RX interrupts when TX is complete
      fbce1c23
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 7affca35
      Linus Torvalds authored
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
        arm: fix up some samsung merge sysdev conversion problems
        firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
        Drivers:hv: Fix a bug in vmbus_driver_unregister()
        driver core: remove __must_check from device_create_file
        debugfs: add missing #ifdef HAS_IOMEM
        arm: time.h: remove device.h #include
        driver-core: remove sysdev.h usage.
        clockevents: remove sysdev.h
        arm: convert sysdev_class to a regular subsystem
        arm: leds: convert sysdev_class to a regular subsystem
        kobject: remove kset_find_obj_hinted()
        m86k: gpio - convert sysdev_class to a regular subsystem
        mips: txx9_sram - convert sysdev_class to a regular subsystem
        mips: 7segled - convert sysdev_class to a regular subsystem
        sh: dma - convert sysdev_class to a regular subsystem
        sh: intc - convert sysdev_class to a regular subsystem
        power: suspend - convert sysdev_class to a regular subsystem
        power: qe_ic - convert sysdev_class to a regular subsystem
        power: cmm - convert sysdev_class to a regular subsystem
        s390: time - convert sysdev_class to a regular subsystem
        ...
      
      Fix up conflicts with 'struct sysdev' removal from various platform
      drivers that got changed:
       - arch/arm/mach-exynos/cpu.c
       - arch/arm/mach-exynos/irq-eint.c
       - arch/arm/mach-s3c64xx/common.c
       - arch/arm/mach-s3c64xx/cpu.c
       - arch/arm/mach-s5p64x0/cpu.c
       - arch/arm/mach-s5pv210/common.c
       - arch/arm/plat-samsung/include/plat/cpu.h
       - arch/powerpc/kernel/sysfs.c
      and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h
      7affca35
  3. 07 Jan, 2012 22 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 356b9542
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
        m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
        m68k/serial: Remove references to obsolete serial config options
        m68k/net: Remove obsolete IRQ_FLG_* users
        m68k: Don't comment out syscalls used by glibc
        m68k/atari: Move declaration of atari_SCC_reset_done to header file
        m68k/serial: Remove references to obsolete CONFIG_SERIAL167
        m68k/hp300: Export hp300_ledstate
        m68k: Initconst section fixes
        m68k/mac: cleanup macro case
        mac_scsi: fix mac_scsi on some powerbooks
        m68k/mac: fix powerbook 150 adb_type
        m68k/mac: fix baboon irq disable and shutdown
        m68k/mac: oss irq fixes
        m68k/mac: fix nubus slot irq disable and shutdown
        m68k/mac: enable via_alt_mapping on performa 580
        m68k/mac: cleanup forward declarations
        m68k/mac: cleanup mac_irq_pending
        m68k/mac: cleanup mac_clear_irq
        m68k/mac: early console
        m68k/mvme16x: Add support for EARLY_PRINTK
        ...
      
      Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
      EARLY_PRINTK config option addition clashing with movement of the
      BOOTPARAM options.
      356b9542
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · 770e1b03
      Linus Torvalds authored
      * 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)
        ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h
        ARM: 7269/1: mach-sa1100: fix sched_clock breakage
        ARM: 7198/1: arm/imx6: add restart support for imx6q
        ARM: restart: remove the now empty arch_reset()
        ARM: restart: remove comments about adding code to arch_reset()
        ARM: restart: lpc32xx & u300: remove unnecessary printk
        ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook
        ARM: restart: w90x900: use new restart hook
        ARM: restart: Versatile Express: use new restart hook
        ARM: restart: versatile: use new restart hook
        ARM: restart: u300: use new restart hook
        ARM: restart: tegra: use new restart hook
        ARM: restart: spear: use new restart hook
        ARM: restart: shark: use new restart hook
        ARM: restart: sa1100: use new restart hook
        ARM: 7252/1: restart: S5PV210: use new restart hook
        ARM: 7251/1: restart: S5PC100: use new restart hook
        ARM: 7250/1: restart: S5P64X0: use new restart hook
        ARM: 7266/1: restart: S3C64XX: use new restart hook
        ARM: 7265/1: restart: S3C24XX: use new restart hook
        ...
      
      Fix up trivial conflict in arch/arm/mm/init.c due to removal of
      memblock_init() clashing with the movement of the sorting of the meminfo
      array.
      770e1b03
    • Linus Torvalds's avatar
      Merge branch 'amba-modalias' of... · d3d0b024
      Linus Torvalds authored
      Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
      
      * 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        sound: aaci: Enable module alias autogeneration for AMBA drivers
        watchdog: sp805: Enable module alias autogeneration for AMBA drivers
        fbdev: amba: Enable module alias autogeneration for AMBA drivers
        serial: pl011: Enable module alias autogeneration for AMBA drivers
        serial: pl010: Enable module alias autogeneration for AMBA drivers
        spi: pl022: Enable module alias autogeneration for AMBA drivers
        rtc: pl031: Enable module alias autogeneration for AMBA drivers
        rtc: pl030: Enable module alias autogeneration for AMBA drivers
        mmc: mmci: Enable module alias autogeneration for AMBA drivers
        input: ambakmi: Enable module alias autogeneration for AMBA drivers
        gpio: pl061: Enable module alias autogeneration for AMBA drivers
        dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
        dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
        hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
        ARM: amba: Auto-generate AMBA driver module aliases during modpost
        ARM: amba: Move definition of struct amba_id to mod_devicetable.h
      d3d0b024
    • Linus Torvalds's avatar
      Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 6ed23fd6
      Linus Torvalds authored
      * 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        pstore: gracefully handle NULL pstore_info functions
        pstore: pass reason to backend write callback
      6ed23fd6
    • Linus Torvalds's avatar
      Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · 5ee354a0
      Linus Torvalds authored
      * 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        ia64: pcibr: Use kmemdup rather than duplicating its implementation
        ia64: sn: Use kmemdup rather than duplicating its implementation
        ia64: tioca: Use kmemdup rather than duplicating its implementation
        [IA64] Merge overlapping reserved regions at boot
      5ee354a0
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · c7741713
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (56 commits)
        m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled
        m68k/Kconfig: Separate classic m68k and coldfire early
        m68k: add ColdFire with MMU enabled support to the m68k mem init code
        m68k: do not use m68k startup or interrupt code for ColdFire CPUs
        m68k: add ColdFire FPU support for the V4e ColdFire CPUs
        m68k: adjustments to stack frame for ColdFire with MMU enabled
        m68k: use non-MMU linker script for ColdFire MMU builds
        m68k: ColdFire with MMU enabled uses same clocking code as non-MMU
        m68k: add code to setup a ColdFire 54xx platform when MMU enabled
        m68k: use non-MMU entry.S code when compiling for ColdFire CPU
        m68k: create ColdFire MMU pgalloc code
        m68k: compile appropriate mm arch files for ColdFire MMU support
        m68k: ColdFire V4e MMU paging init code and miss handler
        m68k: use ColdFire MMU read/write bit flags when ioremapping
        m68k: modify cache push and clear code for ColdFire with MMU enable
        m68k: use tracehook_report_syscall_entry/exit for ColdFire MMU ptrace path
        m68k: ColdFire V4e MMU context support code
        m68k: MMU enabled ColdFire needs 8k ELF alignment
        m68k: set ColdFire MMU page size
        m68k: define PAGE_OFFSET_RAW for ColdFire CPU with MMU enabled
        ...
      c7741713
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · e4e88f31
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)
        powerpc: fix compile error with 85xx/p1010rdb.c
        powerpc: fix compile error with 85xx/p1023_rds.c
        powerpc/fsl: add MSI support for the Freescale hypervisor
        arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree
        powerpc/fsl: Add support for Integrated Flash Controller
        powerpc/fsl: update compatiable on fsl 16550 uart nodes
        powerpc/85xx: fix PCI and localbus properties in p1022ds.dts
        powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig
        powerpc/fsl: Update defconfigs to enable some standard FSL HW features
        powerpc: Add TBI PHY node to first MDIO bus
        sbc834x: put full compat string in board match check
        powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address
        powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit
        offb: Fix setting of the pseudo-palette for >8bpp
        offb: Add palette hack for qemu "standard vga" framebuffer
        offb: Fix bug in calculating requested vram size
        powerpc/boot: Change the WARN to INFO for boot wrapper overlap message
        powerpc/44x: Fix build error on currituck platform
        powerpc/boot: Change the load address for the wrapper to fit the kernel
        powerpc/44x: Enable CRASH_DUMP for 440x
        ...
      
      Fix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to
      the additional sparse-checking code for cputime_t.
      e4e88f31
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 9753dfe1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)
        net: pack skb_shared_info more efficiently
        net_sched: red: split red_parms into parms and vars
        net_sched: sfq: extend limits
        cnic: Improve error recovery on bnx2x devices
        cnic: Re-init dev->stats_addr after chip reset
        net_sched: Bug in netem reordering
        bna: fix sparse warnings/errors
        bna: make ethtool_ops and strings const
        xgmac: cleanups
        net: make ethtool_ops const
        vmxnet3" make ethtool ops const
        xen-netback: make ops structs const
        virtio_net: Pass gfp flags when allocating rx buffers.
        ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call
        netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call
        igb: reset PHY after recovering from PHY power down
        igb: add basic runtime PM support
        igb: Add support for byte queue limits.
        e1000: cleanup CE4100 MDIO registers access
        e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove
        ...
      9753dfe1
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · edf7c814
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: add IRQ context simulation in module mce-inject
        x86, mce, therm_throt: Don't report power limit and package level thermal throttle events in mcelog
        x86, MCE: Drain mcelog buffer
        x86, mce: Add wrappers for registering on the decode chain
      edf7c814
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 82406da4
      Linus Torvalds authored
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode, AMD: Update copyrights
        x86, microcode, AMD: Exit early on success
        x86, microcode, AMD: Simplify ucode verification
        x86, microcode, AMD: Add a reusable buffer
        x86, microcode, AMD: Add a vendor-specific exit function
      82406da4
    • Linus Torvalds's avatar
      Merge branch 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7a222156
      Linus Torvalds authored
      * 'x86-rdrand-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        random: Use arch_get_random_int instead of cycle counter if avail
      7a222156
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2c364faa
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, centaur: Enable cx8 for VIA Eden too
      2c364faa
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cf3f3355
      Linus Torvalds authored
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Use "do { } while(0)" for empty lock_cmos()/unlock_cmos() macros
        x86: Use "do { } while(0)" for empty flush_tlb_fix_spurious_fault() macro
        x86, CPU: Drop superfluous get_cpu_cap() prototype
        arch/x86/mm/pageattr.c: Quiet sparse noise; local functions should be static
        arch/x86/kernel/ptrace.c: Quiet sparse noise
        x86: Use kmemdup() in copy_thread(), rather than duplicating its implementation
        x86: Replace the EVT_TO_HPET_DEV() macro with an inline function
      cf3f3355
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 69734b64
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        x86: Fix atomic64_xxx_cx8() functions
        x86: Fix and improve cmpxchg_double{,_local}()
        x86_64, asm: Optimise fls(), ffs() and fls64()
        x86, bitops: Move fls64.h inside __KERNEL__
        x86: Fix and improve percpu_cmpxchg{8,16}b_double()
        x86: Report cpb and eff_freq_ro flags correctly
        x86/i386: Use less assembly in strlen(), speed things up a bit
        x86: Use the same node_distance for 32 and 64-bit
        x86: Fix rflags in FAKE_STACK_FRAME
        x86: Clean up and extend do_int3()
        x86: Call do_notify_resume() with interrupts enabled
        x86/div64: Add a micro-optimization shortcut if base is power of two
        x86-64: Cleanup some assembly entry points
        x86-64: Slightly shorten line system call entry and exit paths
        x86-64: Reduce amount of redundant code generated for invalidate_interruptNN
        x86-64: Slightly shorten int_ret_from_sys_call
        x86, efi: Convert efi_phys_get_time() args to physical addresses
        x86: Default to vsyscall=emulate
        x86-64: Set siginfo and context on vsyscall emulation faults
        x86: consolidate xchg and xadd macros
        ...
      69734b64
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 67b02431
      Linus Torvalds authored
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Skip cpus with apic-ids >= 255 in !x2apic_mode
        x86, x2apic: Allow "nox2apic" to disable x2apic mode setup by BIOS
        x86, x2apic: Fallback to xapic when BIOS doesn't setup interrupt-remapping
        x86, acpi: Skip acpi x2apic entries if the x2apic feature is not present
        x86, apic: Add probe() for apic_flat
        x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'
        x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat
        x86: Add per-cpu stat counter for APIC ICR read tries
        pci, x86/io-apic: Allow PCI_IOAPIC to be user configurable on x86
        x86: Fix the !CONFIG_NUMA build of the new CPU ID fixup code support
        x86: Add NumaChip support
        x86: Add x86_init platform override to fix up NUMA core numbering
        x86: Make flat_init_apic_ldr() available
      67b02431
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 376613e8
      Linus Torvalds authored
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, tsc: Skip TSC synchronization checks for tsc=reliable
        clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
        clocksource: cris: Convert to clocksource_register_khz
        clocksource: xtensa: Convert to clocksource_register_hz/khz
        clocksource: um: Convert to clocksource_register_hz/khz
        clocksource: parisc: Convert to clocksource_register_hz/khz
        clocksource: m86k: Convert to clocksource_register_hz/khz
        time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver
        time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver
        time: x86: Remove CLOCK_TICK_RATE from mach_timer.h
        time: x86: Remove CLOCK_TICK_RATE from tsc code
        time: Fix spelling mistakes in new comments
        time: fix bogus comment in timekeeping_get_ns_raw
      376613e8
    • Greg Kroah-Hartman's avatar
      Merge branch 'driver-core-next' into Linux 3.2 · ff4b8a57
      Greg Kroah-Hartman authored
      
      
      This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
      and it fixes the build error in the arch/x86/kernel/microcode_core.c
      file, that the merge did not catch.
      
      The microcode_core.c patch was provided by Stephen Rothwell
      <sfr@canb.auug.org.au> who was invaluable in the merge issues involved
      with the large sysdev removal process in the driver-core tree.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ff4b8a57
    • Kukjin Kim's avatar
      arm: fix up some samsung merge sysdev conversion problems · ea04018e
      Kukjin Kim authored
      
      
      Following should be fixed in your driver-core/driver-core-next.
      
      From: Kukjin Kim <kgene.kim@samsung.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      ea04018e
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0db49b72
      Linus Torvalds authored
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)
        sched/tracing: Add a new tracepoint for sleeptime
        sched: Disable scheduler warnings during oopses
        sched: Fix cgroup movement of waking process
        sched: Fix cgroup movement of newly created process
        sched: Fix cgroup movement of forking process
        sched: Remove cfs bandwidth period check in tg_set_cfs_period()
        sched: Fix load-balance lock-breaking
        sched: Replace all_pinned with a generic flags field
        sched: Only queue remote wakeups when crossing cache boundaries
        sched: Add missing rcu_dereference() around ->real_parent usage
        [S390] fix cputime overflow in uptime_proc_show
        [S390] cputime: add sparse checking and cleanup
        sched: Mark parent and real_parent as __rcu
        sched, nohz: Fix missing RCU read lock
        sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer
        sched, nohz: Fix the idle cpu check in nohz_idle_balance
        sched: Use jump_labels for sched_feat
        sched/accounting: Fix parameter passing in task_group_account_field
        sched/accounting: Fix user/system tick double accounting
        sched/accounting: Re-use scheduler statistics for the root cgroup
        ...
      
      Fix up conflicts in
       - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h
      	usecs_to_cputime64() vs the sparse cleanups
       - kernel/sched/fair.c, kernel/time/tick-sched.c
      	scheduler changes in multiple branches
      0db49b72
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35b740e4
      Linus Torvalds authored
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)
        perf kvm: Fix copy & paste error in description
        perf script: Kill script_spec__delete
        perf top: Fix a memory leak
        perf stat: Introduce get_ratio_color() helper
        perf session: Remove impossible condition check
        perf tools: Fix feature-bits rework fallout, remove unused variable
        perf script: Add generic perl handler to process events
        perf tools: Use for_each_set_bit() to iterate over feature flags
        perf tools: Unify handling of features when writing feature section
        perf report: Accept fifos as input file
        perf tools: Moving code in some files
        perf tools: Fix out-of-bound access to struct perf_session
        perf tools: Continue processing header on unknown features
        perf tools: Improve macros for struct feature_ops
        perf: builtin-record: Document and check that mmap_pages must be a power of two.
        perf: builtin-record: Provide advice if mmap'ing fails with EPERM.
        perf tools: Fix truncated annotation
        perf script: look up thread using tid instead of pid
        perf tools: Look up thread names for system wide profiling
        perf tools: Fix comm for processes with named threads
        ...
      35b740e4
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 423d091d
      Linus Torvalds authored
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)
        cpu: Export cpu_up()
        rcu: Apply ACCESS_ONCE() to rcu_boost() return value
        Revert "rcu: Permit rt_mutex_unlock() with irqs disabled"
        docs: Additional LWN links to RCU API
        rcu: Augment rcu_batch_end tracing for idle and callback state
        rcu: Add rcutorture tests for srcu_read_lock_raw()
        rcu: Make rcutorture test for hotpluggability before offlining CPUs
        driver-core/cpu: Expose hotpluggability to the rest of the kernel
        rcu: Remove redundant rcu_cpu_stall_suppress declaration
        rcu: Adaptive dyntick-idle preparation
        rcu: Keep invoking callbacks if CPU otherwise idle
        rcu: Irq nesting is always 0 on rcu_enter_idle_common
        rcu: Don't check irq nesting from rcu idle entry/exit
        rcu: Permit dyntick-idle with callbacks pending
        rcu: Document same-context read-side constraints
        rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass
        rcu: Remove dynticks false positives and RCU failures
        rcu: Reduce latency of rcu_prepare_for_idle()
        rcu: Eliminate RCU_FAST_NO_HZ grace-period hang
        rcu: Avoid needlessly IPIing CPUs at GP end
        ...
      423d091d
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1483b382
      Linus Torvalds authored
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        printk, lockdep: Switch to tracked irq ops
        printk, lockdep: Remove superfluous preempt_disable()
        printk, lockdep: Disable lock debugging on zap_locks()
      1483b382
  4. 06 Jan, 2012 12 commits