Commit Graph

4398 Commits

Author SHA1 Message Date
github-actions[bot]
f1bb6c74f9
Merge master into staging-next 2021-01-12 12:34:36 +00:00
Linus Heckemann
97c0e5d8a8
Merge pull request #107181 from lheckemann/generate-config-fix
linux: fix generate-config's handling of "no-choice" options
2021-01-12 11:13:58 +01:00
github-actions[bot]
757ad34b82
Merge master into staging-next 2021-01-11 18:42:29 +00:00
Tim Steinbach
18b09d883f
linux: 5.11-rc2 -> 5.11-rc3 2021-01-11 11:10:07 -05:00
Tim Steinbach
d91f1b0f47
linux: Optional SECURITY_LOCKDOWN_LSM
The option has been removed in the most recent dot releases
2021-01-11 11:09:02 -05:00
github-actions[bot]
1cce663933
Merge staging-next into staging 2021-01-11 01:02:25 +00:00
github-actions[bot]
36bab113bf
Merge master into staging-next 2021-01-11 01:02:21 +00:00
Atemu
5eedbd86f4 linux_zen: 5.10.1 -> 5.10.6 2021-01-10 15:08:53 -08:00
Atemu
b775e9f474 linux_lqx: 5.10.5 -> 5.10.6 2021-01-10 15:08:53 -08:00
github-actions[bot]
31f01e4bcc
Merge staging-next into staging 2021-01-10 01:03:39 +00:00
github-actions[bot]
433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Tim Steinbach
85449b21bc
linux/hardened/patches/5.4: 5.4.87.a -> 5.4.88.a 2021-01-09 15:26:22 -05:00
Tim Steinbach
0d2b8275a3
linux/hardened/patches/5.10: 5.10.5.a -> 5.10.6.a 2021-01-09 15:26:20 -05:00
Tim Steinbach
bc95f84a5a
linux/hardened/patches/4.19: 4.19.165.a -> 4.19.166.a 2021-01-09 15:26:18 -05:00
Tim Steinbach
ea8bec0e23
linux/hardened/patches/4.14: 4.14.213.a -> 4.14.214.a 2021-01-09 15:26:17 -05:00
Tim Steinbach
6973e51c02
linux-rt_5_10: 5.10.1-rt20 -> 5.10.4-rt22 2021-01-09 15:25:50 -05:00
Tim Steinbach
a9dfa241f4
linux: 5.4.87 -> 5.4.88 2021-01-09 15:24:25 -05:00
Tim Steinbach
25aed143ea
linux: 5.10.5 -> 5.10.6 2021-01-09 15:23:50 -05:00
Tim Steinbach
ab96d91f2e
linux: 4.9.249 -> 4.9.250 2021-01-09 15:23:17 -05:00
Tim Steinbach
c5334d6c47
linux: 4.4.249 -> 4.4.250 2021-01-09 15:22:35 -05:00
Tim Steinbach
5124fff5c6
linux: 4.19.165 -> 4.19.166 2021-01-09 15:22:03 -05:00
Tim Steinbach
ab245e4e63
linux: 4.14.213 -> 4.14.214 2021-01-09 15:08:18 -05:00
github-actions[bot]
8ec9d0c1b6
Merge staging-next into staging 2021-01-09 01:00:29 +00:00
github-actions[bot]
e251591528
Merge master into staging-next 2021-01-09 01:00:25 +00:00
Kevin Cox
1443eb90cb
Merge pull request #108647 from Atemu/update/linux_lqx
linux_lqx: 5.9.16 -> 5.10.5
2021-01-08 16:35:27 -05:00
github-actions[bot]
18280919d6
Merge staging-next into staging 2021-01-08 06:29:07 +00:00
Vincent Haupert
af8abf141d
kernelPatches: ath driver: allow setting regulatory domain
Ports an OpenWRT patch for Atheros wireless drivers (ath*) which allows
the user to change the regulatory domain code to the one which actually
applies.

All Atheros devices have a regulatory domain burned into their EEPROM.
When using a device as AP, this domain is frequently overly restrictive
when compared to the regulation which applies in the country the device
actually operates in; often, this restriction disallows IR on all
channels making it impossible to use the device as an AP at all.

