diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 5 | ||||
| -rw-r--r-- | 0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch | 187 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | config.armv7h | 3 |
5 files changed, 21 insertions, 212 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-libre - pkgver = 5.1.4_gnu + pkgver = 5.1.6_gnu pkgrel = 1 url = https://linux-libre.fsfla.org/ arch = i686 @@ -14,8 +14,8 @@ pkgbase = linux-libre options = !strip source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1-gnu/linux-libre-5.1-gnu.tar.xz source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1-gnu/linux-libre-5.1-gnu.tar.xz.sign - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1.4-gnu/patch-5.1-gnu-5.1.4-gnu.xz - source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1.4-gnu/patch-5.1-gnu-5.1.4-gnu.xz.sign + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1.6-gnu/patch-5.1-gnu-5.1.6-gnu.xz + source = https://linux-libre.fsfla.org/pub/linux-libre/releases/5.1.6-gnu/patch-5.1-gnu-5.1.6-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_vga16.ppm @@ -34,12 +34,11 @@ pkgbase = linux-libre source = 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch source = 0002-fix-Atmel-maXTouch-touchscreen-support.patch source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - source = 0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch validpgpkeys = 474402C8C582DAFBE389C427BCB7CF877E7D47A7 validpgpkeys = 6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78 sha512sums = 42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618c6acab439c01ae781df768a2e1ac4b76ad80fe0e4a432eaceb7f01f275439 sha512sums = SKIP - sha512sums = 09b935439659f6d170f8acc77d47f43973d066e372fe353167ab1cf96598a757e2430e448477384dc799b910a7903fb6841467be2a01e08e40194bfc6bea77c3 + sha512sums = 7c860911baae3c94743981980f93928bde01679f5f8bc3c91f19eb23d1fb1cc590cc4dbb421c1ae9165dab9d1c697e19926fc265a4a2fcfdaaa262cb2b025455 sha512sums = SKIP sha512sums = 13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3 sha512sums = SKIP @@ -49,7 +48,7 @@ pkgbase = linux-libre sha512sums = SKIP sha512sums = 4ecc5c328565188428a18f97fbdb849a34c0f4f29d637430adad50486e5be756f985bfa371897066586fe7ee48c098bd8ae5dd21d1234ac9a2e5eba2c47062d8 sha512sums = 3f8f695d19cf0fd9bb63aa9852195b13e2ee0294ca2407404958ada72386f1d3c28495a809fc937f4fa7e07ca9ae83c57883bb597ec6827c6168477c79399ebb - sha512sums = 6174f2b904365c0834abc2744f6579986f775bde23170a66e5b0ab813e6ffcd6b88579ef4ac56d3240fc3b7a619e9b59782dd1e34a7aeced256e869b50e30975 + sha512sums = c845c78b20819f1a74917c3accef1c41b31b3e91d14ff9c1b524763290137c07fa4175b90a406e5e6aba11998196438e94ab8c578e6f4fb91e3c2b74057eae2a sha512sums = 7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a sha512sums = 2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7 sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf @@ -58,10 +57,9 @@ pkgbase = linux-libre sha512sums = 143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232 sha512sums = 02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af sha512sums = b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168 - sha512sums = 0ab57c05815c0a0e758f14688fb8f3946e9082cfa1d31e21c4a2287a477adfbb2489fb576e6030cd6445eb0f91f57400b2970aed6565477bc487acf113e1b3f8 - sha512sums = e500924b47857bda3f1e062913e241180ab44f4df89b001db640dd5da6a0ad5d8808a6902f8f4debed1526adc2188806507d282f4c5538d7d9ff5bb637da6884 - source_armv7h = https://repo.parabola.nu/other/rcn-libre/patches/5.1.4/rcn-libre-5.1.4-armv7-x4.patch - source_armv7h = https://repo.parabola.nu/other/rcn-libre/patches/5.1.4/rcn-libre-5.1.4-armv7-x4.patch.sig + sha512sums = 4dd2f5be666462549a70ae330e094c35970c0fa384d215884c84fe40ca7f82f9b90b155c96bb3d14d0a460c64f5fc251c156ae9cca595d0f5546674569f215ea + source_armv7h = https://repo.parabola.nu/other/rcn-libre/patches/5.1.6/rcn-libre-5.1.6-armv7-x5.patch + source_armv7h = https://repo.parabola.nu/other/rcn-libre/patches/5.1.6/rcn-libre-5.1.6-armv7-x5.patch.sig source_armv7h = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch source_armv7h = 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch source_armv7h = 0003-SMILE-Plug-device-tree-file.patch @@ -92,21 +90,21 @@ pkgname = linux-libre depends = kmod depends = mkinitcpio optdepends = crda: to set the correct wireless channels of your country - provides = linux=5.1.4 - provides = LINUX-ABI_VERSION=5.1.4 + provides = linux=5.1.6 + provides = LINUX-ABI_VERSION=5.1.6 conflicts = linux 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=5.1.4 + provides = linux-headers=5.1.6 conflicts = linux-headers replaces = linux-headers pkgname = linux-libre-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-libre kernel - provides = linux-docs=5.1.4 + provides = linux-docs=5.1.6 conflicts = linux-docs replaces = linux-docs diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch index 41ff6902dea8..a290583c2eba 100644 --- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch +++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -1,8 +1,7 @@ -From 97ad944eef70f5d93159eaaf969e5ca9055f98f8 Mon Sep 17 00:00:00 2001 +From ec4b54ebab3f84210e4b36d1af2dea754b8eb789 Mon Sep 17 00:00:00 2001 From: Serge Hallyn <serge.hallyn@canonical.com> Date: Fri, 31 May 2013 19:12:12 +0100 -Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by - default +Subject: [PATCH] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> [bwh: Remove unneeded binary sysctl bits] diff --git a/0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch b/0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch deleted file mode 100644 index 904b8e032ada..000000000000 --- a/0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch +++ /dev/null @@ -1,187 +0,0 @@ -From b79903f026f9eb37da34b8d300910e5d6d626e31 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Wed, 22 May 2019 01:12:03 +0200 -Subject: [PATCH 2/2] Revert "dm: eliminate 'split_discard_bios' flag from DM - target interface" - -This reverts commit 61697a6abd24acba941359c6268a94f4afe4a53d. - -https://bugs.archlinux.org/task/62693 ---- - drivers/md/dm-cache-target.c | 1 + - drivers/md/dm-raid.c | 14 +++++--------- - drivers/md/dm-thin.c | 1 + - drivers/md/dm-zoned-target.c | 1 + - drivers/md/dm.c | 25 +++++++++++++++++++------ - include/linux/device-mapper.h | 6 ++++++ - include/uapi/linux/dm-ioctl.h | 4 ++-- - 7 files changed, 35 insertions(+), 17 deletions(-) - -diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c -index d249cf8ac277..694b252d2741 100644 ---- a/drivers/md/dm-cache-target.c -+++ b/drivers/md/dm-cache-target.c -@@ -2505,6 +2505,7 @@ static int cache_create(struct cache_args *ca, struct cache **result) - - ti->num_discard_bios = 1; - ti->discards_supported = true; -+ ti->split_discard_bios = false; - - ti->per_io_data_size = sizeof(struct per_bio_data); - -diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c -index 9fdef6897316..adcfe8ae10aa 100644 ---- a/drivers/md/dm-raid.c -+++ b/drivers/md/dm-raid.c -@@ -2986,6 +2986,11 @@ static void configure_discard_support(struct raid_set *rs) - } - } - -+ /* -+ * RAID1 and RAID10 personalities require bio splitting, -+ * RAID0/4/5/6 don't and process large discard bios properly. -+ */ -+ ti->split_discard_bios = !!(rs_is_raid1(rs) || rs_is_raid10(rs)); - ti->num_discard_bios = 1; - } - -@@ -3742,15 +3747,6 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits) - - blk_limits_io_min(limits, chunk_size); - blk_limits_io_opt(limits, chunk_size * mddev_data_stripes(rs)); -- -- /* -- * RAID1 and RAID10 personalities require bio splitting, -- * RAID0/4/5/6 don't and process large discard bios properly. -- */ -- if (rs_is_raid1(rs) || rs_is_raid10(rs)) { -- limits->discard_granularity = chunk_size; -- limits->max_discard_sectors = chunk_size; -- } - } - - static void raid_postsuspend(struct dm_target *ti) -diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c -index fcd887703f95..254c26eb963a 100644 ---- a/drivers/md/dm-thin.c -+++ b/drivers/md/dm-thin.c -@@ -4240,6 +4240,7 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv) - if (tc->pool->pf.discard_enabled) { - ti->discards_supported = true; - ti->num_discard_bios = 1; -+ ti->split_discard_bios = false; - } - - mutex_unlock(&dm_thin_pool_table.mutex); -diff --git a/drivers/md/dm-zoned-target.c b/drivers/md/dm-zoned-target.c -index 8865c1709e16..6af5babe6837 100644 ---- a/drivers/md/dm-zoned-target.c -+++ b/drivers/md/dm-zoned-target.c -@@ -727,6 +727,7 @@ static int dmz_ctr(struct dm_target *ti, unsigned int argc, char **argv) - ti->per_io_data_size = sizeof(struct dmz_bioctx); - ti->flush_supported = true; - ti->discards_supported = true; -+ ti->split_discard_bios = true; - - /* The exposed capacity is the number of chunks that can be mapped */ - ti->len = (sector_t)dmz_nr_chunks(dmz->metadata) << dev->zone_nr_sectors_shift; -diff --git a/drivers/md/dm.c b/drivers/md/dm.c -index 043f0761e4a0..f40e006ba5fe 100644 ---- a/drivers/md/dm.c -+++ b/drivers/md/dm.c -@@ -1464,10 +1464,17 @@ static unsigned get_num_write_zeroes_bios(struct dm_target *ti) - return ti->num_write_zeroes_bios; - } - -+typedef bool (*is_split_required_fn)(struct dm_target *ti); -+ -+static bool is_split_required_for_discard(struct dm_target *ti) -+{ -+ return ti->split_discard_bios; -+} -+ - static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti, -- unsigned num_bios) -+ unsigned num_bios, bool is_split_required) - { -- unsigned len = ci->sector_count; -+ unsigned len; - - /* - * Even though the device advertised support for this type of -@@ -1478,6 +1485,11 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target * - if (!num_bios) - return -EOPNOTSUPP; - -+ if (!is_split_required) -+ len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti)); -+ else -+ len = min((sector_t)ci->sector_count, max_io_len(ci->sector, ti)); -+ - __send_duplicate_bios(ci, ti, num_bios, &len); - - ci->sector += len; -@@ -1488,22 +1500,23 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target * - - static int __send_discard(struct clone_info *ci, struct dm_target *ti) - { -- return __send_changing_extent_only(ci, ti, get_num_discard_bios(ti)); -+ return __send_changing_extent_only(ci, ti, get_num_discard_bios(ti), -+ is_split_required_for_discard(ti)); - } - - static int __send_secure_erase(struct clone_info *ci, struct dm_target *ti) - { -- return __send_changing_extent_only(ci, ti, get_num_secure_erase_bios(ti)); -+ return __send_changing_extent_only(ci, ti, get_num_secure_erase_bios(ti), false); - } - - static int __send_write_same(struct clone_info *ci, struct dm_target *ti) - { -- return __send_changing_extent_only(ci, ti, get_num_write_same_bios(ti)); -+ return __send_changing_extent_only(ci, ti, get_num_write_same_bios(ti), false); - } - - static int __send_write_zeroes(struct clone_info *ci, struct dm_target *ti) - { -- return __send_changing_extent_only(ci, ti, get_num_write_zeroes_bios(ti)); -+ return __send_changing_extent_only(ci, ti, get_num_write_zeroes_bios(ti), false); - } - - static bool is_abnormal_io(struct bio *bio) -diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h -index b0672756d056..ec063ed4f53e 100644 ---- a/include/linux/device-mapper.h -+++ b/include/linux/device-mapper.h -@@ -316,6 +316,12 @@ struct dm_target { - * whether or not its underlying devices have support. - */ - bool discards_supported:1; -+ -+ /* -+ * Set if the target required discard bios to be split -+ * on max_io_len boundary. -+ */ -+ bool split_discard_bios:1; - }; - - /* Each target can link one of these into the table */ -diff --git a/include/uapi/linux/dm-ioctl.h b/include/uapi/linux/dm-ioctl.h -index f396a82dfd3e..d1e49514977b 100644 ---- a/include/uapi/linux/dm-ioctl.h -+++ b/include/uapi/linux/dm-ioctl.h -@@ -270,9 +270,9 @@ enum { - #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) - - #define DM_VERSION_MAJOR 4 --#define DM_VERSION_MINOR 40 -+#define DM_VERSION_MINOR 39 - #define DM_VERSION_PATCHLEVEL 0 --#define DM_VERSION_EXTRA "-ioctl (2019-01-18)" -+#define DM_VERSION_EXTRA "-ioctl (2018-04-03)" - - /* Status bits */ - #define DM_READONLY_FLAG (1 << 0) /* In/Out */ --- -2.21.0 - @@ -13,7 +13,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _srcbasever=5.1-gnu -_srcver=5.1.4-gnu +_srcver=5.1.6-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -23,7 +23,7 @@ _srcname=linux-${_srcbasever%-*} _archpkgver=${_srcver%-*} pkgver=${_srcver//-/_} pkgrel=1 -rcnrel=armv7-x4 +rcnrel=armv7-x5 arch=(i686 x86_64 armv7h) url='https://linux-libre.fsfla.org/' license=(GPL2) @@ -50,7 +50,6 @@ source=( # Arch's custom linux patches 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch - 0002-Revert-dm-eliminate-split_discard_bios-flag-from-DM-.patch ) source_armv7h=( # armv7h patches, put in the source_armv7h variable just for a more comfortable loop patching @@ -70,7 +69,7 @@ validpgpkeys=( ) sha512sums=('42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618c6acab439c01ae781df768a2e1ac4b76ad80fe0e4a432eaceb7f01f275439' 'SKIP' - '09b935439659f6d170f8acc77d47f43973d066e372fe353167ab1cf96598a757e2430e448477384dc799b910a7903fb6841467be2a01e08e40194bfc6bea77c3' + '7c860911baae3c94743981980f93928bde01679f5f8bc3c91f19eb23d1fb1cc590cc4dbb421c1ae9165dab9d1c697e19926fc265a4a2fcfdaaa262cb2b025455' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -80,7 +79,7 @@ sha512sums=('42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618 'SKIP' '4ecc5c328565188428a18f97fbdb849a34c0f4f29d637430adad50486e5be756f985bfa371897066586fe7ee48c098bd8ae5dd21d1234ac9a2e5eba2c47062d8' '3f8f695d19cf0fd9bb63aa9852195b13e2ee0294ca2407404958ada72386f1d3c28495a809fc937f4fa7e07ca9ae83c57883bb597ec6827c6168477c79399ebb' - '6174f2b904365c0834abc2744f6579986f775bde23170a66e5b0ab813e6ffcd6b88579ef4ac56d3240fc3b7a619e9b59782dd1e34a7aeced256e869b50e30975' + 'c845c78b20819f1a74917c3accef1c41b31b3e91d14ff9c1b524763290137c07fa4175b90a406e5e6aba11998196438e94ab8c578e6f4fb91e3c2b74057eae2a' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '2718b58dbbb15063bacb2bde6489e5b3c59afac4c0e0435b97fe720d42c711b6bcba926f67a8687878bd51373c9cf3adb1915a11666d79ccb220bf36e0788ab7' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' @@ -89,8 +88,7 @@ sha512sums=('42510bffa69746e0f919fecef5a23da4adb2473239ee67730fa1eb2340256fb4618 '143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '0ab57c05815c0a0e758f14688fb8f3946e9082cfa1d31e21c4a2287a477adfbb2489fb576e6030cd6445eb0f91f57400b2970aed6565477bc487acf113e1b3f8' - 'e500924b47857bda3f1e062913e241180ab44f4df89b001db640dd5da6a0ad5d8808a6902f8f4debed1526adc2188806507d282f4c5538d7d9ff5bb637da6884') + '4dd2f5be666462549a70ae330e094c35970c0fa384d215884c84fe40ca7f82f9b90b155c96bb3d14d0a460c64f5fc251c156ae9cca595d0f5546674569f215ea') sha512sums_armv7h=('d5361f28165e59cc09f8728af84b095ba890c6d617c3e05d3feb9402221fb1affa699d786e5b32dd989141f96e9f273611b0434f03cf7ec0d00a1aa8eb5d3c6d' 'SKIP' 'cd064ca844aa2f0f1e4157ce7a7607850d7c4b531f5b8336d75ce2f49d3a76e09f1e41ebd712b942357068028896dd7f55d037f5c01367c5cd8297c98920e7dc' diff --git a/config.armv7h b/config.armv7h index 6df26b56d627..41cd0d44d921 100644 --- a/config.armv7h +++ b/config.armv7h @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.1.3-gnu Kernel Configuration +# Linux/arm 5.1.6-gnu Kernel Configuration # # @@ -819,6 +819,7 @@ CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y +CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y |