diff options
author | Joan Figueras | 2015-12-10 21:59:56 +0000 |
---|---|---|
committer | Joan Figueras | 2015-12-10 21:59:56 +0000 |
commit | 91706d2c69b971be2591f0dba1dfa220f39f25dc (patch) | |
tree | ebcb35ccc65ecc564b819f6d9bb7588d11d1d6e7 | |
parent | c4712d5ef0748f343a1ee08d2d06f6b728bdb7e3 (diff) | |
download | aur-91706d2c69b971be2591f0dba1dfa220f39f25dc.tar.gz |
Update to stable 4.3.1
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch | 48 | ||||
-rw-r--r-- | 0001-block-loop-convert-to-per-device-workqueue.patch | 133 | ||||
-rw-r--r-- | 0001-make_flush_workqueue_non_gpl.patch | 34 | ||||
-rw-r--r-- | 0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch | 52 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | bitmap-enable-booting-for-dm-md-raid1.patch | 83 | ||||
-rw-r--r-- | config | 12 | ||||
-rw-r--r-- | config.x86_64 | 12 |
9 files changed, 28 insertions, 372 deletions
@@ -1,5 +1,7 @@ +# Generated by mksrcinfo v8 +# Thu Dec 10 21:58:11 UTC 2015 pkgbase = linux-bld - pkgver = 4.3 + pkgver = 4.3.1 pkgrel = 1 url = https://github.com/rmullick/linux arch = i686 @@ -11,8 +13,8 @@ pkgbase = linux-bld options = !strip source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.3.tar.sign - source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.sign + source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.3.1.sign source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz source = config source = config.x86_64 @@ -24,11 +26,11 @@ pkgbase = linux-bld source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.3.patch sha256sums = 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae sha256sums = SKIP - sha256sums = 605d6b6fbf20baf320c652653044b8331ea71829b8894934245ce658ba329305 + sha256sums = 82caff48806796418f445d0a87698abedfaaccfdc7b63059166b788e0cfd144b sha256sums = SKIP sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791 - sha256sums = 596958c9c4b632fdf5e0cdc677859dccac4304ad07a217c9bcb0e4fa58dbea16 - sha256sums = 333c14024cc8948f0f205f4eceac30060494d1ef0a785127500f5f568d36d38a + sha256sums = f4084c6d43abc40819f4535f827d3d8e643d25e67fedf0bab46346ead8c08b84 + sha256sums = 98caa62b4759f6ae180660cc1be4aeda7198e50fb7cf51aee4e677ae6ee2d19e sha256sums = 8da1d80c0bd568781568da4f669f39fed94523312b9d37477836bfa6faa9527f sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = ebeb62206999b2749ac43bb287a6a2a5db4f6b1b688a90cefa1ceb5db94aa490 @@ -44,14 +46,14 @@ pkgname = linux-bld depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = kernel26-bld=4.3 + provides = kernel26-bld=4.3.1 conflicts = kernel26-bld replaces = kernel26-bld backup = etc/mkinitcpio.d/linux-bld.preset pkgname = linux-bld-headers pkgdesc = Header files and scripts for building modules for Linux-bld kernel - provides = kernel26-bld-headers=4.3 + provides = kernel26-bld-headers=4.3.1 conflicts = kernel26-bld-headers replaces = kernel26-bld-headers diff --git a/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch b/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch deleted file mode 100644 index 1d5871606e61..000000000000 --- a/0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7bee8b08c428b63aa4a3765bb907602e36355378 Mon Sep 17 00:00:00 2001 -From: Chris Mason <clm@fb.com> -Date: Tue, 14 Jul 2015 16:25:30 -0400 -Subject: [PATCH] Bluetooth: btbcm: allow btbcm_read_verbose_config to fail on - Apple - -Commit 1c8ba6d013 moved around the setup code for broadcomm chips, -and also added btbcm_read_verbose_config() to read extra information -about the hardware. It's returning errors on some macbooks: - -Bluetooth: hci0: BCM: Read verbose config info failed (-16) - -Which makes us error out of the setup function. Since this -probe isn't critical to operate the chip, this patch just changes -things to carry on when it fails. - -Signed-off-by: Chris Mason <clm@fb.com> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> -Cc: stable@vger.kernel.org # v4.1 ---- - drivers/bluetooth/btbcm.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c -index 1e1a432..9ceb8ac 100644 ---- a/drivers/bluetooth/btbcm.c -+++ b/drivers/bluetooth/btbcm.c -@@ -472,12 +472,11 @@ int btbcm_setup_apple(struct hci_dev *hdev) - - /* Read Verbose Config Version Info */ - skb = btbcm_read_verbose_config(hdev); -- if (IS_ERR(skb)) -- return PTR_ERR(skb); -- -- BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1], -- get_unaligned_le16(skb->data + 5)); -- kfree_skb(skb); -+ if (!IS_ERR(skb)) { -+ BT_INFO("%s: BCM: chip id %u build %4.4u", hdev->name, skb->data[1], -+ get_unaligned_le16(skb->data + 5)); -+ kfree_skb(skb); -+ } - - set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks); - --- -2.4.5 - diff --git a/0001-block-loop-convert-to-per-device-workqueue.patch b/0001-block-loop-convert-to-per-device-workqueue.patch deleted file mode 100644 index effd4faaf5b7..000000000000 --- a/0001-block-loop-convert-to-per-device-workqueue.patch +++ /dev/null @@ -1,133 +0,0 @@ -From ebff6d5c91195d37e33b7bbfb36c6cc0119aa06f Mon Sep 17 00:00:00 2001 -From: Ming Lei <ming.lei@canonical.com> -Date: Tue, 5 May 2015 19:49:54 +0800 -Subject: [PATCH 1/2] block: loop: convert to per-device workqueue - -Documentation/workqueue.txt: - If there is dependency among multiple work items used - during memory reclaim, they should be queued to separate - wq each with WQ_MEM_RECLAIM. - -Loop devices can be stacked, so we have to convert to per-device -workqueue. One example is Fedora live CD. - -Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778 -Cc: stable@vger.kernel.org (v4.0) -Cc: Justin M. Forbes <jforbes@fedoraproject.org> -Signed-off-by: Ming Lei <ming.lei@canonical.com> -Acked-by: Tejun Heo <tj@kernel.org> -Signed-off-by: Jens Axboe <axboe@fb.com> ---- - drivers/block/loop.c | 30 ++++++++++++++---------------- - drivers/block/loop.h | 1 + - 2 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index d7173cb..9786aa3 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -86,8 +86,6 @@ static DEFINE_MUTEX(loop_index_mutex); - static int max_part; - static int part_shift; - --static struct workqueue_struct *loop_wq; -- - static int transfer_xor(struct loop_device *lo, int cmd, - struct page *raw_page, unsigned raw_off, - struct page *loop_page, unsigned loop_off, -@@ -725,6 +723,12 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, - size = get_loop_size(lo, file); - if ((loff_t)(sector_t)size != size) - goto out_putf; -+ error = -ENOMEM; -+ lo->wq = alloc_workqueue("kloopd%d", -+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0, -+ lo->lo_number); -+ if (!lo->wq) -+ goto out_putf; - - error = 0; - -@@ -872,6 +876,8 @@ static int loop_clr_fd(struct loop_device *lo) - lo->lo_flags = 0; - if (!part_shift) - lo->lo_disk->flags |= GENHD_FL_NO_PART_SCAN; -+ destroy_workqueue(lo->wq); -+ lo->wq = NULL; - mutex_unlock(&lo->lo_ctl_mutex); - /* - * Need not hold lo_ctl_mutex to fput backing file. -@@ -1425,9 +1431,13 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, - const struct blk_mq_queue_data *bd) - { - struct loop_cmd *cmd = blk_mq_rq_to_pdu(bd->rq); -+ struct loop_device *lo = cmd->rq->q->queuedata; - - blk_mq_start_request(bd->rq); - -+ if (lo->lo_state != Lo_bound) -+ return -EIO; -+ - if (cmd->rq->cmd_flags & REQ_WRITE) { - struct loop_device *lo = cmd->rq->q->queuedata; - bool need_sched = true; -@@ -1441,9 +1451,9 @@ static int loop_queue_rq(struct blk_mq_hw_ctx *hctx, - spin_unlock_irq(&lo->lo_lock); - - if (need_sched) -- queue_work(loop_wq, &lo->write_work); -+ queue_work(lo->wq, &lo->write_work); - } else { -- queue_work(loop_wq, &cmd->read_work); -+ queue_work(lo->wq, &cmd->read_work); - } - - return BLK_MQ_RQ_QUEUE_OK; -@@ -1455,9 +1465,6 @@ static void loop_handle_cmd(struct loop_cmd *cmd) - struct loop_device *lo = cmd->rq->q->queuedata; - int ret = -EIO; - -- if (lo->lo_state != Lo_bound) -- goto failed; -- - if (write && (lo->lo_flags & LO_FLAGS_READ_ONLY)) - goto failed; - -@@ -1806,13 +1813,6 @@ static int __init loop_init(void) - goto misc_out; - } - -- loop_wq = alloc_workqueue("kloopd", -- WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0); -- if (!loop_wq) { -- err = -ENOMEM; -- goto misc_out; -- } -- - blk_register_region(MKDEV(LOOP_MAJOR, 0), range, - THIS_MODULE, loop_probe, NULL, NULL); - -@@ -1850,8 +1850,6 @@ static void __exit loop_exit(void) - blk_unregister_region(MKDEV(LOOP_MAJOR, 0), range); - unregister_blkdev(LOOP_MAJOR, "loop"); - -- destroy_workqueue(loop_wq); -- - misc_deregister(&loop_misc); - } - -diff --git a/drivers/block/loop.h b/drivers/block/loop.h -index 301c27f..49564ed 100644 ---- a/drivers/block/loop.h -+++ b/drivers/block/loop.h -@@ -54,6 +54,7 @@ struct loop_device { - gfp_t old_gfp_mask; - - spinlock_t lo_lock; -+ struct workqueue_struct *wq; - struct list_head write_cmd_head; - struct work_struct write_work; - bool write_started; --- -2.4.5 - diff --git a/0001-make_flush_workqueue_non_gpl.patch b/0001-make_flush_workqueue_non_gpl.patch deleted file mode 100644 index 1ba8cb9b3de0..000000000000 --- a/0001-make_flush_workqueue_non_gpl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1dadafa86a779884f14a6e7a3ddde1a57b0a0a65 Mon Sep 17 00:00:00 2001 -From: Tim Gardner <tim.gardner@canonical.com> -Date: Tue, 4 Aug 2015 11:26:04 -0600 -Subject: workqueue: Make flush_workqueue() available again to non GPL modules - -Commit 37b1ef31a568fc02e53587620226e5f3c66454c8 ("workqueue: move -flush_scheduled_work() to workqueue.h") moved the exported non GPL -flush_scheduled_work() from a function to an inline wrapper. -Unfortunately, it directly calls flush_workqueue() which is a GPL function. -This has the effect of changing the licensing requirement for this function -and makes it unavailable to non GPL modules. - -See commit ad7b1f841f8a54c6d61ff181451f55b68175e15a ("workqueue: Make -schedule_work() available again to non GPL modules") for precedent. - -Signed-off-by: Tim Gardner <tim.gardner@canonical.com> -Signed-off-by: Tejun Heo <tj@kernel.org> - -diff --git a/kernel/workqueue.c b/kernel/workqueue.c -index 4c4f061..a413acb 100644 ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -2614,7 +2614,7 @@ void flush_workqueue(struct workqueue_struct *wq) - out_unlock: - mutex_unlock(&wq->mutex); - } --EXPORT_SYMBOL_GPL(flush_workqueue); -+EXPORT_SYMBOL(flush_workqueue); - - /** - * drain_workqueue - drain a workqueue --- -cgit v0.10.2 - diff --git a/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch b/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch deleted file mode 100644 index fcad0c0b9592..000000000000 --- a/0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 63eb7031005b6f22fc1dab9f0c29435f1b52a96b Mon Sep 17 00:00:00 2001 -From: Ming Lei <ming.lei@canonical.com> -Date: Tue, 5 May 2015 19:49:55 +0800 -Subject: [PATCH 2/2] block: loop: avoiding too many pending per work I/O - -If there are too many pending per work I/O, too many -high priority work thread can be generated so that -system performance can be effected. - -This patch limits the max_active parameter of workqueue as 16. - -This patch fixes Fedora 22 live booting performance -regression when it is booted from squashfs over dm -based on loop, and looks the following reasons are -related with the problem: - -- not like other filesyststems(such as ext4), squashfs -is a bit special, and I observed that increasing I/O jobs -to access file in squashfs only improve I/O performance a -little, but it can make big difference for ext4 - -- nested loop: both squashfs.img and ext3fs.img are mounted -as loop block, and ext3fs.img is inside the squashfs - -- during booting, lots of tasks may run concurrently - -Fixes: b5dd2f6047ca108001328aac0e8588edd15f1778 -Cc: stable@vger.kernel.org (v4.0) -Cc: Justin M. Forbes <jforbes@fedoraproject.org> -Signed-off-by: Ming Lei <ming.lei@canonical.com> -Acked-by: Tejun Heo <tj@kernel.org> -Signed-off-by: Jens Axboe <axboe@fb.com> ---- - drivers/block/loop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/block/loop.c b/drivers/block/loop.c -index 9786aa3..cef6fa8 100644 ---- a/drivers/block/loop.c -+++ b/drivers/block/loop.c -@@ -725,7 +725,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, - goto out_putf; - error = -ENOMEM; - lo->wq = alloc_workqueue("kloopd%d", -- WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 0, -+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 16, - lo->lo_number); - if (!lo->wq) - goto out_putf; --- -2.4.5 - @@ -7,7 +7,7 @@ pkgbase=linux-bld # Build kernel with a different name _srcname=linux-4.3 pkgname=(linux-bld linux-bld-headers) _kernelname=-bld -pkgver=4.3 +pkgver=4.3.1 pkgrel=1 arch=('i686' 'x86_64') url="https://github.com/rmullick/linux" @@ -35,11 +35,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae' 'SKIP' - '605d6b6fbf20baf320c652653044b8331ea71829b8894934245ce658ba329305' + '82caff48806796418f445d0a87698abedfaaccfdc7b63059166b788e0cfd144b' 'SKIP' 'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791' - '596958c9c4b632fdf5e0cdc677859dccac4304ad07a217c9bcb0e4fa58dbea16' - '333c14024cc8948f0f205f4eceac30060494d1ef0a785127500f5f568d36d38a' + 'f4084c6d43abc40819f4535f827d3d8e643d25e67fedf0bab46346ead8c08b84' + '98caa62b4759f6ae180660cc1be4aeda7198e50fb7cf51aee4e677ae6ee2d19e' '8da1d80c0bd568781568da4f669f39fed94523312b9d37477836bfa6faa9527f' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' 'ebeb62206999b2749ac43bb287a6a2a5db4f6b1b688a90cefa1ceb5db94aa490' diff --git a/bitmap-enable-booting-for-dm-md-raid1.patch b/bitmap-enable-booting-for-dm-md-raid1.patch deleted file mode 100644 index 7b29e82f7304..000000000000 --- a/bitmap-enable-booting-for-dm-md-raid1.patch +++ /dev/null @@ -1,83 +0,0 @@ -Subject: [PATCH] Enable loading of bitmaps for dm-md-raid1. - -This is also a temporary hack to systems with junk in the rest -of the bitmap super (instead of zeroes) to boot. This is done by -checking mddev->sync_super (which is exclusively set by dm-raid) -is null. - -These changes also include zeroing of most bitmap pages while -allocating so we are sure that the junk is not coming from memory. - -Signed-off-by: Neil Brown <neilb@suse.de> -Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com> ---- -diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c -index 135a090..dfa5ef3 100644 ---- a/drivers/md/bitmap.c -+++ b/drivers/md/bitmap.c -@@ -494,7 +494,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) - bitmap_super_t *sb; - unsigned long chunksize, daemon_sleep, write_behind; - -- bitmap->storage.sb_page = alloc_page(GFP_KERNEL); -+ bitmap->storage.sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (bitmap->storage.sb_page == NULL) - return -ENOMEM; - bitmap->storage.sb_page->index = 0; -@@ -541,6 +541,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap) - sb->state = cpu_to_le32(bitmap->flags); - bitmap->events_cleared = bitmap->mddev->events; - sb->events_cleared = cpu_to_le64(bitmap->mddev->events); -+ bitmap->mddev->bitmap_info.nodes = 0; - - kunmap_atomic(sb); - -@@ -568,7 +569,7 @@ static int bitmap_read_sb(struct bitmap *bitmap) - goto out_no_sb; - } - /* page 0 is the superblock, read it... */ -- sb_page = alloc_page(GFP_KERNEL); -+ sb_page = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (!sb_page) - return -ENOMEM; - bitmap->storage.sb_page = sb_page; -@@ -611,8 +612,15 @@ re_read: - daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ; - write_behind = le32_to_cpu(sb->write_behind); - sectors_reserved = le32_to_cpu(sb->sectors_reserved); -- nodes = le32_to_cpu(sb->nodes); -- strlcpy(bitmap->mddev->bitmap_info.cluster_name, sb->cluster_name, 64); -+ /* XXX: This is an ugly hack to ensure that we don't use clustering -+ in case dm-raid is in use and the nodes written in bitmap_sb -+ is erroneous. -+ */ -+ if (!bitmap->mddev->sync_super) { -+ nodes = le32_to_cpu(sb->nodes); -+ strlcpy(bitmap->mddev->bitmap_info.cluster_name, -+ sb->cluster_name, 64); -+ } - - /* verify that the bitmap-specific fields are valid */ - if (sb->magic != cpu_to_le32(BITMAP_MAGIC)) -@@ -649,7 +657,7 @@ re_read: - goto out; - } - events = le64_to_cpu(sb->events); -- if (!nodes && (events < bitmap->mddev->events)) { -+ if (err == 0 && !nodes && (events < bitmap->mddev->events)) { - printk(KERN_INFO - "%s: bitmap file is out of date (%llu < %llu) " - "-- forcing full recovery\n", -diff --git a/drivers/md/md.c b/drivers/md/md.c -index 4dbed4a..6bd8bc3 100644 ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -7415,7 +7415,7 @@ int md_setup_cluster(struct mddev *mddev, int nodes) - err = request_module("md-cluster"); - if (err) { - pr_err("md-cluster module not found.\n"); -- return err; -+ return -ENOENT; - } - - spin_lock(&pers_lock); @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.3.0 Kernel Configuration +# Linux/x86 4.3.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -200,7 +200,7 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y -# CONFIG_BPF_SYSCALL is not set +CONFIG_BPF_SYSCALL=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -1771,7 +1771,8 @@ CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_NETtel is not set # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m @@ -1834,7 +1835,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y CONFIG_OF=y # CONFIG_OF_UNITTEST is not set CONFIG_OF_PROMTREE=y @@ -3935,7 +3936,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m -# CONFIG_SENSORS_NCT7904 is not set +CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -7402,6 +7403,7 @@ CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y +CONFIG_BPF_EVENTS=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y diff --git a/config.x86_64 b/config.x86_64 index 73b802e68ecc..aaead876713c 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.3.0 Kernel Configuration +# Linux/x86 4.3.1-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -209,7 +209,7 @@ CONFIG_EPOLL=y CONFIG_SIGNALFD=y CONFIG_TIMERFD=y CONFIG_EVENTFD=y -# CONFIG_BPF_SYSCALL is not set +CONFIG_BPF_SYSCALL=y CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_ADVISE_SYSCALLS=y @@ -1758,7 +1758,8 @@ CONFIG_MTD_SCB2_FLASH=m # CONFIG_MTD_NETtel is not set # CONFIG_MTD_L440GX is not set CONFIG_MTD_PCI=m -# CONFIG_MTD_PCMCIA is not set +CONFIG_MTD_PCMCIA=m +# CONFIG_MTD_PCMCIA_ANONYMOUS is not set # CONFIG_MTD_GPIO_ADDR is not set # CONFIG_MTD_INTEL_VR_NOR is not set CONFIG_MTD_PLATRAM=m @@ -1820,7 +1821,7 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_LIMIT=20 # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set -# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_BLOCK=y # CONFIG_OF is not set CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_PARPORT=m @@ -3807,7 +3808,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NCT6683=m CONFIG_SENSORS_NCT6775=m CONFIG_SENSORS_NCT7802=m -# CONFIG_SENSORS_NCT7904 is not set +CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m @@ -7140,6 +7141,7 @@ CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENT=y CONFIG_UPROBE_EVENT=y +CONFIG_BPF_EVENTS=y CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y |