diff options
author | André Fabian Silva Delgado | 2016-02-03 01:14:15 -0300 |
---|---|---|
committer | André Fabian Silva Delgado | 2016-02-03 01:14:15 -0300 |
commit | da41b04e89d0694a874a34d7fa764cf907268298 (patch) | |
tree | 5a1589e66277e27aad5573e8f9143d2c5f40872a | |
parent | 04d77b7e2e5b094d0b8e90f76ef6f04187797b52 (diff) | |
download | aur-da41b04e89d0694a874a34d7fa764cf907268298.tar.gz |
Update to 4.4.1_gnu-1
* fix debug output - FS#47849 -> https://bugs.archlinux.org/task/47849
* fix FS#47757 -> https://bugs.archlinux.org/task/47757
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | 0001-4.4-revert-btrfs.patch | 78 | ||||
-rw-r--r-- | 0001-4.4-revert-xfs.patch | 39 | ||||
-rw-r--r-- | CVE-2016-0728.patch | 78 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | config.armv7h | 18 | ||||
-rw-r--r-- | config.i686 | 2 | ||||
-rw-r--r-- | config.x86_64 | 2 |
8 files changed, 171 insertions, 125 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Jan 27 09:48:20 UTC 2016 +# Wed Feb 3 04:13:42 UTC 2016 pkgbase = linux-libre - pkgver = 4.4_gnu - pkgrel = 4 + pkgver = 4.4.1_gnu + pkgrel = 1 url = http://linux-libre.fsfla.org/ arch = i686 arch = x86_64 @@ -16,6 +16,8 @@ pkgbase = linux-libre options = !strip source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4-gnu/linux-libre-4.4-gnu.tar.xz source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4-gnu/linux-libre-4.4-gnu.tar.xz.sign + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.1-gnu/patch-4.4-gnu-4.4.1-gnu.xz + source = http://linux-libre.fsfla.org/pub/linux-libre/releases/4.4.1-gnu/patch-4.4-gnu-4.4.1-gnu.xz.sign source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig source = https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm @@ -28,12 +30,13 @@ pkgbase = linux-libre source = linux.preset source = change-default-console-loglevel.patch source = tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch - source = CVE-2016-0728.patch source = 0001-sdhci-revert.patch + source = 0001-4.4-revert-btrfs.patch + source = 0001-4.4-revert-xfs.patch source = 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch source = 0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.4/rcn-libre-4.4-armv7-x3.patch - source = https://repo.parabola.nu/other/rcn-libre/patches/4.4/rcn-libre-4.4-armv7-x3.patch.sig + source = https://repo.parabola.nu/other/rcn-libre/patches/4.4.1/rcn-libre-4.4.1-armv7-x5.patch + source = https://repo.parabola.nu/other/rcn-libre/patches/4.4.1/rcn-libre-4.4.1-armv7-x5.patch.sig source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch source = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch source = 0003-SMILE-Plug-device-tree-file.patch @@ -45,23 +48,26 @@ pkgbase = linux-libre source = 0009-ARM-dts-dove-add-Dove-divider-clocks.patch sha256sums = f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0 sha256sums = SKIP + sha256sums = ed09b329d879bb758374b6a76acb841cdf63a6638720378657fb2b6eeed6b265 + sha256sums = SKIP sha256sums = bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494 sha256sums = SKIP sha256sums = 13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74 sha256sums = SKIP sha256sums = 6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a sha256sums = SKIP - sha256sums = 12bab1b743a4ee7602ad355f1d4582799f38d125202cffeea1c395bece25776c - sha256sums = d67f719de2d9b9cba751b0ad9e0d41f8ccf2dd301961c975b55edf740c34fd6c - sha256sums = 98873b55f22ef3210c25e5f3147120d66cb1258906c7347e4f526ed6917013e0 + sha256sums = f231fb6dae7ecf8caec8c6e8c7822aa7d118234f380ff7d3b0a6a29e9df38be6 + sha256sums = 0b1ec8df30636d0d307fae03240294d4ddc05ee39c68c141fee9b1230e09aeaa + sha256sums = a24715398ccaf8043a77728cafc6fa9edb898f89d09a66357f2e64ba86264a37 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d - sha256sums = 03bed5b1c6ef34a917e218a46d38cd1347c5ab5693131996113c6cad275dc4e9 sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375 + sha256sums = 51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958 + sha256sums = ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad sha256sums = 61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc sha256sums = 3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808 - sha256sums = 031beb6ec9b55a0425b938141ec06e200ca17cc50d69f605643b8ddb6065a55e + sha256sums = 989d87384f448e942fa8656f6c4ce7212670fdfbf5dde567ad9f31ec6e316976 sha256sums = SKIP sha256sums = a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817 sha256sums = 486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4 @@ -81,20 +87,20 @@ pkgname = linux-libre depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = linux=4.4 + provides = linux=4.4.1 conflicts = replaces = linux backup = etc/mkinitcpio.d/linux-libre.preset pkgname = linux-libre-headers pkgdesc = Header files and scripts for building modules for Linux-libre kernel - provides = linux-headers=4.4 + provides = linux-headers=4.4.1 conflicts = replaces = linux-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=4.4 + provides = linux-docs=4.4.1 conflicts = replaces = linux-docs diff --git a/0001-4.4-revert-btrfs.patch b/0001-4.4-revert-btrfs.patch new file mode 100644 index 000000000000..4b56e242ec2d --- /dev/null +++ b/0001-4.4-revert-btrfs.patch @@ -0,0 +1,78 @@ +From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001 +From: David Sterba <dsterba@suse.com> +Date: Mon, 25 Jan 2016 11:02:06 +0100 +Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()" + +This reverts commit 696249132158014d594896df3a81390616069c5c. The +cleaner thread can block freezing when there's a snapshot cleaning in +progress and the other threads get suspended first. From the logs +provided by Martin we're waiting for reading extent pages: + +kernel: PM: Syncing filesystems ... done. +kernel: Freezing user space processes ... (elapsed 0.015 seconds) done. +kernel: Freezing remaining freezable tasks ... +kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0): +kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000 +kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff +kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451 +kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020 +kernel: Call Trace: +kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c +kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c +kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8 +kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e +kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44 +kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 +kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2 +kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30 +kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73 +kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72 +kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a +kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203 +kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c +kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9 +kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45 +kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b +kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a +kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736 +kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7 +kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae +kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4 +kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664 +kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167 +kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0 +kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b +kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33 +kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d +kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 +kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70 +kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16 + +As this affects a released kernel (4.4) we need a minimal fix for +stable kernels. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361 +Reported-by: Martin Ziegler <ziegler@uni-freiburg.de> +CC: stable@vger.kernel.org # 4.4 +CC: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: David Sterba <dsterba@suse.com> +Signed-off-by: Chris Mason <clm@fb.com> +--- + fs/btrfs/disk-io.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c +index 26ef141..404e894 100644 +--- a/fs/btrfs/disk-io.c ++++ b/fs/btrfs/disk-io.c +@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg) + int again; + struct btrfs_trans_handle *trans; + +- set_freezable(); + do { + again = 0; + +-- +cgit v0.12 + diff --git a/0001-4.4-revert-xfs.patch b/0001-4.4-revert-xfs.patch new file mode 100644 index 000000000000..93eb1929ff32 --- /dev/null +++ b/0001-4.4-revert-xfs.patch @@ -0,0 +1,39 @@ +From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001 +From: Dave Chinner <david@fromorbit.com> +Date: Tue, 19 Jan 2016 08:21:46 +1100 +Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread" + +This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it +prevents machines from suspending. This regression occurs when the +xfsaild is idle on entry to suspend, and so there s no activity to +wake it from it's idle sleep and hence see that it is supposed to +freeze. Hence the freezer times out waiting for it and suspend is +cancelled. + +There is no obvious fix for this short of freezing the filesystem +properly, so revert this change for now. + +cc: <stable@vger.kernel.org> # 4.4 +Signed-off-by: Dave Chinner <david@fromorbit.com> +Acked-by: Jiri Kosina <jkosina@suse.cz> +Reviewed-by: Brian Foster <bfoster@redhat.com> +Signed-off-by: Dave Chinner <david@fromorbit.com> +--- + fs/xfs/xfs_trans_ail.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c +index aa67339..4f18fd9 100644 +--- a/fs/xfs/xfs_trans_ail.c ++++ b/fs/xfs/xfs_trans_ail.c +@@ -497,7 +497,6 @@ xfsaild( + long tout = 0; /* milliseconds */ + + current->flags |= PF_MEMALLOC; +- set_freezable(); + + while (!kthread_should_stop()) { + if (tout && tout <= 20) +-- +cgit v0.12 + diff --git a/CVE-2016-0728.patch b/CVE-2016-0728.patch deleted file mode 100644 index e915d8219e1a..000000000000 --- a/CVE-2016-0728.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 Mon Sep 17 00:00:00 2001 -From: Yevgeny Pats <yevgeny@perception-point.io> -Date: Tue, 19 Jan 2016 22:09:04 +0000 -Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring() - -This fixes CVE-2016-0728. - -If a thread is asked to join as a session keyring the keyring that's already -set as its session, we leak a keyring reference. - -This can be tested with the following program: - - #include <stddef.h> - #include <stdio.h> - #include <sys/types.h> - #include <keyutils.h> - - int main(int argc, const char *argv[]) - { - int i = 0; - key_serial_t serial; - - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - - if (keyctl(KEYCTL_SETPERM, serial, - KEY_POS_ALL | KEY_USR_ALL) < 0) { - perror("keyctl"); - return -1; - } - - for (i = 0; i < 100; i++) { - serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING, - "leaked-keyring"); - if (serial < 0) { - perror("keyctl"); - return -1; - } - } - - return 0; - } - -If, after the program has run, there something like the following line in -/proc/keys: - -3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty - -with a usage count of 100 * the number of times the program has been run, -then the kernel is malfunctioning. If leaked-keyring has zero usages or -has been garbage collected, then the problem is fixed. - -Reported-by: Yevgeny Pats <yevgeny@perception-point.io> -Signed-off-by: David Howells <dhowells@redhat.com> -Acked-by: Don Zickus <dzickus@redhat.com> -Acked-by: Prarit Bhargava <prarit@redhat.com> -Acked-by: Jarod Wilson <jarod@redhat.com> -Signed-off-by: James Morris <james.l.morris@oracle.com> ---- - security/keys/process_keys.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c -index a3f85d2a..e6d50172 100644 ---- a/security/keys/process_keys.c -+++ b/security/keys/process_keys.c -@@ -794,6 +794,7 @@ long join_session_keyring(const char *name) - ret = PTR_ERR(keyring); - goto error2; - } else if (keyring == new->session_keyring) { -+ key_put(keyring); - ret = 0; - goto error2; - } @@ -11,7 +11,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.4-gnu -_pkgver=${_pkgbasever} +_pkgver=4.4.1-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -20,8 +20,8 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=4 -rcnrel=armv7-x3 +pkgrel=1 +rcnrel=armv7-x5 arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,8 +32,8 @@ fi options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm" "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm.sig" "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm" @@ -46,8 +46,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'linux.preset' 'change-default-console-loglevel.patch' 'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch' - 'CVE-2016-0728.patch' '0001-sdhci-revert.patch' + '0001-4.4-revert-btrfs.patch' + '0001-4.4-revert-xfs.patch' '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch' '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' # armv7h patches @@ -64,23 +65,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0009-ARM-dts-dove-add-Dove-divider-clocks.patch') sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' 'SKIP' + 'ed09b329d879bb758374b6a76acb841cdf63a6638720378657fb2b6eeed6b265' + 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74' 'SKIP' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - '12bab1b743a4ee7602ad355f1d4582799f38d125202cffeea1c395bece25776c' - 'd67f719de2d9b9cba751b0ad9e0d41f8ccf2dd301961c975b55edf740c34fd6c' - '98873b55f22ef3210c25e5f3147120d66cb1258906c7347e4f526ed6917013e0' + 'f231fb6dae7ecf8caec8c6e8c7822aa7d118234f380ff7d3b0a6a29e9df38be6' + '0b1ec8df30636d0d307fae03240294d4ddc05ee39c68c141fee9b1230e09aeaa' + 'a24715398ccaf8043a77728cafc6fa9edb898f89d09a66357f2e64ba86264a37' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' 'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d' - '03bed5b1c6ef34a917e218a46d38cd1347c5ab5693131996113c6cad275dc4e9' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' + '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958' + 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad' '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc' '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808' - '031beb6ec9b55a0425b938141ec06e200ca17cc50d69f605643b8ddb6065a55e' + '989d87384f448e942fa8656f6c4ce7212670fdfbf5dde567ad9f31ec6e316976' 'SKIP' 'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817' '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4' @@ -147,8 +151,9 @@ prepare() { # https://bugzilla.kernel.org/show_bug.cgi?id=110751 patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch" - # fixes #47820 CVE-2016-0728.patch - patch -Np1 -i "${srcdir}/CVE-2016-0728.patch" + # #47757 fix broken suspend from btrfs and xfs + patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch" + patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream @@ -297,12 +302,14 @@ _package-headers() { mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}" cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" if [ "${CARCH}" = "armv7h" ]; then - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-omap2" - cp -a arch/${KARCH}/mach-omap2/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-omap2/" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-mvebu" - cp -a arch/${KARCH}/mach-mvebu/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-mvebu/" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-omap" - cp -a arch/${KARCH}/plat-omap/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-omap/" + for i in dove exynos mvebu omap2 versatile; do + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}" + cp -a arch/${KARCH}/mach-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-${i}/" + done + for i in omap orion samsung versatile; do + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}" + cp -a arch/${KARCH}/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/plat-${i}/" + done fi # copy files necessary for later builds diff --git a/config.armv7h b/config.armv7h index d1fa41572ab4..3b7d3fde0ab8 100644 --- a/config.armv7h +++ b/config.armv7h @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.4.0-gnu-2 Kernel Configuration +# Linux/arm 4.4.1-gnu-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -781,7 +781,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # CPU frequency scaling drivers # CONFIG_CPUFREQ_DT=y -CONFIG_CPUFREQ_VOLTDM=y CONFIG_ARM_BIG_LITTLE_CPUFREQ=y CONFIG_ARM_DT_BL_CPUFREQ=y CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=y @@ -3223,8 +3222,7 @@ CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_LEGACY_PTYS is not set # CONFIG_SERIAL_NONSTANDARD is not set CONFIG_NOZOMI=m CONFIG_N_GSM=m @@ -3726,12 +3724,6 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_AVS=y CONFIG_ROCKCHIP_IODOMAIN=y -CONFIG_VOLTAGE_DOMAIN=y - -# -# Voltage Domain Framework Drivers -# -CONFIG_VOLTAGE_DOMAIN_OMAP=y CONFIG_HWMON=y CONFIG_HWMON_VID=m # CONFIG_HWMON_DEBUG_CHIP is not set @@ -4852,6 +4844,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y # I2C encoder or helper chips # CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADIHDMI=m CONFIG_DRM_I2C_CH7006=m CONFIG_DRM_I2C_SIL164=m CONFIG_DRM_I2C_NXP_TDA998X=m @@ -5048,7 +5041,7 @@ CONFIG_DISPLAY_PANEL_DPI=y CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m # CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02 is not set # CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01 is not set -# CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1 is not set +CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m # CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1 is not set # CONFIG_DISPLAY_PANEL_NEC_NL8048HL11 is not set CONFIG_EXYNOS_VIDEO=y @@ -6878,6 +6871,7 @@ CONFIG_PWM=y CONFIG_PWM_SYSFS=y # CONFIG_PWM_FSL_FTM is not set CONFIG_PWM_IMX=m +CONFIG_PWM_OMAP_DMTIMER=m CONFIG_PWM_PCA9685=m CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m @@ -6957,7 +6951,7 @@ CONFIG_NVMEM_VF610_OCOTP=y # FPGA Configuration Support # CONFIG_FPGA=m -# CONFIG_FPGA_MGR_SOCFPGA is not set +CONFIG_FPGA_MGR_SOCFPGA=m CONFIG_FPGA_MGR_ZYNQ_FPGA=m # diff --git a/config.i686 b/config.i686 index 6925e7fcd5e7..333e941f3c20 100644 --- a/config.i686 +++ b/config.i686 @@ -7537,7 +7537,7 @@ CONFIG_X86_PTDUMP_CORE=y # CONFIG_EFI_PGT_DUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -CONFIG_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y diff --git a/config.x86_64 b/config.x86_64 index a5e2749c3b92..13bf64191ab6 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -7277,7 +7277,7 @@ CONFIG_X86_PTDUMP_CORE=y # CONFIG_EFI_PGT_DUMP is not set CONFIG_DEBUG_RODATA=y # CONFIG_DEBUG_RODATA_TEST is not set -CONFIG_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set CONFIG_DEBUG_SET_MODULE_RONX=y # CONFIG_DEBUG_NX_TEST is not set CONFIG_DOUBLEFAULT=y |