4.20-stable patches

added patches:
	spi-bcm2835-unbreak-the-build-of-esoteric-configs.patch

diff --git a/queue-4.20/series b/queue-4.20/series
index cc71d614de70875e225bd091bbb1ac3994796114..aaded1df9a8064fe9d2ecd19c8043dc3b72ba2e7 100644 (file)
--- a/queue-4.20/series
+++ b/queue-4.20/series
@@ -7,13 +7,11 @@ ax25-fix-a-use-after-free-in-ax25_fillin_cb.patch
 ibmveth-fix-dma-unmap-error-in-ibmveth_xmit_start-error-path.patch
 ieee802154-lowpan_header_create-check-must-check-daddr.patch
 ip-validate-header-length-on-virtual-device-xmit.patch
-net-core-fix-spectre-v1-vulnerability.patch
 net-hamradio-6pack-use-mod_timer-to-rearm-timers.patch
 isdn-fix-kernel-infoleak-in-capi_unlocked_ioctl.patch
 netrom-fix-locking-in-nr_find_socket.patch
 net-wan-fix-a-double-free-in-x25_asy_open_tty.patch
 packet-validate-address-length-if-non-zero.patch
-phonet-af_phonet-fix-spectre-v1-vulnerability.patch
 ptr_ring-wrap-back-producer-in-__ptr_ring_swap_queue.patch
 sock-make-sock-sk_stamp-thread-safe.patch
 tipc-fix-a-double-free-in-tipc_enable_bearer.patch
@@ -143,3 +141,4 @@ arm64-compat-don-t-pull-syscall-number-from-regs-in-arm_compat_syscall.patch
 parisc-remap-hugepage-aligned-pages-in-set_kernel_text_rw.patch
 tpm-tpm_try_transmit-refactor-error-flow.patch
 tpm-tpm_i2c_nuvoton-use-correct-command-duration-for-tpm-2.x.patch
+spi-bcm2835-unbreak-the-build-of-esoteric-configs.patch

diff --git a/queue-4.20/spi-bcm2835-unbreak-the-build-of-esoteric-configs.patch b/queue-4.20/spi-bcm2835-unbreak-the-build-of-esoteric-configs.patch
new file mode 100644 (file)
index 0000000..8bc04c1
--- /dev/null
+++ b/queue-4.20/spi-bcm2835-unbreak-the-build-of-esoteric-configs.patch
@@ -0,0 +1,42 @@
+From 29bdedfd9cf40e59456110ca417a8cb672ac9b92 Mon Sep 17 00:00:00 2001
+From: Lukas Wunner <lukas@wunner.de>
+Date: Thu, 29 Nov 2018 15:14:49 +0100
+Subject: spi: bcm2835: Unbreak the build of esoteric configs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Lukas Wunner <lukas@wunner.de>
+
+commit 29bdedfd9cf40e59456110ca417a8cb672ac9b92 upstream.
+
+Commit e82b0b382845 ("spi: bcm2835: Fix race on DMA termination") broke
+the build with COMPILE_TEST=y on arches whose cmpxchg() requires 32-bit
+operands (xtensa, older arm ISAs).
+
+Fix by changing the dma_pending flag's type from bool to unsigned int.
+
+Fixes: e82b0b382845 ("spi: bcm2835: Fix race on DMA termination")
+Signed-off-by: Lukas Wunner <lukas@wunner.de>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Frank Pavlic <f.pavlic@kunbus.de>
+Cc: Martin Sperl <kernel@martin.sperl.org>
+Cc: Noralf Trønnes <noralf@tronnes.org>
+Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-bcm2835.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-bcm2835.c
++++ b/drivers/spi/spi-bcm2835.c
+@@ -88,7 +88,7 @@ struct bcm2835_spi {
+       u8 *rx_buf;
+       int tx_len;
+       int rx_len;
+-      bool dma_pending;
++      unsigned int dma_pending;
+ };
+ 
+ static inline u32 bcm2835_rd(struct bcm2835_spi *bs, unsigned reg)