From: Greg Kroah-Hartman Date: Fri, 5 Jun 2020 10:59:40 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v5.7.1~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b3e96da33163459412459958090e97d77f8cf39;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mmc-fix-compilation-of-user-api.patch --- diff --git a/queue-4.4/mmc-fix-compilation-of-user-api.patch b/queue-4.4/mmc-fix-compilation-of-user-api.patch new file mode 100644 index 00000000000..f99a225695e --- /dev/null +++ b/queue-4.4/mmc-fix-compilation-of-user-api.patch @@ -0,0 +1,41 @@ +From 83fc5dd57f86c3ec7d6d22565a6ff6c948853b64 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= +Date: Mon, 11 May 2020 18:19:02 +0200 +Subject: mmc: fix compilation of user API +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jérôme Pouiller + +commit 83fc5dd57f86c3ec7d6d22565a6ff6c948853b64 upstream. + +The definitions of MMC_IOC_CMD and of MMC_IOC_MULTI_CMD rely on +MMC_BLOCK_MAJOR: + + #define MMC_IOC_CMD _IOWR(MMC_BLOCK_MAJOR, 0, struct mmc_ioc_cmd) + #define MMC_IOC_MULTI_CMD _IOWR(MMC_BLOCK_MAJOR, 1, struct mmc_ioc_multi_cmd) + +However, MMC_BLOCK_MAJOR is defined in linux/major.h and +linux/mmc/ioctl.h did not include it. + +Signed-off-by: Jérôme Pouiller +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20200511161902.191405-1-Jerome.Pouiller@silabs.com +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + include/uapi/linux/mmc/ioctl.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/include/uapi/linux/mmc/ioctl.h ++++ b/include/uapi/linux/mmc/ioctl.h +@@ -2,6 +2,7 @@ + #define LINUX_MMC_IOCTL_H + + #include ++#include + + struct mmc_ioc_cmd { + /* Implies direction of data. true = write, false = read */ diff --git a/queue-4.4/pppoe-only-process-padt-targeted-at-local-interfaces.patch b/queue-4.4/pppoe-only-process-padt-targeted-at-local-interfaces.patch index 5157436a8ad..0efdda1f766 100644 --- a/queue-4.4/pppoe-only-process-padt-targeted-at-local-interfaces.patch +++ b/queue-4.4/pppoe-only-process-padt-targeted-at-local-interfaces.patch @@ -18,14 +18,12 @@ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Guillaume Nault Signed-off-by: David S. Miller --- - drivers/net/ppp/pppoe.c | 3 +++ + drivers/net/ppp/pppoe.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c -index 39976892b312..13f8464741a1 100644 --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c -@@ -494,6 +494,9 @@ static int pppoe_disc_rcv(struct sk_buff *skb, struct net_device *dev, +@@ -494,6 +494,9 @@ static int pppoe_disc_rcv(struct sk_buff if (!skb) goto out; @@ -35,6 +33,3 @@ index 39976892b312..13f8464741a1 100644 if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) goto abort; --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 0f97b7c2d8b..75e25441639 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,3 +12,4 @@ net-bmac-fix-read-of-mac-address-from-rom.patch net-ethernet-freescale-rework-quiesce-activate-for-u.patch net-ethernet-stmmac-enable-interface-clocks-on-probe.patch pppoe-only-process-padt-targeted-at-local-interfaces.patch +mmc-fix-compilation-of-user-api.patch