This commit introduces the NixOS config option
networking.wireless.athUserRegulatoryDomain which, if enabled, applies
the patch and sets the kernel config option ATH_USER_REGD.

The original OpenWRT patch targets Linux 5.8.
2021-01-08 02:20:08 +01:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Tim Steinbach
4312cd74f1 linux-hardened: Track extra version
Fixes #108707
2021-01-07 18:23:57 -05:00
github-actions[bot]
9e9902250a
Merge staging-next into staging 2021-01-07 18:40:54 +00:00
github-actions[bot]
5c072a088d
Merge master into staging-next 2021-01-07 18:40:50 +00:00
Milan Pässler
0f03222d88 linux: build with multipath tcp support
Starting from Linx 5.6, there is partial upstream support for the Multipath TCP
protocol. There are no downsides to enabling it afaict, since
applications need to opt-in when creating a socket.

From https://github.com/multipath-tcp/mptcp_net-next/wiki:
"[...] users of regular TCP continue to get the same type of connection and
performance unless MPTCP is requested."
2021-01-07 18:37:57 +01:00
Tim Steinbach
2fe7c5cb86
linux/hardened/patches/5.4: 5.4.86.a -> 5.4.87.a 2021-01-07 10:11:58 -05:00
Tim Steinbach
91e76b146f
linux/hardened/patches/5.10: 5.10.4.a -> 5.10.5.a 2021-01-07 10:11:56 -05:00
Tim Steinbach
2a23529200
linux/hardened/patches/4.19: 4.19.164.a -> 4.19.165.a 2021-01-07 10:11:50 -05:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Atemu
c2743fb52f linux_lqx: 5.9.16 -> 5.10.5 2021-01-07 12:39:00 +01:00
Tim Steinbach
7cd9d714ee
linux: 5.4.86 -> 5.4.87 2021-01-06 14:28:40 -05:00
Tim Steinbach
6d1f725cf6
linux: 5.10.4 -> 5.10.5 2021-01-06 14:28:40 -05:00
Tim Steinbach
8881168efc
linux: 4.19.164 -> 4.19.165 2021-01-06 14:28:40 -05:00
github-actions[bot]
0e4e47512d
Merge master into staging-next 2021-01-05 00:56:58 +00:00
Tim Steinbach
f284b44089
linux: 5.11-rc1 -> 5.11-rc2
Added temporary patch for a syntax error in the wireless drivers
2021-01-04 13:41:30 -05:00
github-actions[bot]
a6f7ba3752
Merge staging-next into staging 2020-12-31 18:42:44 +00:00
github-actions[bot]
5dffe03f30
Merge master into staging-next 2020-12-31 18:42:41 +00:00
Samuel Dionne-Riel
4e75a31e98 linux: configure aarch64 contiguous memory allocator via kernel config
As per the in-line comment, this is where distros should configure it.
Not via kernel command line parameters.

As found by looking at the implementation, while exploring the cause of
a bug on the Raspberry Pi 4, it was found that `cma=` on the command
line parameters will overwrite the values a device tree will have
configured for a given platform.

