diff options
| author |   Alice Ferrazzi <alicef@gentoo.org> | 2022-07-15 19:09:28 +0900 |
|---|---|---|
| committer | Alice Ferrazzi <alicef@gentoo.org> | 2022-07-15 19:09:35 +0900 |
| commit | ea1cc0f1b2e15fa74a13ebd795a6b677d4af9fc1 (patch) | |
| tree | 5bd9eeef6eca4e506ed171868fee9c0445b3961d | |
| parent | Add 1950_workaround_negprot_bug.patch (diff) | |
| download | linux-patches-5.18-15.tar.gz linux-patches-5.18-15.tar.bz2 linux-patches-5.18-15.zip | |
Linux patch 5.18.125.18-15
Signed-off-by: Alice Ferrazzi <alicef@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1011_linux-5.18.12.patch | 26 |
2 files changed, 30 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 764c25c9..2ad9190a 100644 --- a/0000_README +++ b/0000_README @@ -87,6 +87,10 @@ Patch: 1010_linux-5.18.11.patch From: http://www.kernel.org Desc: Linux 5.18.11 +Patch: 1011_linux-5.18.12.patch +From: http://www.kernel.org +Desc: Linux 5.18.12 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1011_linux-5.18.12.patch b/1011_linux-5.18.12.patch new file mode 100644 index 00000000..33801d1a --- /dev/null +++ b/1011_linux-5.18.12.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile b/Makefile +index 323032d60ac34..f8e2445b60447 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 18 +-SUBLEVEL = 11 ++SUBLEVEL = 12 + EXTRAVERSION = + NAME = Superb Owl + +diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +index 375529b7d12e3..44b14c9dc9a73 100644 +--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c ++++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +@@ -695,7 +695,7 @@ static int gpmi_nfc_compute_timings(struct gpmi_nand_data *this, + hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) | + BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) | + BF_GPMI_TIMING0_DATA_SETUP(data_setup_cycles); +- hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(DIV_ROUND_UP(busy_timeout_cycles, 4096)); ++ hw->timing1 = BF_GPMI_TIMING1_BUSY_TIMEOUT(busy_timeout_cycles * 4096); + + /* + * Derive NFC ideal delay from {3}: |