patches for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/ipfrag-really-prevent-allocation-on-netns-exit.patch b/queue-4.14/ipfrag-really-prevent-allocation-on-netns-exit.patch
new file mode 100644 (file)
index 0000000..55d282b
--- /dev/null
+++ b/queue-4.14/ipfrag-really-prevent-allocation-on-netns-exit.patch
@@ -0,0 +1,39 @@
+From 2f816e5a5f55381b1daf05e107550d7acf6e97d4 Mon Sep 17 00:00:00 2001
+From: Paolo Abeni <pabeni@redhat.com>
+Date: Fri, 6 Jul 2018 12:30:20 +0200
+Subject: ipfrag: really prevent allocation on netns exit
+
+[ Upstream commit f6f2a4a2eb92bc73671204198bb2f8ab53ff59fb ]
+
+Setting the low threshold to 0 has no effect on frags allocation,
+we need to clear high_thresh instead.
+
+The code was pre-existent to commit 648700f76b03 ("inet: frags:
+use rhashtables for reassembly units"), but before the above,
+such assignment had a different role: prevent concurrent eviction
+from the worker and the netns cleanup helper.
+
+Fixes: 648700f76b03 ("inet: frags: use rhashtables for reassembly units")
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/ipv4/inet_fragment.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
+index 653be98fe3fb..6ffee9d2b0e5 100644
+--- a/net/ipv4/inet_fragment.c
++++ b/net/ipv4/inet_fragment.c
+@@ -90,7 +90,7 @@ static void inet_frags_free_cb(void *ptr, void *arg)
+ 
+ void inet_frags_exit_net(struct netns_frags *nf)
+ {
+-      nf->low_thresh = 0; /* prevent creation of new frags */
++      nf->high_thresh = 0; /* prevent creation of new frags */
+ 
+       rhashtable_free_and_destroy(&nf->rhashtable, inet_frags_free_cb, NULL);
+ }
+-- 
+2.19.1
+

diff --git a/queue-4.14/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch b/queue-4.14/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch
new file mode 100644 (file)
index 0000000..53fae71
--- /dev/null
+++ b/queue-4.14/mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch
@@ -0,0 +1,36 @@
+From 40ab5a1012dce57e120e34f494edd0980ad4afd6 Mon Sep 17 00:00:00 2001
+From: Vijay Viswanath <vviswana@codeaurora.org>
+Date: Fri, 25 Jan 2019 17:11:41 +0200
+Subject: mmc: Kconfig: Enable CONFIG_MMC_SDHCI_IO_ACCESSORS
+
+commit 99d570da309813f67e9c741edeff55bafc6c1d5e upstream.
+
+Enable CONFIG_MMC_SDHCI_IO_ACCESSORS so that SDHC controller specific
+register read and write APIs, if registered, can be used.
+
+Signed-off-by: Vijay Viswanath <vviswana@codeaurora.org>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Cc: Koen Vandeputte <koen.vandeputte@ncentric.com>
+Cc: Loic Poulain <loic.poulain@linaro.org>
+Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/mmc/host/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
+index 8c15637178ff..9ed786935a30 100644
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -429,6 +429,7 @@ config MMC_SDHCI_MSM
+       tristate "Qualcomm SDHCI Controller Support"
+       depends on ARCH_QCOM || (ARM && COMPILE_TEST)
+       depends on MMC_SDHCI_PLTFM
++      select MMC_SDHCI_IO_ACCESSORS
+       help
+         This selects the Secure Digital Host Controller Interface (SDHCI)
+         support present in Qualcomm SOCs. The controller supports
+-- 
+2.19.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index b88600c35c1b49e886ccd7d57034a6e3450214d4..c82e1d3ae846edb71448de6d610a3a2edba9775e 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -7,3 +7,5 @@ openvswitch-avoid-oob-read-when-parsing-flow-nlattrs.patch
 vhost-log-dirty-page-correctly.patch
 net-ipv4-fix-memory-leak-in-network-namespace-dismantle.patch
 tcp-allow-msg_zerocopy-transmission-also-in-close_wait-state.patch
+ipfrag-really-prevent-allocation-on-netns-exit.patch
+mmc-kconfig-enable-config_mmc_sdhci_io_accessors.patch