With this, the more recent 5.4 vendor kernel boots just fine on the
Raspberry Pi 4 using our common configuration.
2020-12-31 18:20:49 +01:00
Frederik Rietdijk
f3b4ae8402 Merge staging-next into staging 2020-12-31 13:29:55 +01:00
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Tim Steinbach
70a061bd6c
linux/hardened/patches/5.4: 5.4.85.a -> 5.4.86.a 2020-12-30 21:19:16 -05:00
Tim Steinbach
5f4c27eb77
linux/hardened/patches/5.10: init at 5.10.4.a 2020-12-30 21:19:16 -05:00
Tim Steinbach
8ed3ba45f5
linux/hardened/patches/4.19: 4.19.163.a -> 4.19.164.a 2020-12-30 21:19:16 -05:00
Tim Steinbach
334018553b
linux/hardened/patches/4.14: 4.14.212.a -> 4.14.213.a 2020-12-30 21:19:15 -05:00
Tim Steinbach
685d4640a0
linux: 5.4.85 -> 5.4.86 2020-12-30 21:19:15 -05:00
Tim Steinbach
3785b180ba
linux: 5.10.3 -> 5.10.4 2020-12-30 21:19:15 -05:00
Tim Steinbach
d4f876cf30
linux: 4.19.163 -> 4.19.164 2020-12-30 21:19:14 -05:00
Michael Raskin
a95d8f160a
Merge pull request #107625 from Atemu/r13y/kernel-disable-module-signing
kernel: disable module signing
2020-12-30 17:47:49 +00:00
Linus Heckemann
44864fd0f4
Merge pull request #107703 from Atemu/kernel-use-zstd
kernel: use zstd
2020-12-30 00:17:59 +01:00
github-actions[bot]
ff873c7c21
Merge master into staging-next 2020-12-29 18:40:52 +00:00
Tim Steinbach
733e537a8a
linux: 4.9.248 -> 4.9.249 2020-12-29 10:11:59 -05:00
Tim Steinbach
18eae95161
linux: 4.4.248 -> 4.4.249 2020-12-29 10:11:58 -05:00
Tim Steinbach
b3d2d9170b
linux: 4.14.212 -> 4.14.213 2020-12-29 10:11:57 -05:00
github-actions[bot]
ac03278035
Merge master into staging-next 2020-12-28 18:34:55 +00:00
Timo Kaufmann
90d95d4513
Merge pull request #107148 from Atemu/linux_lqx-init
linux_lqx: init at 5.9.15
2020-12-28 18:35:15 +01:00
Tim Steinbach
80e3ca6f4a
linux: 5.10-rc6 -> 5.11-rc1 2020-12-28 11:22:57 -05:00
Tim Steinbach
b24e814e14
linux: 5.10.2 -> 5.10.3 2020-12-28 10:48:04 -05:00
Blaž Hrastnik
9461f0a734 kernel: use zstd compression on 5.9+. 2020-12-28 14:25:17 +01:00
Frederik Rietdijk
92cc19490e Merge staging into staging-next 2020-12-28 08:45:43 +01:00
Drew Risinger
6f74787180 linux_rpi: 5.4.51 -> 5.4.79 2020-12-27 17:01:02 +01:00
Matthew Bauer
44dae8d0c8 linux_rpi: 4.19.118 -> 5.4.51
Update to the new default branch for the Raspberry Pi vendor kernel.
2020-12-27 16:48:51 +01:00
Blaž Hrastnik
9fee546667 kernel/manual-config: add zstd to nativeBuildDeps.
Required to build with zstd compression.

Refs #101108
2020-12-27 10:58:59 +01:00
Blaž Hrastnik
2d0ba1f54b kernel/manual-config: simplify ld-version sed with patchShebangs. 2020-12-27 10:58:57 +01:00
Atemu
0fdf69260a linux_lqx: add a description 2020-12-26 13:35:45 +01:00
Atemu
02437ff86c linux_zen: add a description
Taken from https://liquorix.net/ who use the same sauce in their kernel
2020-12-26 13:30:53 +01:00
Atemu
2c19ef2209 linux: disable module signing
Without this, the kernel would generate a random one for us which obviously
isn't reproducible.

`nix-build -A linux --check` succeeds now!
(Tested at different times with different kernel)
2020-12-26 13:15:04 +01:00
github-actions[bot]
09a970dcd2
Merge staging-next into staging 2020-12-25 12:23:40 +00:00
Gabriel Ebner
ce8c83623d
Merge pull request #107263 from edibopp/patch-rtl8761b
Firmware and kernel patch for Realtek RTL8761b
2020-12-25 11:08:32 +01:00
Arnout Engelen
de075d25c7
linux: omit build id (#106648)
Don't include an ​NT_GNU_BUILD_ID (that is randomly generated
at build time).

