diff --git a/baseconfig/CONFIG_KPROBE_EVENT b/baseconfig/CONFIG_KPROBE_EVENT deleted file mode 100644 index 1ba78399b..000000000 --- a/baseconfig/CONFIG_KPROBE_EVENT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_KPROBE_EVENT=y diff --git a/baseconfig/CONFIG_KPROBE_EVENTS b/baseconfig/CONFIG_KPROBE_EVENTS new file mode 100644 index 000000000..2111c5d1a --- /dev/null +++ b/baseconfig/CONFIG_KPROBE_EVENTS @@ -0,0 +1 @@ +CONFIG_KPROBE_EVENTS=y diff --git a/baseconfig/CONFIG_UPROBE_EVENT b/baseconfig/CONFIG_UPROBE_EVENT deleted file mode 100644 index aba82daa5..000000000 --- a/baseconfig/CONFIG_UPROBE_EVENT +++ /dev/null @@ -1 +0,0 @@ -CONFIG_UPROBE_EVENT=y diff --git a/baseconfig/CONFIG_UPROBE_EVENTS b/baseconfig/CONFIG_UPROBE_EVENTS new file mode 100644 index 000000000..81f7be965 --- /dev/null +++ b/baseconfig/CONFIG_UPROBE_EVENTS @@ -0,0 +1 @@ +CONFIG_UPROBE_EVENTS=y diff --git a/gitrev b/gitrev index 7173ea9a0..b7ba475ea 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -c82be9d2244aacea9851c86f4fb74694c99cd874 +ec3b93ae0bf4742e9cbb40e1964129926c1464e0 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 901119211..bcc018653 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2562,7 +2562,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5580,7 +5580,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ee57765e5..e2ffa03d1 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2543,7 +2543,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5557,7 +5557,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 995fa89b4..d30434604 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2752,7 +2752,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -6109,7 +6109,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index c7a10d987..0c521f1a6 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2635,7 +2635,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5748,7 +5748,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index e10ac3725..fe7ed9997 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2616,7 +2616,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5725,7 +5725,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 8050c2de4..188c19a1d 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2733,7 +2733,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -6086,7 +6086,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 6002064ca..5c21d92cc 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -2471,7 +2471,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5314,7 +5314,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 82b8f9ae6..0831e8936 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -2491,7 +2491,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5336,7 +5336,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d47c0d982..7af084925 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2491,7 +2491,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5336,7 +5336,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-i686.config b/kernel-i686.config index a3c3eed6a..7ba82ca41 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2471,7 +2471,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5314,7 +5314,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 7b2e3556c..cc7331921 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -2367,7 +2367,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5144,7 +5144,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 39559e713..1d7d6b227 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -2347,7 +2347,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5120,7 +5120,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 93937b4df..d19d366be 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2313,7 +2313,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5073,7 +5073,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index f983a8f66..987d2e1c0 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2293,7 +2293,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5049,7 +5049,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index 21e07cefb..f62c03e85 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -2312,7 +2312,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5072,7 +5072,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index af1bd6134..d34c46840 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -2292,7 +2292,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5048,7 +5048,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 300c8b13f..6f7436a7f 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2261,7 +2261,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -4970,7 +4970,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 297e1a581..8882f74f7 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2241,7 +2241,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -4946,7 +4946,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index b9cbc61d6..97c127ecd 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2528,7 +2528,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5368,7 +5368,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e244dcbc6..29fded28a 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2508,7 +2508,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -5346,7 +5346,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m diff --git a/kernel.spec b/kernel.spec index 1fa669142..7e38fd385 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2163,6 +2163,9 @@ fi # # %changelog +* Wed Mar 08 2017 Laura Abbott - 4.11.0-0.rc1.git1.1 +- Linux v4.11-rc1-88-gec3b93a + * Wed Mar 08 2017 Laura Abbott - Reenable debugging options. diff --git a/sources b/sources index 442f7a134..c4cc9182c 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8 SHA512 (patch-4.11-rc1.xz) = a7b11ee0f2faedb2415effd3ad49e5309e30b3e57a49106a18d21628f4d08b988112086b080d4620bd9e00b07ec2751a5bfe05c348cfd343020c39d4d18faa81 +SHA512 (patch-4.11-rc1-git1.xz) = 9e43d4946b74fdc2eaaf343b120c92577ef1b1ad6f928176e77c01c89f8226377bd4d27296ee021bc0b8e612dbc70b7ba6d81fd523871d51f0f984f3124e3336