Merge commit 'ccbf62d8a2' into for-next

backmerge to avoid kernel/acct.c conflict
2026-09-26 18:16:26 +00:00 · 2014-08-07 14:07:57 -04:00 · 2014-08-07 14:07:57 -04:00 · 82df9c8beb
commit 82df9c8beb
parent 19583ca584 ccbf62d8a2
82 changed files with 9787 additions and 8635 deletions
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
--- a/Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt
+++ b/Documentation/devicetree/bindings/timer/cirrus,clps711x-timer.txt
--- a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
+++ b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
--- a/Documentation/devicetree/bindings/timer/renesas,mtu2.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,mtu2.txt
--- a/Documentation/devicetree/bindings/timer/renesas,tmu.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,tmu.txt
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/6
+++ b/6
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
--- a/arch/tile/kernel/vdso/vgettimeofday.c
+++ b/arch/tile/kernel/vdso/vgettimeofday.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
--- a/drivers/clocksource/clps711x-timer.c
+++ b/drivers/clocksource/clps711x-timer.c
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
--- a/drivers/clocksource/mtk_timer.c
+++ b/drivers/clocksource/mtk_timer.c
--- a/drivers/clocksource/pxa_timer.c
+++ b/drivers/clocksource/pxa_timer.c
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
--- a/include/clocksource/pxa.h
+++ b/include/clocksource/pxa.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/io.h
+++ b/include/linux/io.h
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sh_timer.h
+++ b/include/linux/sh_timer.h
--- a/include/linux/time.h
+++ b/include/linux/time.h
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
--- a/include/linux/timekeeping.h
+++ b/include/linux/timekeeping.h
--- a/include/linux/timerfd.h
+++ b/include/linux/timerfd.h
--- a/kernel/Makefile
+++ b/kernel/Makefile
--- a/kernel/acct.c
+++ b/kernel/acct.c
--- a/kernel/debug/kdb/kdb_main.c
+++ b/kernel/debug/kdb/kdb_main.c
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
--- a/kernel/time/itimer.c
+++ b/kernel/time/itimer.c
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
--- a/kernel/time/ntp_internal.h
+++ b/kernel/time/ntp_internal.h
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
--- a/kernel/time/tick-internal.h
+++ b/kernel/time/tick-internal.h
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
--- a/kernel/time/timeconst.bc
+++ b/kernel/time/timeconst.bc
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
--- a/kernel/time/timekeeping.h
+++ b/kernel/time/timekeeping.h
--- a/kernel/time/timekeeping_debug.c
+++ b/kernel/time/timekeeping_debug.c
--- a/kernel/time/timekeeping_internal.h
+++ b/kernel/time/timekeeping_internal.h
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
--- a/kernel/time/udelay_test.c
+++ b/kernel/time/udelay_test.c
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
--- a/lib/devres.c
+++ b/lib/devres.c
--- a/security/tomoyo/audit.c
+++ b/security/tomoyo/audit.c
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
--- a/tools/time/udelay_test.sh
+++ b/tools/time/udelay_test.sh