This improves the kernel reproducibility: when also disabling
the MOUDLE_SIG and SECURITY_LOCKDOWN_LSM options the build
is bit-by-bit reproducible.
2020-12-23 16:31:05 +01:00
Tim Steinbach
bf0589a3c5
linux/hardened/patches/5.9: 5.9.15.a -> 5.9.16.a 2020-12-22 14:37:21 -05:00
Tim Steinbach
371b86735f
linux/hardened/patches/5.4: 5.4.84.a -> 5.4.85.a 2020-12-22 14:37:19 -05:00
Tim Steinbach
96396f35b8
linux-rt_5_4: 5.4.82-rt45 -> 5.4.84-rt47 2020-12-22 14:36:53 -05:00
Anderson Torres
6690232388
Merge pull request #104197 from Chiiruno/dev/bcachefs
linux_testing_bcachefs: 5.8.0-2020.09.07 -> 5.9.0-2020.11.17 // bcachefs-tools: 2020-08-25 -> 2020-11-17
2020-12-22 11:09:43 -03:00
Atemu
fd2d1eb907 linux_lqx: 5.9.15 -> 5.9.16 2020-12-22 08:15:47 +01:00
Tim Steinbach
c0e091e6d7
linux-rt_5_10: 5.10.1-rt19 -> 5.10.1-rt20 2020-12-21 12:48:17 -05:00
Tim Steinbach
4859bf2874
linux: 5.9.15 -> 5.9.16 2020-12-21 12:48:17 -05:00
Tim Steinbach
6b4ee3bf33
linux: 5.4.84 -> 5.4.85 2020-12-21 12:48:16 -05:00
Tim Steinbach
9dc0ab949b
linux: 5.10.1 -> 5.10.2 2020-12-21 12:48:16 -05:00
Michael Raskin
4aa87cfa36
Merge pull request #107003 from Atemu/update/linux_zen
linux_zen: 5.9.14 -> 5.10.1
2020-12-21 11:51:38 +00:00
Eduard Bopp
6ac71f593d linux: backport support for RTL8761b to 5.4 2020-12-20 14:36:07 +01:00
Linus Heckemann
16c0697e68 linux: fix generate-config's handling of "no-choice" options
Prior to this change, the script could potentially get confused by
"menus" containing only one valid option. Thus, with

CPU_BIG_ENDIAN = no;
CPU_LITTLE_ENDIAN = yes;
ARM64_PA_BITS_48 = yes;

the endianness would be set incorrectly:

GOT: Physical address space size
GOT: > 1. 48-bit (ARM64_PA_BITS_48)
GOT: choice[1]: 1
GOT: Endianness
GOT:   1. Build big-endian kernel (CPU_BIG_ENDIAN)
GOT: > 2. Build little-endian kernel (CPU_LITTLE_ENDIAN)
CHOICE: 1-2?, ANSWER: 1

This commit fixes this error by forgetting previous menu choices if a
line that follows a menu option is neither another menu option nor the
prompt for choosing one of the options.
2020-12-19 01:55:21 +01:00
Atemu
ff636d5843 linux_lqx: init at 5.9.15
Same source as linux_zen but with a release schedule that's not quite as
bleeding edge. For example, it's currenly on the newest 5.9 release while
linux_zen is already on 5.10 and won't release future 5.9 fixes.

Originally meant for debianish Distros.
2020-12-18 13:07:55 +01:00
Tim Steinbach
62f5b921c5
linux/hardened/patches/5.9: 5.9.14.a -> 5.9.15.a 2020-12-17 09:21:58 -05:00
Tim Steinbach
1eb7cd9572
linux/hardened/patches/5.4: 5.4.83.a -> 5.4.84.a 2020-12-17 09:21:58 -05:00
Tim Steinbach
08d67bbd0d
linux-rt_5_10: 5.10-rt17 -> 5.10.1-rt19 2020-12-17 09:21:58 -05:00
Tim Steinbach
78c036ced3
linux_latest-libre: 17788 -> 17812 2020-12-16 11:25:40 -05:00
Tim Steinbach
ca0e3d9c64
linux: 5.9.14 -> 5.9.15 2020-12-16 11:25:29 -05:00
Tim Steinbach
d1a0eb7f0b
linux: 5.4.83 -> 5.4.84 2020-12-16 11:25:17 -05:00
Atemu
10a3fd4892 linux_zen: 5.9.14 -> 5.10.1 2020-12-16 07:10:56 +01:00
Tim Steinbach
853bac5b2b
linux/hardened/patches/5.8: remove 2020-12-15 14:34:44 -05:00
Tim Steinbach
a83bf32bab
linux: 5.10 -> 5.10.1 2020-12-15 14:34:40 -05:00
Orivej Desh
2f6ac24357 linux-rt_latest: 5.9.1-rt20 -> 5.10-rt17
This does not keep 5.9 series because it has known issues and rt
upstream has stopped maintaining it in favor of 5.10.

