Loading CREDITS +4 −4 Original line number Diff line number Diff line Loading @@ -3554,12 +3554,12 @@ E: cvance@nai.com D: portions of the Linux Security Module (LSM) framework and security modules N: Petr Vandrovec E: vandrove@vc.cvut.cz E: petr@vandrovec.name D: Small contributions to ncpfs D: Matrox framebuffer driver S: Chudenicka 8 S: 10200 Prague 10, Hostivar S: Czech Republic S: 21513 Conradia Ct S: Cupertino, CA 95014 S: USA N: Thibaut Varene E: T-Bone@parisc-linux.org Loading Documentation/kprobes.txt +5 −3 Original line number Diff line number Diff line Loading @@ -542,9 +542,11 @@ Kprobes does not use mutexes or allocate memory except during registration and unregistration. Probe handlers are run with preemption disabled. Depending on the architecture, handlers may also run with interrupts disabled. In any case, your handler should not yield the CPU (e.g., by attempting to acquire a semaphore). architecture and optimization state, handlers may also run with interrupts disabled (e.g., kretprobe handlers and optimized kprobe handlers run without interrupt disabled on x86/x86-64). In any case, your handler should not yield the CPU (e.g., by attempting to acquire a semaphore). Since a return probe is implemented by replacing the return address with the trampoline's address, stack backtraces and calls Loading MAINTAINERS +27 −11 Original line number Diff line number Diff line Loading @@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ S: Maintained F: arch/arm/mach-s3c6410/ ARM/S5P ARM ARCHITECTURES M: Kukjin Kim <kgene.kim@samsung.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-s5p*/ ARM/SHMOBILE ARM ARCHITECTURE M: Paul Mundt <lethal@linux-sh.org> M: Magnus Damm <magnus.damm@gmail.com> Loading Loading @@ -1220,7 +1227,7 @@ F: drivers/auxdisplay/ F: include/linux/cfag12864b.h AVR32 ARCHITECTURE M: Haavard Skinnemoen <hskinnemoen@atmel.com> M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> W: http://www.atmel.com/products/AVR32/ W: http://avr32linux.org/ W: http://avrfreaks.net/ Loading @@ -1228,7 +1235,7 @@ S: Supported F: arch/avr32/ AVR32/AT32AP MACHINE SUPPORT M: Haavard Skinnemoen <hskinnemoen@atmel.com> M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> S: Supported F: arch/avr32/mach-at32ap/ Loading Loading @@ -2199,6 +2206,12 @@ W: http://acpi4asus.sf.net S: Maintained F: drivers/platform/x86/eeepc-laptop.c EFIFB FRAMEBUFFER DRIVER L: linux-fbdev@vger.kernel.org M: Peter Jones <pjones@redhat.com> S: Maintained F: drivers/video/efifb.c EFS FILESYSTEM W: http://aeschi.ch.eu.org/efs/ S: Orphan Loading Loading @@ -2662,6 +2675,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git S: Maintained F: Documentation/hwmon/ F: drivers/hwmon/ Loading Loading @@ -3773,9 +3788,8 @@ W: http://www.syskonnect.com S: Supported MATROX FRAMEBUFFER DRIVER M: Petr Vandrovec <vandrove@vc.cvut.cz> L: linux-fbdev@vger.kernel.org S: Maintained S: Orphan F: drivers/video/matrox/matroxfb_* F: include/linux/matroxfb.h Loading Loading @@ -3899,10 +3913,8 @@ F: Documentation/serial/moxa-smartio F: drivers/char/mxser.* MSI LAPTOP SUPPORT M: Lennart Poettering <mzxreary@0pointer.de> M: Lee, Chun-Yi <jlee@novell.com> L: platform-driver-x86@vger.kernel.org W: https://tango.0pointer.de/mailman/listinfo/s270-linux W: http://0pointer.de/lennart/tchibo.html S: Maintained F: drivers/platform/x86/msi-laptop.c Loading @@ -3919,8 +3931,10 @@ S: Supported F: drivers/mfd/ MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM S: Orphan M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git S: Maintained F: drivers/mmc/ F: include/linux/mmc/ Loading Loading @@ -3962,8 +3976,8 @@ S: Maintained F: drivers/net/natsemi.c NCP FILESYSTEM M: Petr Vandrovec <vandrove@vc.cvut.cz> S: Maintained M: Petr Vandrovec <petr@vandrovec.name> S: Odd Fixes F: fs/ncpfs/ NCR DUAL 700 SCSI DRIVER (MICROCHANNEL) Loading Loading @@ -5091,8 +5105,10 @@ S: Maintained F: drivers/mmc/host/sdricoh_cs.c SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER S: Orphan M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git S: Maintained F: drivers/mmc/host/sdhci.* SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) Loading Makefile +12 −1 Original line number Diff line number Diff line VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 36 EXTRAVERSION = -rc5 EXTRAVERSION = -rc7 NAME = Sheep on Meth # *DOCUMENTATION* Loading Loading @@ -568,6 +568,12 @@ endif ifdef CONFIG_FUNCTION_TRACER KBUILD_CFLAGS += -pg ifdef CONFIG_DYNAMIC_FTRACE ifdef CONFIG_HAVE_C_RECORDMCOUNT BUILD_C_RECORDMCOUNT := y export BUILD_C_RECORDMCOUNT endif endif endif # We trigger additional mismatches with less inlining Loading @@ -591,6 +597,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) # conserve stack if available KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) # check for 'asm goto' ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO endif # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments # But warn user when we do so warn-assign = \ Loading arch/Kconfig +3 −0 Original line number Diff line number Diff line Loading @@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI subsystem. Also has support for calculating CPU cycle events to determine how many clock cycles in a given period. config HAVE_ARCH_JUMP_LABEL bool source "kernel/gcov/Kconfig" Loading
CREDITS +4 −4 Original line number Diff line number Diff line Loading @@ -3554,12 +3554,12 @@ E: cvance@nai.com D: portions of the Linux Security Module (LSM) framework and security modules N: Petr Vandrovec E: vandrove@vc.cvut.cz E: petr@vandrovec.name D: Small contributions to ncpfs D: Matrox framebuffer driver S: Chudenicka 8 S: 10200 Prague 10, Hostivar S: Czech Republic S: 21513 Conradia Ct S: Cupertino, CA 95014 S: USA N: Thibaut Varene E: T-Bone@parisc-linux.org Loading
Documentation/kprobes.txt +5 −3 Original line number Diff line number Diff line Loading @@ -542,9 +542,11 @@ Kprobes does not use mutexes or allocate memory except during registration and unregistration. Probe handlers are run with preemption disabled. Depending on the architecture, handlers may also run with interrupts disabled. In any case, your handler should not yield the CPU (e.g., by attempting to acquire a semaphore). architecture and optimization state, handlers may also run with interrupts disabled (e.g., kretprobe handlers and optimized kprobe handlers run without interrupt disabled on x86/x86-64). In any case, your handler should not yield the CPU (e.g., by attempting to acquire a semaphore). Since a return probe is implemented by replacing the return address with the trampoline's address, stack backtraces and calls Loading
MAINTAINERS +27 −11 Original line number Diff line number Diff line Loading @@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ S: Maintained F: arch/arm/mach-s3c6410/ ARM/S5P ARM ARCHITECTURES M: Kukjin Kim <kgene.kim@samsung.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-s5p*/ ARM/SHMOBILE ARM ARCHITECTURE M: Paul Mundt <lethal@linux-sh.org> M: Magnus Damm <magnus.damm@gmail.com> Loading Loading @@ -1220,7 +1227,7 @@ F: drivers/auxdisplay/ F: include/linux/cfag12864b.h AVR32 ARCHITECTURE M: Haavard Skinnemoen <hskinnemoen@atmel.com> M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> W: http://www.atmel.com/products/AVR32/ W: http://avr32linux.org/ W: http://avrfreaks.net/ Loading @@ -1228,7 +1235,7 @@ S: Supported F: arch/avr32/ AVR32/AT32AP MACHINE SUPPORT M: Haavard Skinnemoen <hskinnemoen@atmel.com> M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> S: Supported F: arch/avr32/mach-at32ap/ Loading Loading @@ -2199,6 +2206,12 @@ W: http://acpi4asus.sf.net S: Maintained F: drivers/platform/x86/eeepc-laptop.c EFIFB FRAMEBUFFER DRIVER L: linux-fbdev@vger.kernel.org M: Peter Jones <pjones@redhat.com> S: Maintained F: drivers/video/efifb.c EFS FILESYSTEM W: http://aeschi.ch.eu.org/efs/ S: Orphan Loading Loading @@ -2662,6 +2675,8 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git S: Maintained F: Documentation/hwmon/ F: drivers/hwmon/ Loading Loading @@ -3773,9 +3788,8 @@ W: http://www.syskonnect.com S: Supported MATROX FRAMEBUFFER DRIVER M: Petr Vandrovec <vandrove@vc.cvut.cz> L: linux-fbdev@vger.kernel.org S: Maintained S: Orphan F: drivers/video/matrox/matroxfb_* F: include/linux/matroxfb.h Loading Loading @@ -3899,10 +3913,8 @@ F: Documentation/serial/moxa-smartio F: drivers/char/mxser.* MSI LAPTOP SUPPORT M: Lennart Poettering <mzxreary@0pointer.de> M: Lee, Chun-Yi <jlee@novell.com> L: platform-driver-x86@vger.kernel.org W: https://tango.0pointer.de/mailman/listinfo/s270-linux W: http://0pointer.de/lennart/tchibo.html S: Maintained F: drivers/platform/x86/msi-laptop.c Loading @@ -3919,8 +3931,10 @@ S: Supported F: drivers/mfd/ MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM S: Orphan M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git S: Maintained F: drivers/mmc/ F: include/linux/mmc/ Loading Loading @@ -3962,8 +3976,8 @@ S: Maintained F: drivers/net/natsemi.c NCP FILESYSTEM M: Petr Vandrovec <vandrove@vc.cvut.cz> S: Maintained M: Petr Vandrovec <petr@vandrovec.name> S: Odd Fixes F: fs/ncpfs/ NCR DUAL 700 SCSI DRIVER (MICROCHANNEL) Loading Loading @@ -5091,8 +5105,10 @@ S: Maintained F: drivers/mmc/host/sdricoh_cs.c SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER S: Orphan M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git S: Maintained F: drivers/mmc/host/sdhci.* SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) Loading
Makefile +12 −1 Original line number Diff line number Diff line VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 36 EXTRAVERSION = -rc5 EXTRAVERSION = -rc7 NAME = Sheep on Meth # *DOCUMENTATION* Loading Loading @@ -568,6 +568,12 @@ endif ifdef CONFIG_FUNCTION_TRACER KBUILD_CFLAGS += -pg ifdef CONFIG_DYNAMIC_FTRACE ifdef CONFIG_HAVE_C_RECORDMCOUNT BUILD_C_RECORDMCOUNT := y export BUILD_C_RECORDMCOUNT endif endif endif # We trigger additional mismatches with less inlining Loading @@ -591,6 +597,11 @@ KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) # conserve stack if available KBUILD_CFLAGS += $(call cc-option,-fconserve-stack) # check for 'asm goto' ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y) KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO endif # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments # But warn user when we do so warn-assign = \ Loading
arch/Kconfig +3 −0 Original line number Diff line number Diff line Loading @@ -158,4 +158,7 @@ config HAVE_PERF_EVENTS_NMI subsystem. Also has support for calculating CPU cycle events to determine how many clock cycles in a given period. config HAVE_ARCH_JUMP_LABEL bool source "kernel/gcov/Kconfig"