"ls -v" sorts by version, making 5.10 the next $prev kernel.
2020-12-14 23:42:17 +00:00
Tim Steinbach
1be6a53cd8
Linux: Remove 5.8 2020-12-14 12:57:57 -05:00
Tim Steinbach
c1ef6d2f41
linux: Add 5.10
Validated via
```
 nix-build ./nixos/release.nix -A tests.kernel-latest.x86_64-linux -A tests.latestKernel.login.x86_64-linux
```
2020-12-14 12:55:31 -05:00
Tim Steinbach
93a4baf5a6
linux/hardened/patches/5.9: 5.9.12.a -> 5.9.14.a 2020-12-14 09:31:56 -05:00
Tim Steinbach
1d8c58f35c
linux/hardened/patches/5.4: 5.4.81.a -> 5.4.83.a 2020-12-14 09:31:56 -05:00
Tim Steinbach
a4d6fdd738
linux/hardened/patches/4.19: 4.19.161.a -> 4.19.163.a 2020-12-14 09:31:56 -05:00
Tim Steinbach
9146361acb
linux/hardened/patches/4.14: 4.14.210.a -> 4.14.212.a 2020-12-14 09:31:55 -05:00
Tim Steinbach
2ad8584a03
linux-rt_5_4: 5.4.78-rt44 -> 5.4.82-rt45 2020-12-14 09:31:55 -05:00
Kevin Cox
ad80d12a0c
Merge pull request #106753 from Atemu/update/linux_zen
linux_zen: 5.9.13 -> 5.9.14
2020-12-12 14:20:22 -05:00
Atemu
74c525ddc6 linux_zen: 5.9.13 -> 5.9.14 2020-12-12 16:46:32 +01:00
Tim Steinbach
1f8ef6970a
linux: 5.9.12 -> 5.9.14 2020-12-11 12:42:17 -05:00
Tim Steinbach
c020baa654
linux: 5.4.81 -> 5.4.83 2020-12-11 12:42:16 -05:00
Tim Steinbach
6ce57b7920
linux: 4.9.247 -> 4.9.248 2020-12-11 12:42:16 -05:00
Tim Steinbach
45c0c5f5e2
linux: 4.4.247 -> 4.4.248 2020-12-11 12:42:16 -05:00
Tim Steinbach
1f8f665608
linux: 4.19.161 -> 4.19.163 2020-12-11 12:42:15 -05:00
Tim Steinbach
28fb10a34a
linux: 4.14.210 -> 4.14.212 2020-12-11 12:42:11 -05:00
Orivej Desh
4376b91b40 linux-rt_5_9: export symbols needed by zfs
Upstream issue: https://github.com/openzfs/zfs/issues/11097#issuecomment-740682245
2020-12-10 10:34:44 +00:00
Mario Rodas
7b80d958fc
Merge pull request #106349 from Atemu/update/linux_zen
linux_zen: 5.9.12 -> 5.9.13
2020-12-08 13:41:25 -05:00
Atemu
374c3ff563 linux_zen: 5.9.12 -> 5.9.13 2020-12-08 13:54:24 +01:00
Orivej Desh
76bedb5b9e linux-rt_5_9: init at 5.9.1-rt20 2020-12-08 00:31:40 +00:00
Tim Steinbach
893f636801
linux/hardened/patches/5.9: 5.9.10.a -> 5.9.12.a 2020-12-07 14:57:58 -05:00
Tim Steinbach
780660986b
linux/hardened/patches/5.4: 5.4.79.a -> 5.4.81.a 2020-12-07 14:57:56 -05:00
Tim Steinbach
8a15d28a34
linux/hardened/patches/4.19: 4.19.159.a -> 4.19.161.a 2020-12-07 14:57:54 -05:00
Tim Steinbach
f76184d657
linux/hardened/patches/4.14: 4.14.208.a -> 4.14.210.a 2020-12-07 14:57:53 -05:00
Tim Steinbach
90f6e8bda4
linux_latest-libre: 17768 -> 17788 2020-12-07 14:57:41 -05:00
Michael Raskin
526c379bf8
Merge pull request #105443 from Atemu/update/linux_zen
linux_zen: 5.9.10 -> 5.9.12
2020-12-03 16:54:34 +00:00
Atemu
658b7c8f9e linux_zen: 5.9.11 -> 5.9.12 2020-12-03 02:21:40 +01:00
Tim Steinbach
c47fca9f6a
linux: 5.9.11 -> 5.9.12 2020-12-02 14:39:11 -05:00
Tim Steinbach
ef35646b49
linux: 5.4.80 -> 5.4.81 2020-12-02 14:39:10 -05:00
Tim Steinbach
d9aa6d1f79
linux: 4.9.246 -> 4.9.247 2020-12-02 14:39:09 -05:00
Tim Steinbach
454b370388
linux: 4.4.246 -> 4.4.247 2020-12-02 14:39:09 -05:00
Tim Steinbach
28a9fa4629
linux: 4.19.160 -> 4.19.161 2020-12-02 14:39:09 -05:00
Tim Steinbach
2eb6c71865
linux: 4.14.209 -> 4.14.210 2020-12-02 14:39:08 -05:00
Tim Steinbach
9d82d8b3c0
linux: 5.10-rc5 -> 5.10-rc6 2020-12-01 11:29:28 -05:00
Atemu
71c8bb680e linux_zen: 5.9.10 -> 5.9.11 2020-11-30 11:42:24 +01:00
Okina Matara
f872c5fee4
linux_testing_bcachefs: 5.8.0-2020.09.07 -> 5.9.0-2020.11.20 2020-11-28 18:02:00 -06:00
Linus Heckemann
9174f79fe6
Merge pull request #104760 from gravndal/edac
linux: explicitly enable RAS
2020-11-27 19:15:00 +01:00
Gaute Ravndal
5183864d18 linux: explicitly enable RAS
This is needed for EDAC support.
2020-11-26 10:08:51 +01:00
Dmitry Kalinkin
731c548629
Merge pull request #104373 from andresilva/linux-zen-5.9.9
linux_zen: 5.9.6 -> 5.9.10
2020-11-24 21:43:57 -05:00
Graham Christensen
d9c3f13df3
Merge pull request #104776 from grahamc/utillinux
utillinux: rename to util-linux
2020-11-24 15:14:36 -05:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Tim Steinbach
874e250009
linux-rt_5_4: 5.4.77-rt43 -> 5.4.78-rt44 2020-11-24 10:04:24 -05:00
Tim Steinbach
513afc731c
linux: 5.9.10 -> 5.9.11 2020-11-24 10:04:24 -05:00
Tim Steinbach
53738d417f
linux: 5.4.79 -> 5.4.80 2020-11-24 10:04:23 -05:00
Tim Steinbach
a17655a291
linux: 4.9.245 -> 4.9.246 2020-11-24 10:04:23 -05:00
Tim Steinbach
d17c554fdf
linux: 4.4.245 -> 4.4.246 2020-11-24 10:04:22 -05:00
Tim Steinbach
06ba11d0b7
linux: 4.19.159 -> 4.19.160 2020-11-24 10:04:21 -05:00
Tim Steinbach
c384c5409a
linux: 4.14.208 -> 4.14.209 2020-11-24 10:04:18 -05:00
Tim Steinbach
d0225fcdae
linux: 5.10-rc4 -> 5.10-rc5 2020-11-23 11:31:45 -05:00
Tim Steinbach
fa6abb2b61
linux/hardened/patches/5.9: 5.9.9.a -> 5.9.10.a 2020-11-23 10:55:16 -05:00
Tim Steinbach
640a842d57
linux/hardened/patches/5.4: 5.4.78.a -> 5.4.79.a 2020-11-23 10:55:15 -05:00
Tim Steinbach
dd721fc7b0
linux/hardened/patches/4.19: 4.19.158.a -> 4.19.159.a 2020-11-23 10:55:15 -05:00