backports.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/12] backports: Multiple fixes for kernel 4.20
@ 2018-12-02 11:52 Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 01/12] backports: Refresh patches on kernel 4.20-rc4 Hauke Mehrtens
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This fixes multiple problems in backport when using it with kernel 4.20-rc4.

"ckmake --allyesconfig" results with kernel 4.20-rc4:

1   3.10.108            [  LINK  ]
2   3.11.10             [  LINK  ]
3   3.12.74             [  OK  ]
4   3.13.11             [  LINK  ]
5   3.14.79             [  LINK  ]
6   3.15.10             [  LINK  ]
7   3.16.61             [  OK  ]
8   3.17.8              [  LINK  ]
9   3.18.128            [  OK  ]
10  3.19.8              [  LINK  ]
11  4.0.9               [  LINK  ]
12  4.1.52              [  OK  ]
13  4.2.8               [  LINK  ]
14  4.3.6               [  LINK  ]
15  4.4.166             [  OK  ]
16  4.5.7               [  OK  ]
17  4.6.7               [  OK  ]
18  4.7.10              [  OK  ]
19  4.8.17              [  OK  ]
20  4.9.142             [  OK  ]
21  4.10.17             [  OK  ]
22  4.11.12             [  OK  ]
23  4.12.14             [  OK  ]
24  4.13.16             [  OK  ]
25  4.14.85             [  OK  ]
26  4.15.18             [  OK  ]
27  4.16.18             [  OK  ]
28  4.17.19             [  OK  ]
29  4.18.20             [  OK  ]
30  4.19.6              [  OK  ]


Hauke Mehrtens (12):
  backports: Refresh patches on kernel 4.20-rc4
  backports: Add page_ref_count() and page_ref_sub_and_test()
  backports: Add page_frag_alloc() and __page_frag_cache_drain()
  backports: Add missing include for mt76
  backports: Add device_get_mac_address()
  backports: Remove BPAUTO_CRYPTO_SKCIPHER
  backports: Fix pci_alloc_irq_vectors() backport
  backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8"
  backports: Make TI WLCORE depend on kernel >= 4.2
  backports: Remove unused code from backport-public_key.h
  backports: Remove unused default configurations
  backports: Update wifi default configuration

 backport/backport-include/crypto/skcipher.h        | 454 -------------------
 backport/backport-include/linux/gfp.h              |  12 +
 backport/backport-include/linux/page_ref.h         |  10 +
 backport/backport-include/linux/pci.h              |   8 +
 backport/backport-include/linux/property.h         |  15 +
 backport/compat/Kconfig                            |   8 -
 backport/compat/Makefile                           |   2 -
 backport/compat/backport-4.10.c                    |  22 +
 backport/compat/backport-4.3.c                     |  57 +++
 backport/compat/backport-4.8.c                     |  49 +-
 backport/defconfigs/alx                            |   1 -
 backport/defconfigs/ath10k                         |   2 +
 backport/defconfigs/igb                            |   2 -
 backport/defconfigs/media                          | 498 ---------------------
 backport/defconfigs/wifi                           |  13 +
 dependencies                                       |  20 +-
 .../0002-disable-dump-adjust-on-old-kernels.patch  |   4 +-
 .../include_net_cfg80211.patch                     |   2 +-
 .../net_wireless_core.patch                        |   2 +-
 patches/0013-fix-makefile-includes/mt76.patch      |  10 +
 .../0014-netlink_seq/net_wireless_nl80211.patch    |   2 +-
 .../drivers_net_wireless_libertas_if_usb.patch     |   4 +-
 .../drivers_net_wireless_iwlwifi_iwl-debug.patch   |   6 +-
 patches/0021-umode_t-api-change/ath9k.patch        |   2 +-
 patches/0024-led-blink-api/mac80211.patch          |   2 +-
 patches/0025-usb-sg/usbnet.patch                   |   4 +-
 patches/0053-possible_net_t.patch                  |   2 +-
 patches/0055-name_assign_type/brcmfmac.patch       |   2 +-
 patches/0069-iwlwifi-pd-string-fix.patch           |   8 +-
 patches/0070-mac80211-fils.patch                   |   2 +-
 patches/0071-skb-head_frag/wireless.patch          |   2 +-
 patches/0077-genl-ro-after-init/hwsim.patch        |   2 +-
 patches/0077-genl-ro-after-init/nl80211.patch      |   2 +-
 patches/0085-iwlwifi-pci-device-removal.patch      |   4 +-
 patches/0090-use-skb_pad.patch                     |  11 -
 patches/crypto-skcipher.patch                      |  32 --
 patches/verify.patch                               |  37 ++
 37 files changed, 257 insertions(+), 1058 deletions(-)
 delete mode 100644 backport/backport-include/crypto/skcipher.h
 create mode 100644 backport/backport-include/linux/property.h
 delete mode 100644 backport/defconfigs/alx
 delete mode 100644 backport/defconfigs/igb
 delete mode 100644 backport/defconfigs/media
 create mode 100644 patches/0013-fix-makefile-includes/mt76.patch
 delete mode 100644 patches/0090-use-skb_pad.patch
 delete mode 100644 patches/crypto-skcipher.patch

-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply	[flat|nested] 14+ messages in thread

* [PATCH 01/12] backports: Refresh patches on kernel 4.20-rc4
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 02/12] backports: Add page_ref_count() and page_ref_sub_and_test() Hauke Mehrtens
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This patch was merged upstream and removed from backports:
 * patches/0090-use-skb_pad.patch

This patch was manually modified:
 * patches/0025-usb-sg/usbnet.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0002-disable-dump-adjust-on-old-kernels.patch         |  4 ++--
 patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch |  2 +-
 .../0010-add-wext-handlers-to-netdev/net_wireless_core.patch  |  2 +-
 patches/0014-netlink_seq/net_wireless_nl80211.patch           |  2 +-
 .../drivers_net_wireless_libertas_if_usb.patch                |  4 ++--
 .../drivers_net_wireless_iwlwifi_iwl-debug.patch              |  6 +++---
 patches/0021-umode_t-api-change/ath9k.patch                   |  2 +-
 patches/0024-led-blink-api/mac80211.patch                     |  2 +-
 patches/0025-usb-sg/usbnet.patch                              |  4 ++--
 patches/0053-possible_net_t.patch                             |  2 +-
 patches/0055-name_assign_type/brcmfmac.patch                  |  2 +-
 patches/0069-iwlwifi-pd-string-fix.patch                      |  8 ++++----
 patches/0070-mac80211-fils.patch                              |  2 +-
 patches/0071-skb-head_frag/wireless.patch                     |  2 +-
 patches/0077-genl-ro-after-init/hwsim.patch                   |  2 +-
 patches/0077-genl-ro-after-init/nl80211.patch                 |  2 +-
 patches/0085-iwlwifi-pci-device-removal.patch                 |  4 ++--
 patches/0090-use-skb_pad.patch                                | 11 -----------
 18 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 patches/0090-use-skb_pad.patch

diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index be1d9720..fa379bfe 100644
--- a/patches/0002-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/0002-disable-dump-adjust-on-old-kernels.patch
@@ -28,7 +28,7 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2174,6 +2174,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2204,6 +2204,7 @@ static int nl80211_dump_wiphy(struct sk_
  						 cb->nlh->nlmsg_seq,
  						 NLM_F_MULTI, state);
  			if (ret < 0) {
@@ -36,7 +36,7 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
  				/*
  				 * If sending the wiphy data didn't fit (ENOBUFS
  				 * or EMSGSIZE returned), this SKB is still
-@@ -2195,6 +2196,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2225,6 +2226,7 @@ static int nl80211_dump_wiphy(struct sk_
  					rtnl_unlock();
  					return 1;
  				}
diff --git a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
index f8159596..12f607d1 100644
--- a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -3971,6 +3971,9 @@ struct wiphy_iftype_ext_capab {
+@@ -4031,6 +4031,9 @@ struct wiphy_iftype_ext_capab {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
diff --git a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index e129648c..735599d5 100644
--- a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -11,7 +11,7 @@
  	device_initialize(&rdev->wiphy.dev);
  	rdev->wiphy.dev.class = &ieee80211_class;
  	rdev->wiphy.dev.platform_data = rdev;
-@@ -1215,6 +1211,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1235,6 +1231,15 @@ static int cfg80211_netdev_notifier_call
  		}
  		wdev->netdev = dev;
  #ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch
index 3bbaf287..e1c730bf 100644
--- a/patches/0014-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/0014-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -8206,7 +8206,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -8158,7 +8158,9 @@ static int nl80211_dump_scan(struct sk_b
  	if (start == 0)
  		cfg80211_bss_expire(rdev);
  
diff --git a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch
index 6dace46d..22108262 100644
--- a/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch
+++ b/patches/0016-libertas-olpc-ec-wakeup/drivers_net_wireless_libertas_if_usb.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/marvell/libertas/if_usb.c
 +++ b/drivers/net/wireless/marvell/libertas/if_usb.c
-@@ -938,6 +938,7 @@ static int if_usb_suspend(struct usb_int
+@@ -939,6 +939,7 @@ static int if_usb_suspend(struct usb_int
  		goto out;
  	}
  
@@ -8,7 +8,7 @@
  #ifdef CONFIG_OLPC
  	if (machine_is_olpc()) {
  		if (priv->wol_criteria == EHS_REMOVE_WAKEUP)
-@@ -946,6 +947,7 @@ static int if_usb_suspend(struct usb_int
+@@ -947,6 +948,7 @@ static int if_usb_suspend(struct usb_int
  			olpc_ec_wakeup_set(EC_SCI_SRC_WLAN);
  	}
  #endif
diff --git a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch b/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
index dba0a1de..d323f7ad 100644
--- a/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
+++ b/patches/0018-pv-trace-fixes/drivers_net_wireless_iwlwifi_iwl-debug.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
 +++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.c
-@@ -74,13 +74,16 @@ void __iwl_ ##fn(struct device *dev, con
+@@ -69,13 +69,16 @@ void __iwl_ ##fn(struct device *dev, con
  	struct va_format vaf = {				\
  		.fmt = fmt,					\
  	};							\
@@ -21,7 +21,7 @@
  }
  
  __iwl_fn(warn)
-@@ -99,13 +102,18 @@ void __iwl_err(struct device *dev, bool
+@@ -94,13 +97,18 @@ void __iwl_err(struct device *dev, bool
  	va_list args;
  
  	va_start(args, fmt);
@@ -41,7 +41,7 @@
  	trace_iwlwifi_err(&vaf);
  	va_end(args);
  }
-@@ -122,13 +130,19 @@ void __iwl_dbg(struct device *dev,
+@@ -117,13 +125,19 @@ void __iwl_dbg(struct device *dev,
  	va_list args;
  
  	va_start(args, fmt);
diff --git a/patches/0021-umode_t-api-change/ath9k.patch b/patches/0021-umode_t-api-change/ath9k.patch
index 9707a5a8..1be51cb9 100644
--- a/patches/0021-umode_t-api-change/ath9k.patch
+++ b/patches/0021-umode_t-api-change/ath9k.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/common-spectral.c
 +++ b/drivers/net/wireless/ath/ath9k/common-spectral.c
-@@ -1050,7 +1050,11 @@ static const struct file_operations fops
+@@ -1031,7 +1031,11 @@ static const struct file_operations fops
  
  static struct dentry *create_buf_file_handler(const char *filename,
  					      struct dentry *parent,
diff --git a/patches/0024-led-blink-api/mac80211.patch b/patches/0024-led-blink-api/mac80211.patch
index 42a02533..00a4007c 100644
--- a/patches/0024-led-blink-api/mac80211.patch
+++ b/patches/0024-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -1285,6 +1285,7 @@ struct ieee80211_local {
+@@ -1291,6 +1291,7 @@ struct ieee80211_local {
  	struct mutex chanctx_mtx;
  
  #ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/0025-usb-sg/usbnet.patch b/patches/0025-usb-sg/usbnet.patch
index 50c2d274..cab07250 100644
--- a/patches/0025-usb-sg/usbnet.patch
+++ b/patches/0025-usb-sg/usbnet.patch
@@ -58,10 +58,10 @@
 +#if LINUX_VERSION_IS_GEQ(3,35,0)
  			kfree(entry->urb->sg);
 +#endif
+ 			/* fall through */
  		case rx_cleanup:
  			usb_free_urb (entry->urb);
- 			dev_kfree_skb (skb);
-@@ -1893,7 +1911,9 @@ int usbnet_resume (struct usb_interface
+@@ -1894,7 +1912,9 @@ int usbnet_resume (struct usb_interface
  			retval = usb_submit_urb(res, GFP_ATOMIC);
  			if (retval < 0) {
  				dev_kfree_skb_any(skb);
diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch
index e052a16a..0fc1d23e 100644
--- a/patches/0053-possible_net_t.patch
+++ b/patches/0053-possible_net_t.patch
@@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
 index 04e5785..a251da1 100644
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -4113,12 +4113,12 @@ struct wiphy {
+@@ -4171,12 +4171,12 @@ struct wiphy {
  
  static inline struct net *wiphy_net(struct wiphy *wiphy)
  {
diff --git a/patches/0055-name_assign_type/brcmfmac.patch b/patches/0055-name_assign_type/brcmfmac.patch
index b9c9b390..ddf248cc 100644
--- a/patches/0055-name_assign_type/brcmfmac.patch
+++ b/patches/0055-name_assign_type/brcmfmac.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2203,7 +2203,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
+@@ -2215,7 +2215,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
  	}
  
  	strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
diff --git a/patches/0069-iwlwifi-pd-string-fix.patch b/patches/0069-iwlwifi-pd-string-fix.patch
index b2a6a512..ca7732d0 100644
--- a/patches/0069-iwlwifi-pd-string-fix.patch
+++ b/patches/0069-iwlwifi-pd-string-fix.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
 +++ b/drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c
-@@ -2419,12 +2419,23 @@ int iwl_dbgfs_register(struct iwl_priv *
+@@ -2414,12 +2414,23 @@ int iwl_dbgfs_register(struct iwl_priv *
  	 */
  	if (priv->mac80211_registered) {
  		char buf[100];
@@ -26,7 +26,7 @@
  			goto err;
 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
-@@ -1497,8 +1497,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
+@@ -1492,8 +1492,13 @@ void iwl_mvm_vif_dbgfs_register(struct i
  	mvmvif->dbgfs_dir = debugfs_create_dir("iwlmvm", dbgfs_dir);
  
  	if (!mvmvif->dbgfs_dir) {
@@ -40,7 +40,7 @@
  		return;
  	}
  
-@@ -1544,15 +1549,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
+@@ -1539,15 +1544,28 @@ void iwl_mvm_vif_dbgfs_register(struct i
  	 * find
  	 * netdev:wlan0 -> ../../../ieee80211/phy0/netdev:wlan0/iwlmvm/
  	 */
@@ -71,7 +71,7 @@
  	IWL_ERR(mvm, "Can't create debugfs entity\n");
 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
 +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c
-@@ -2056,7 +2056,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv
+@@ -2078,7 +2078,13 @@ int iwl_mvm_dbgfs_register(struct iwl_mv
  	 * Create a symlink with mac80211. It will be removed when mac80211
  	 * exists (before the opmode exists which removes the target.)
  	 */
diff --git a/patches/0070-mac80211-fils.patch b/patches/0070-mac80211-fils.patch
index bdbc8a94..c277a642 100644
--- a/patches/0070-mac80211-fils.patch
+++ b/patches/0070-mac80211-fils.patch
@@ -42,7 +42,7 @@
  #endif /* FILS_AEAD_H */
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -570,7 +570,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_
+@@ -571,7 +571,9 @@ struct ieee80211_hw *ieee80211_alloc_hw_
  			   NL80211_FEATURE_MAC_ON_CREATE |
  			   NL80211_FEATURE_USERSPACE_MPM |
  			   NL80211_FEATURE_FULL_AP_CLIENT_STATE;
diff --git a/patches/0071-skb-head_frag/wireless.patch b/patches/0071-skb-head_frag/wireless.patch
index d165630c..026a03e1 100644
--- a/patches/0071-skb-head_frag/wireless.patch
+++ b/patches/0071-skb-head_frag/wireless.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -634,7 +634,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
+@@ -637,7 +637,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
  	u8 *payload;
  	int offset = 0, remaining;
  	struct ethhdr eth;
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 986e2a04..6a1b7022 100644
--- a/patches/0077-genl-ro-after-init/hwsim.patch
+++ b/patches/0077-genl-ro-after-init/hwsim.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -3553,7 +3553,7 @@ static const struct genl_ops hwsim_ops[]
+@@ -3546,7 +3546,7 @@ static const struct genl_ops hwsim_ops[]
  	},
  };
  
diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch
index bb9f9013..a897be35 100644
--- a/patches/0077-genl-ro-after-init/nl80211.patch
+++ b/patches/0077-genl-ro-after-init/nl80211.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -13906,7 +13906,7 @@ static const struct genl_ops nl80211_ops
+@@ -13904,7 +13904,7 @@ static const struct genl_ops nl80211_ops
  	},
  };
  
diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch
index 6e1f1fff..f61f0172 100644
--- a/patches/0085-iwlwifi-pci-device-removal.patch
+++ b/patches/0085-iwlwifi-pci-device-removal.patch
@@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel
 index cc8c53dc0ab6..68296b65a680 100644
 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
 +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1922,6 +1922,9 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)
+@@ -1941,6 +1941,9 @@ static void iwl_trans_pcie_removal_wk(st
  	struct iwl_trans_pcie_removal *removal =
  		container_of(wk, struct iwl_trans_pcie_removal, work);
  	struct pci_dev *pdev = removal->pdev;
@@ -12,7 +12,7 @@ index cc8c53dc0ab6..68296b65a680 100644
  	char *prop[] = {"EVENT=INACCESSIBLE", NULL};
  
  	dev_err(&pdev->dev, "Device gone - attempting removal\n");
-@@ -1930,6 +1933,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)
+@@ -1949,6 +1952,7 @@ static void iwl_trans_pcie_removal_wk(st
  	pci_dev_put(pdev);
  	pci_stop_and_remove_bus_device(pdev);
  	pci_unlock_rescan_remove();
diff --git a/patches/0090-use-skb_pad.patch b/patches/0090-use-skb_pad.patch
deleted file mode 100644
index 086328c1..00000000
--- a/patches/0090-use-skb_pad.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/mediatek/mt76/usb.c
-+++ b/drivers/net/wireless/mediatek/mt76/usb.c
-@@ -535,7 +535,7 @@ int mt76u_skb_dma_info(struct sk_buff *s
- 	}
- 
- 	if (unlikely(pad)) {
--		if (__skb_pad(last, pad, true))
-+		if (skb_pad(last, pad))
- 			return -ENOMEM;
- 		__skb_put(last, pad);
- 	}
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 02/12] backports: Add page_ref_count() and page_ref_sub_and_test()
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 01/12] backports: Refresh patches on kernel 4.20-rc4 Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 03/12] backports: Add page_frag_alloc() and __page_frag_cache_drain() Hauke Mehrtens
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This was introduced in kernel commit fe896d18789 ("mm: introduce page
reference manipulation functions") and will be used by
__page_frag_cache_drain() in the next commit.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/page_ref.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backport/backport-include/linux/page_ref.h b/backport/backport-include/linux/page_ref.h
index 55fc14f5..e45734ec 100644
--- a/backport/backport-include/linux/page_ref.h
+++ b/backport/backport-include/linux/page_ref.h
@@ -8,6 +8,16 @@ static inline void page_ref_inc(struct page *page)
 {
 	atomic_inc(&page->_count);
 }
+
+static inline int page_ref_count(struct page *page)
+{
+	return atomic_read(&page->_count);
+}
+
+static inline int page_ref_sub_and_test(struct page *page, int nr)
+{
+	return atomic_sub_and_test(nr, &page->_count);
+}
 #endif
 
 #endif /* __BP_PAGE_REF_H */
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 03/12] backports: Add page_frag_alloc() and __page_frag_cache_drain()
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 01/12] backports: Refresh patches on kernel 4.20-rc4 Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 02/12] backports: Add page_ref_count() and page_ref_sub_and_test() Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 04/12] backports: Add missing include for mt76 Hauke Mehrtens
                   ` (9 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This was introduced in kernel commit 8c2dd3e4a4b ("mm: rename
__alloc_page_frag to page_frag_alloc and __free_page_frag to
page_frag_free") and commit 44fdffd7050 ("mm: add support for releasing
multiple instances of a page") and is used by the mt76 driver.
Backporting it to kernel older than 4.2 is harder so just do it till
that version.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/gfp.h | 12 ++++++++++++
 backport/compat/backport-4.10.c       | 22 ++++++++++++++++++++++
 dependencies                          |  9 +++++----
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/backport/backport-include/linux/gfp.h b/backport/backport-include/linux/gfp.h
index 42f818f1..d41d4277 100644
--- a/backport/backport-include/linux/gfp.h
+++ b/backport/backport-include/linux/gfp.h
@@ -10,4 +10,16 @@
 #define __GFP_KSWAPD_RECLAIM	((__force gfp_t)___GFP_KSWAPD_RECLAIM) /* kswapd can wake */
 #endif
 
+#if LINUX_VERSION_IS_LESS(4,10,0) && LINUX_VERSION_IS_GEQ(4,2,0)
+#define page_frag_alloc LINUX_BACKPORT(page_frag_alloc)
+static inline void *page_frag_alloc(struct page_frag_cache *nc,
+				    unsigned int fragsz, gfp_t gfp_mask)
+{
+	return __alloc_page_frag(nc, fragsz, gfp_mask);
+}
+
+#define __page_frag_cache_drain LINUX_BACKPORT(__page_frag_cache_drain)
+void __page_frag_cache_drain(struct page *page, unsigned int count);
+#endif /* < 4.10 && >= 4.2 */
+
 #endif /* __BACKPORT_LINUX_GFP_H */
diff --git a/backport/compat/backport-4.10.c b/backport/compat/backport-4.10.c
index 44e02dd7..a35c699e 100644
--- a/backport/compat/backport-4.10.c
+++ b/backport/compat/backport-4.10.c
@@ -12,6 +12,8 @@
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/page_ref.h>
+#include <linux/gfp.h>
 
 #if LINUX_VERSION_IS_GEQ(4,6,0)
 #if LINUX_VERSION_IS_LESS(4,7,0)
@@ -252,3 +254,23 @@ int mii_ethtool_get_link_ksettings(struct mii_if_info *mii,
 }
 EXPORT_SYMBOL(mii_ethtool_get_link_ksettings);
 #endif /* LINUX_VERSION_IS_GEQ(4,6,0) */
+
+#if LINUX_VERSION_IS_GEQ(4,2,0)
+void __page_frag_cache_drain(struct page *page, unsigned int count)
+{
+	VM_BUG_ON_PAGE(page_ref_count(page) == 0, page);
+
+	if (page_ref_sub_and_test(page, count)) {
+		unsigned int order = compound_order(page);
+
+		/*
+		 * __free_pages_ok() is not exported so call
+		 * __free_pages() which decrements the ref counter
+		 * and increment the ref counter before.
+		 */
+		page_ref_inc(page);
+		__free_pages(page, order);
+	}
+}
+EXPORT_SYMBOL_GPL(__page_frag_cache_drain);
+#endif
diff --git a/dependencies b/dependencies
index 84bffd77..7d483a28 100644
--- a/dependencies
+++ b/dependencies
@@ -71,11 +71,12 @@ RSI_SDIO 3.13
 # For Coexsitence the BT driver has to export rsi_bt_ops
 RSI_COEX 4.17
 
-# depends on devm_led_classdev_register()
+# depends on devm_led_classdev_register() and struct page_frag_cache
 # (can't use MT76_CORE for this as it's selected)
-MT76x0U 4.1
-MT76x2E 4.1
-MT76x2U 4.1
+MT76x0U 4.2
+MT76x0E 4.2
+MT76x2E 4.2
+MT76x2U 4.2
 
 # select_queue_fallback_t is missing
 RTL8723BS 3.14
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 04/12] backports: Add missing include for mt76
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (2 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 03/12] backports: Add page_frag_alloc() and __page_frag_cache_drain() Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 05/12] backports: Add device_get_mac_address() Hauke Mehrtens
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

Without the inclusion of linux/module.h, MODULE_FIRMWARE was not
declared when compiling against some kernel versions, add it.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0013-fix-makefile-includes/mt76.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 patches/0013-fix-makefile-includes/mt76.patch

diff --git a/patches/0013-fix-makefile-includes/mt76.patch b/patches/0013-fix-makefile-includes/mt76.patch
new file mode 100644
index 00000000..4f122c46
--- /dev/null
+++ b/patches/0013-fix-makefile-includes/mt76.patch
@@ -0,0 +1,10 @@
+--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
++++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb_mcu.c
+@@ -15,6 +15,7 @@
+  */
+ #include <linux/kernel.h>
+ #include <linux/firmware.h>
++#include <linux/module.h>
+ 
+ #include "mt76x0.h"
+ #include "mcu.h"
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 05/12] backports: Add device_get_mac_address()
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (3 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 04/12] backports: Add missing include for mt76 Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 06/12] backports: Remove BPAUTO_CRYPTO_SKCIPHER Hauke Mehrtens
                   ` (7 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This was added in commit 4c96b7dc0d39 ("Add a matching set of device_
functions for determining mac/phy") and is used by ath10k now. On kernel
< 3.18 call of_property_read_u8_array() only because the device_
function was only added in kernel 3.18.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/property.h | 15 ++++++++
 backport/compat/backport-4.3.c             | 57 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 backport/backport-include/linux/property.h

diff --git a/backport/backport-include/linux/property.h b/backport/backport-include/linux/property.h
new file mode 100644
index 00000000..a0d7bed1
--- /dev/null
+++ b/backport/backport-include/linux/property.h
@@ -0,0 +1,15 @@
+#ifndef __BACKPORT_LINUX_PROPERTY_H_
+#define __BACKPORT_LINUX_PROPERTY_H_
+#include <linux/version.h>
+#if LINUX_VERSION_IS_GEQ(3,18,17)
+#include_next <linux/property.h>
+#endif
+
+#if LINUX_VERSION_IS_LESS(4,3,0)
+
+#define device_get_mac_address LINUX_BACKPORT(device_get_mac_address)
+void *device_get_mac_address(struct device *dev, char *addr, int alen);
+
+#endif /* < 4.3 */
+
+#endif /* __BACKPORT_LINUX_PROPERTY_H_ */
diff --git a/backport/compat/backport-4.3.c b/backport/compat/backport-4.3.c
index 88be5720..04698ad3 100644
--- a/backport/compat/backport-4.3.c
+++ b/backport/compat/backport-4.3.c
@@ -15,6 +15,9 @@
 #include <linux/printk.h>
 #include <linux/thermal.h>
 #include <linux/slab.h>
+#include <linux/property.h>
+#include <linux/etherdevice.h>
+#include <linux/of.h>
 
 #ifdef CONFIG_THERMAL
 #if LINUX_VERSION_IS_GEQ(3,8,0)
@@ -245,3 +248,57 @@ ssize_t strscpy(char *dest, const char *src, size_t count)
 	return -E2BIG;
 }
 EXPORT_SYMBOL_GPL(strscpy);
+
+static void *device_get_mac_addr(struct device *dev,
+				 const char *name, char *addr,
+				 int alen)
+{
+#if LINUX_VERSION_IS_GEQ(3,18,0)
+	int ret = device_property_read_u8_array(dev, name, addr, alen);
+#else
+	int ret = of_property_read_u8_array(dev->of_node, name, addr, alen);
+#endif
+
+	if (ret == 0 && alen == ETH_ALEN && is_valid_ether_addr(addr))
+		return addr;
+	return NULL;
+}
+
+/**
+ * device_get_mac_address - Get the MAC for a given device
+ * @dev:	Pointer to the device
+ * @addr:	Address of buffer to store the MAC in
+ * @alen:	Length of the buffer pointed to by addr, should be ETH_ALEN
+ *
+ * Search the firmware node for the best MAC address to use.  'mac-address' is
+ * checked first, because that is supposed to contain to "most recent" MAC
+ * address. If that isn't set, then 'local-mac-address' is checked next,
+ * because that is the default address.  If that isn't set, then the obsolete
+ * 'address' is checked, just in case we're using an old device tree.
+ *
+ * Note that the 'address' property is supposed to contain a virtual address of
+ * the register set, but some DTS files have redefined that property to be the
+ * MAC address.
+ *
+ * All-zero MAC addresses are rejected, because those could be properties that
+ * exist in the firmware tables, but were not updated by the firmware.  For
+ * example, the DTS could define 'mac-address' and 'local-mac-address', with
+ * zero MAC addresses.  Some older U-Boots only initialized 'local-mac-address'.
+ * In this case, the real MAC is in 'local-mac-address', and 'mac-address'
+ * exists but is all zeros.
+*/
+void *device_get_mac_address(struct device *dev, char *addr, int alen)
+{
+	char *res;
+
+	res = device_get_mac_addr(dev, "mac-address", addr, alen);
+	if (res)
+		return res;
+
+	res = device_get_mac_addr(dev, "local-mac-address", addr, alen);
+	if (res)
+		return res;
+
+	return device_get_mac_addr(dev, "address", addr, alen);
+}
+EXPORT_SYMBOL_GPL(device_get_mac_address);
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 06/12] backports: Remove BPAUTO_CRYPTO_SKCIPHER
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (4 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 05/12] backports: Add device_get_mac_address() Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 07/12] backports: Fix pci_alloc_irq_vectors() backport Hauke Mehrtens
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This was added in commit 32751c901728 ("backport: add crypto skcipher
interface"), but all the drivers which need it were deactivated in
commit cdcec8e6128 ("backports: disable things needing LIB80211 unless
SKCIPHER can exist") because it does not compile any more. Remove this
code now completely from the tree and keep these drivers deactivated on
kernel < 4.3.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/crypto/skcipher.h | 454 ----------------------------
 backport/compat/Kconfig                     |   8 -
 backport/compat/Makefile                    |   2 -
 patches/crypto-skcipher.patch               |  32 --
 4 files changed, 496 deletions(-)
 delete mode 100644 backport/backport-include/crypto/skcipher.h
 delete mode 100644 patches/crypto-skcipher.patch

diff --git a/backport/backport-include/crypto/skcipher.h b/backport/backport-include/crypto/skcipher.h
deleted file mode 100644
index 73ba7830..00000000
--- a/backport/backport-include/crypto/skcipher.h
+++ /dev/null
@@ -1,454 +0,0 @@
-#ifndef _BACKPORT_CRYPTO_SKCIPHER_H
-#define _BACKPORT_CRYPTO_SKCIPHER_H
-#include_next <crypto/skcipher.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_IS_LESS(4,3,0)
-/**
- *	struct skcipher_request - Symmetric key cipher request
- *	@cryptlen: Number of bytes to encrypt or decrypt
- *	@iv: Initialisation Vector
- *	@src: Source SG list
- *	@dst: Destination SG list
- *	@base: Underlying async request request
- *	@__ctx: Start of private context data
- */
-#define skcipher_request LINUX_BACKPORT(skcipher_request)
-struct skcipher_request {
-	unsigned int cryptlen;
-
-	u8 *iv;
-
-	struct scatterlist *src;
-	struct scatterlist *dst;
-
-	struct crypto_async_request base;
-
-	void *__ctx[] CRYPTO_MINALIGN_ATTR;
-};
-
-#define crypto_skcipher LINUX_BACKPORT(crypto_skcipher)
-struct crypto_skcipher {
-	int (*setkey)(struct crypto_skcipher *tfm, const u8 *key,
-	              unsigned int keylen);
-	int (*encrypt)(struct skcipher_request *req);
-	int (*decrypt)(struct skcipher_request *req);
-
-	unsigned int ivsize;
-	unsigned int reqsize;
-	unsigned int keysize;
-
-	struct crypto_tfm base;
-};
-
-#ifndef SKCIPHER_REQUEST_ON_STACK
-#define SKCIPHER_REQUEST_ON_STACK(name, tfm) \
-	char __##name##_desc[sizeof(struct skcipher_request) + \
-		crypto_skcipher_reqsize(tfm)] CRYPTO_MINALIGN_ATTR; \
-	struct skcipher_request *name = (void *)__##name##_desc
-#endif
-
-/**
- * DOC: Symmetric Key Cipher API
- *
- * Symmetric key cipher API is used with the ciphers of type
- * CRYPTO_ALG_TYPE_SKCIPHER (listed as type "skcipher" in /proc/crypto).
- *
- * Asynchronous cipher operations imply that the function invocation for a
- * cipher request returns immediately before the completion of the operation.
- * The cipher request is scheduled as a separate kernel thread and therefore
- * load-balanced on the different CPUs via the process scheduler. To allow
- * the kernel crypto API to inform the caller about the completion of a cipher
- * request, the caller must provide a callback function. That function is
- * invoked with the cipher handle when the request completes.
- *
- * To support the asynchronous operation, additional information than just the
- * cipher handle must be supplied to the kernel crypto API. That additional
- * information is given by filling in the skcipher_request data structure.
- *
- * For the symmetric key cipher API, the state is maintained with the tfm
- * cipher handle. A single tfm can be used across multiple calls and in
- * parallel. For asynchronous block cipher calls, context data supplied and
- * only used by the caller can be referenced the request data structure in
- * addition to the IV used for the cipher request. The maintenance of such
- * state information would be important for a crypto driver implementer to
- * have, because when calling the callback function upon completion of the
- * cipher operation, that callback function may need some information about
- * which operation just finished if it invoked multiple in parallel. This
- * state information is unused by the kernel crypto API.
- */
-
-#define __crypto_skcipher_cast LINUX_BACKPORT(__crypto_skcipher_cast)
-static inline struct crypto_skcipher *__crypto_skcipher_cast(
-	struct crypto_tfm *tfm)
-{
-	return container_of(tfm, struct crypto_skcipher, base);
-}
-
-/**
- * crypto_alloc_skcipher() - allocate symmetric key cipher handle
- * @alg_name: is the cra_name / name or cra_driver_name / driver name of the
- *	      skcipher cipher
- * @type: specifies the type of the cipher
- * @mask: specifies the mask for the cipher
- *
- * Allocate a cipher handle for an skcipher. The returned struct
- * crypto_skcipher is the cipher handle that is required for any subsequent
- * API invocation for that skcipher.
- *
- * Return: allocated cipher handle in case of success; IS_ERR() is true in case
- *	   of an error, PTR_ERR() returns the error code.
- */
-#define crypto_alloc_skcipher LINUX_BACKPORT(crypto_alloc_skcipher)
-struct crypto_skcipher *crypto_alloc_skcipher(const char *alg_name,
-					      u32 type, u32 mask);
-
-#define crypto_skcipher_tfm LINUX_BACKPORT(crypto_skcipher_tfm)
-static inline struct crypto_tfm *crypto_skcipher_tfm(
-	struct crypto_skcipher *tfm)
-{
-	return &tfm->base;
-}
-
-/**
- * crypto_free_skcipher() - zeroize and free cipher handle
- * @tfm: cipher handle to be freed
- */
-#define crypto_free_skcipher LINUX_BACKPORT(crypto_free_skcipher)
-static inline void crypto_free_skcipher(struct crypto_skcipher *tfm)
-{
-	crypto_destroy_tfm(tfm, crypto_skcipher_tfm(tfm));
-}
-
-/**
- * crypto_has_skcipher() - Search for the availability of an skcipher.
- * @alg_name: is the cra_name / name or cra_driver_name / driver name of the
- *	      skcipher
- * @type: specifies the type of the cipher
- * @mask: specifies the mask for the cipher
- *
- * Return: true when the skcipher is known to the kernel crypto API; false
- *	   otherwise
- */
-#define crypto_has_skcipher LINUX_BACKPORT(crypto_has_skcipher)
-static inline int crypto_has_skcipher(const char *alg_name, u32 type,
-					u32 mask)
-{
-	return crypto_has_alg(alg_name, crypto_skcipher_type(type),
-			      crypto_skcipher_mask(mask));
-}
-
-#define crypto_skcipher_driver_name LINUX_BACKPORT(crypto_skcipher_driver_name)
-static inline const char *crypto_skcipher_driver_name(
-	struct crypto_skcipher *tfm)
-{
-	return crypto_tfm_alg_driver_name(crypto_skcipher_tfm(tfm));
-}
-
-/**
- * crypto_skcipher_ivsize() - obtain IV size
- * @tfm: cipher handle
- *
- * The size of the IV for the skcipher referenced by the cipher handle is
- * returned. This IV size may be zero if the cipher does not need an IV.
- *
- * Return: IV size in bytes
- */
-#define crypto_skcipher_ivsize LINUX_BACKPORT(crypto_skcipher_ivsize)
-static inline unsigned int crypto_skcipher_ivsize(struct crypto_skcipher *tfm)
-{
-	return tfm->ivsize;
-}
-
-/**
- * crypto_skcipher_blocksize() - obtain block size of cipher
- * @tfm: cipher handle
- *
- * The block size for the skcipher referenced with the cipher handle is
- * returned. The caller may use that information to allocate appropriate
- * memory for the data returned by the encryption or decryption operation
- *
- * Return: block size of cipher
- */
-#define crypto_skcipher_blocksize LINUX_BACKPORT(crypto_skcipher_blocksize)
-static inline unsigned int crypto_skcipher_blocksize(
-	struct crypto_skcipher *tfm)
-{
-	return crypto_tfm_alg_blocksize(crypto_skcipher_tfm(tfm));
-}
-
-#define crypto_skcipher_alignmask LINUX_BACKPORT(crypto_skcipher_alignmask)
-static inline unsigned int crypto_skcipher_alignmask(
-	struct crypto_skcipher *tfm)
-{
-	return crypto_tfm_alg_alignmask(crypto_skcipher_tfm(tfm));
-}
-
-#define crypto_skcipher_get_flags LINUX_BACKPORT(crypto_skcipher_get_flags)
-static inline u32 crypto_skcipher_get_flags(struct crypto_skcipher *tfm)
-{
-	return crypto_tfm_get_flags(crypto_skcipher_tfm(tfm));
-}
-
-#define crypto_skcipher_set_flags LINUX_BACKPORT(crypto_skcipher_set_flags)
-static inline void crypto_skcipher_set_flags(struct crypto_skcipher *tfm,
-					       u32 flags)
-{
-	crypto_tfm_set_flags(crypto_skcipher_tfm(tfm), flags);
-}
-
-#define crypto_skcipher_clear_flags LINUX_BACKPORT(crypto_skcipher_clear_flags)
-static inline void crypto_skcipher_clear_flags(struct crypto_skcipher *tfm,
-						 u32 flags)
-{
-	crypto_tfm_clear_flags(crypto_skcipher_tfm(tfm), flags);
-}
-
-/**
- * crypto_skcipher_setkey() - set key for cipher
- * @tfm: cipher handle
- * @key: buffer holding the key
- * @keylen: length of the key in bytes
- *
- * The caller provided key is set for the skcipher referenced by the cipher
- * handle.
- *
- * Note, the key length determines the cipher type. Many block ciphers implement
- * different cipher modes depending on the key size, such as AES-128 vs AES-192
- * vs. AES-256. When providing a 16 byte key for an AES cipher handle, AES-128
- * is performed.
- *
- * Return: 0 if the setting of the key was successful; < 0 if an error occurred
- */
-#define crypto_skcipher_setkey LINUX_BACKPORT(crypto_skcipher_setkey)
-static inline int crypto_skcipher_setkey(struct crypto_skcipher *tfm,
-					 const u8 *key, unsigned int keylen)
-{
-	return tfm->setkey(tfm, key, keylen);
-}
-
-#define crypto_skcipher_has_setkey LINUX_BACKPORT(crypto_skcipher_has_setkey)
-static inline bool crypto_skcipher_has_setkey(struct crypto_skcipher *tfm)
-{
-	return tfm->keysize;
-}
-
-#define crypto_skcipher_default_keysize LINUX_BACKPORT(crypto_skcipher_default_keysize)
-static inline unsigned int crypto_skcipher_default_keysize(
-	struct crypto_skcipher *tfm)
-{
-	return tfm->keysize;
-}
-
-/**
- * crypto_skcipher_reqtfm() - obtain cipher handle from request
- * @req: skcipher_request out of which the cipher handle is to be obtained
- *
- * Return the crypto_skcipher handle when furnishing an skcipher_request
- * data structure.
- *
- * Return: crypto_skcipher handle
- */
-#define crypto_skcipher_reqtfm LINUX_BACKPORT(crypto_skcipher_reqtfm)
-static inline struct crypto_skcipher *crypto_skcipher_reqtfm(
-	struct skcipher_request *req)
-{
-	return __crypto_skcipher_cast(req->base.tfm);
-}
-
-/**
- * crypto_skcipher_encrypt() - encrypt plaintext
- * @req: reference to the skcipher_request handle that holds all information
- *	 needed to perform the cipher operation
- *
- * Encrypt plaintext data using the skcipher_request handle. That data
- * structure and how it is filled with data is discussed with the
- * skcipher_request_* functions.
- *
- * Return: 0 if the cipher operation was successful; < 0 if an error occurred
- */
-#define crypto_skcipher_encrypt LINUX_BACKPORT(crypto_skcipher_encrypt)
-static inline int crypto_skcipher_encrypt(struct skcipher_request *req)
-{
-	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-
-	return tfm->encrypt(req);
-}
-
-/**
- * crypto_skcipher_decrypt() - decrypt ciphertext
- * @req: reference to the skcipher_request handle that holds all information
- *	 needed to perform the cipher operation
- *
- * Decrypt ciphertext data using the skcipher_request handle. That data
- * structure and how it is filled with data is discussed with the
- * skcipher_request_* functions.
- *
- * Return: 0 if the cipher operation was successful; < 0 if an error occurred
- */
-#define crypto_skcipher_decrypt LINUX_BACKPORT(crypto_skcipher_decrypt)
-static inline int crypto_skcipher_decrypt(struct skcipher_request *req)
-{
-	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-
-	return tfm->decrypt(req);
-}
-
-/**
- * DOC: Symmetric Key Cipher Request Handle
- *
- * The skcipher_request data structure contains all pointers to data
- * required for the symmetric key cipher operation. This includes the cipher
- * handle (which can be used by multiple skcipher_request instances), pointer
- * to plaintext and ciphertext, asynchronous callback function, etc. It acts
- * as a handle to the skcipher_request_* API calls in a similar way as
- * skcipher handle to the crypto_skcipher_* API calls.
- */
-
-/**
- * crypto_skcipher_reqsize() - obtain size of the request data structure
- * @tfm: cipher handle
- *
- * Return: number of bytes
- */
-#define crypto_skcipher_reqsize LINUX_BACKPORT(crypto_skcipher_reqsize)
-static inline unsigned int crypto_skcipher_reqsize(struct crypto_skcipher *tfm)
-{
-	return tfm->reqsize;
-}
-
-/**
- * skcipher_request_set_tfm() - update cipher handle reference in request
- * @req: request handle to be modified
- * @tfm: cipher handle that shall be added to the request handle
- *
- * Allow the caller to replace the existing skcipher handle in the request
- * data structure with a different one.
- */
-#define skcipher_request_set_tfm LINUX_BACKPORT(skcipher_request_set_tfm)
-static inline void skcipher_request_set_tfm(struct skcipher_request *req,
-					    struct crypto_skcipher *tfm)
-{
-	req->base.tfm = crypto_skcipher_tfm(tfm);
-}
-
-#define skcipher_request_cast LINUX_BACKPORT(skcipher_request_cast)
-static inline struct skcipher_request *skcipher_request_cast(
-	struct crypto_async_request *req)
-{
-	return container_of(req, struct skcipher_request, base);
-}
-
-/**
- * skcipher_request_alloc() - allocate request data structure
- * @tfm: cipher handle to be registered with the request
- * @gfp: memory allocation flag that is handed to kmalloc by the API call.
- *
- * Allocate the request data structure that must be used with the skcipher
- * encrypt and decrypt API calls. During the allocation, the provided skcipher
- * handle is registered in the request data structure.
- *
- * Return: allocated request handle in case of success; IS_ERR() is true in case
- *	   of an error, PTR_ERR() returns the error code.
- */
-#define skcipher_request LINUX_BACKPORT(skcipher_request)
-static inline struct skcipher_request *skcipher_request_alloc(
-	struct crypto_skcipher *tfm, gfp_t gfp)
-{
-	struct skcipher_request *req;
-
-	req = kmalloc(sizeof(struct skcipher_request) +
-		      crypto_skcipher_reqsize(tfm), gfp);
-
-	if (likely(req))
-		skcipher_request_set_tfm(req, tfm);
-
-	return req;
-}
-
-/**
- * skcipher_request_free() - zeroize and free request data structure
- * @req: request data structure cipher handle to be freed
- */
-#define skcipher_request_free LINUX_BACKPORT(skcipher_request_free)
-static inline void skcipher_request_free(struct skcipher_request *req)
-{
-	kzfree(req);
-}
-
-/**
- * skcipher_request_set_callback() - set asynchronous callback function
- * @req: request handle
- * @flags: specify zero or an ORing of the flags
- *         CRYPTO_TFM_REQ_MAY_BACKLOG the request queue may back log and
- *	   increase the wait queue beyond the initial maximum size;
- *	   CRYPTO_TFM_REQ_MAY_SLEEP the request processing may sleep
- * @compl: callback function pointer to be registered with the request handle
- * @data: The data pointer refers to memory that is not used by the kernel
- *	  crypto API, but provided to the callback function for it to use. Here,
- *	  the caller can provide a reference to memory the callback function can
- *	  operate on. As the callback function is invoked asynchronously to the
- *	  related functionality, it may need to access data structures of the
- *	  related functionality which can be referenced using this pointer. The
- *	  callback function can access the memory via the "data" field in the
- *	  crypto_async_request data structure provided to the callback function.
- *
- * This function allows setting the callback function that is triggered once the
- * cipher operation completes.
- *
- * The callback function is registered with the skcipher_request handle and
- * must comply with the following template
- *
- *	void callback_function(struct crypto_async_request *req, int error)
- */
-#define skcipher_request_set_callback LINUX_BACKPORT(skcipher_request_set_callback)
-static inline void skcipher_request_set_callback(struct skcipher_request *req,
-						 u32 flags,
-						 crypto_completion_t compl,
-						 void *data)
-{
-	req->base.complete = compl;
-	req->base.data = data;
-	req->base.flags = flags;
-}
-
-/**
- * skcipher_request_set_crypt() - set data buffers
- * @req: request handle
- * @src: source scatter / gather list
- * @dst: destination scatter / gather list
- * @cryptlen: number of bytes to process from @src
- * @iv: IV for the cipher operation which must comply with the IV size defined
- *      by crypto_skcipher_ivsize
- *
- * This function allows setting of the source data and destination data
- * scatter / gather lists.
- *
- * For encryption, the source is treated as the plaintext and the
- * destination is the ciphertext. For a decryption operation, the use is
- * reversed - the source is the ciphertext and the destination is the plaintext.
- */
-#define skcipher_request_set_crypt LINUX_BACKPORT(skcipher_request_set_crypt)
-static inline void skcipher_request_set_crypt(
-	struct skcipher_request *req,
-	struct scatterlist *src, struct scatterlist *dst,
-	unsigned int cryptlen, void *iv)
-{
-	req->src = src;
-	req->dst = dst;
-	req->cryptlen = cryptlen;
-	req->iv = iv;
-}
-#endif /* < 4.3 */
-
-#if LINUX_VERSION_IS_LESS(4,6,0)
-#define skcipher_request_zero LINUX_BACKPORT(skcipher_request_zero)
-static inline void skcipher_request_zero(struct skcipher_request *req)
-{
-	struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
-
-	memzero_explicit(req, sizeof(*req) + crypto_skcipher_reqsize(tfm));
-}
-#endif /* < 4.6 */
-
-#endif /* _BACKPORT_CRYPTO_SKCIPHER_H */
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index f88a646e..bb5d864c 100644
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -102,14 +102,6 @@ config BPAUTO_USERSEL_BUILD_ALL
 	  It's only really useful for compat testing, so
 	  you probably shouldn't enable it.
 
-config BPAUTO_CRYPTO_SKCIPHER
-	tristate
-	depends on KERNEL_4_3
-	default y if BACKPORTED_LIB80211_CRYPT_WEP
-	default y if BACKPORTED_LIB80211_CRYPT_TKIP
-	#c-file crypto/skcipher.c
-	#module-name skcipher
-
 config BPAUTO_WANT_DEV_COREDUMP
 	bool
 
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index fdc68c8b..99b52faa 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -41,8 +41,6 @@ compat-$(CPTCFG_KERNEL_4_20) += backport-4.20.o
 
 compat-$(CPTCFG_KERNEL_4_20) += backport-genetlink.o
 
-compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
-
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7.asn1.o
 compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/pkcs7_verify.o
diff --git a/patches/crypto-skcipher.patch b/patches/crypto-skcipher.patch
deleted file mode 100644
index 99eedb24..00000000
--- a/patches/crypto-skcipher.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/compat/crypto-skcipher.c
-+++ b/compat/crypto-skcipher.c
-@@ -26,7 +26,28 @@
- #include <linux/seq_file.h>
- #include <net/netlink.h>
- 
--#include "internal.h"
-+struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,
-+				      u32 mask);
-+
-+void *crypto_alloc_tfm(const char *alg_name,
-+		       const struct crypto_type *frontend, u32 type, u32 mask);
-+
-+struct crypto_alg *crypto_mod_get(struct crypto_alg *alg);
-+
-+static inline void *crypto_skcipher_ctx(struct crypto_skcipher *tfm)
-+{
-+	return crypto_tfm_ctx(&tfm->base);
-+}
-+
-+static inline void *skcipher_request_ctx(struct skcipher_request *req)
-+{
-+	return req->__ctx;
-+}
-+
-+static inline u32 skcipher_request_flags(struct skcipher_request *req)
-+{
-+	return req->base.flags;
-+}
- 
- enum {
- 	SKCIPHER_WALK_PHYS = 1 << 0,
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 07/12] backports: Fix pci_alloc_irq_vectors() backport
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (5 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 06/12] backports: Remove BPAUTO_CRYPTO_SKCIPHER Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 08/12] backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8" Hauke Mehrtens
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens, Omer Dagan

This copies the pci_alloc_irq_vectors() function from kernel 4.9 and
replaces the __pci_enable_msi{x}_range() calls with calls to
pci_enable_msi{x}_range(), these were backported to kernel versions <
3.14, so no need to handle the older kernels specially here.

This also adds support for MSIx IRQs and adds the PCI_IRQ_* defines.

Fixes: 162a6b312f1b ("add support for pci_alloc_irq_vectors")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Omer Dagan <omer.dagan@tandemg.com>
---
 backport/backport-include/linux/pci.h |  8 ++++++
 backport/compat/backport-4.8.c        | 49 +++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/backport/backport-include/linux/pci.h b/backport/backport-include/linux/pci.h
index 531f5a47..3a141bf3 100644
--- a/backport/backport-include/linux/pci.h
+++ b/backport/backport-include/linux/pci.h
@@ -224,4 +224,12 @@ static inline struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
 
 #endif/* <4.9.0 but not >= 3.12.69, 4.4.37, 4.8.13 */
 
+#ifndef PCI_IRQ_LEGACY
+#define PCI_IRQ_LEGACY		(1 << 0) /* Allow legacy interrupts */
+#define PCI_IRQ_MSI		(1 << 1) /* Allow MSI interrupts */
+#define PCI_IRQ_MSIX		(1 << 2) /* Allow MSI-X interrupts */
+#define PCI_IRQ_ALL_TYPES \
+	(PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX)
+#endif
+
 #endif /* _BACKPORT_LINUX_PCI_H */
diff --git a/backport/compat/backport-4.8.c b/backport/compat/backport-4.8.c
index a53e39c9..11b2e7d7 100644
--- a/backport/compat/backport-4.8.c
+++ b/backport/compat/backport-4.8.c
@@ -148,25 +148,48 @@ EXPORT_SYMBOL_GPL(cdc_parse_cdc_header);
 
 #ifdef CONFIG_PCI
 #ifdef CONFIG_PCI_MSI
+
+/**
+ * pci_alloc_irq_vectors - allocate multiple IRQs for a device
+ * @dev:		PCI device to operate on
+ * @min_vecs:		minimum number of vectors required (must be >= 1)
+ * @max_vecs:		maximum (desired) number of vectors
+ * @flags:		flags or quirks for the allocation
+ *
+ * Allocate up to @max_vecs interrupt vectors for @dev, using MSI-X or MSI
+ * vectors if available, and fall back to a single legacy vector
+ * if neither is available.  Return the number of vectors allocated,
+ * (which might be smaller than @max_vecs) if successful, or a negative
+ * error code on error. If less than @min_vecs interrupt vectors are
+ * available for @dev the function will fail with -ENOSPC.
+ *
+ * To get the Linux IRQ number used for a vector that can be passed to
+ * request_irq() use the pci_irq_vector() helper.
+ */
 int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
 		unsigned int max_vecs, unsigned int flags)
 {
-	int res;
-	int msi_nvect = max_vecs;
+	int vecs = -ENOSPC;
 
-	if (max_vecs < min_vecs)
-		return -ERANGE;
+	if (flags & PCI_IRQ_MSIX) {
+		vecs = pci_enable_msix_range(dev, NULL, min_vecs, max_vecs);
+		if (vecs > 0)
+			return vecs;
+	}
+
+	if (flags & PCI_IRQ_MSI) {
+		vecs = pci_enable_msi_range(dev, min_vecs, max_vecs);
+		if (vecs > 0)
+			return vecs;
+	}
 
-#if LINUX_VERSION_IS_LESS(3,15,0)
-	res = pci_enable_msi_block(dev, msi_nvect);
-	if (res == 0) {
-		return msi_nvect;
+	/* use legacy irq if allowed */
+	if ((flags & PCI_IRQ_LEGACY) && min_vecs == 1) {
+		pci_intx(dev, 1);
+		return 1;
 	}
-#else
-	res = pci_enable_msi_range(dev, msi_nvect, msi_nvect);
-	return msi_nvect;
-#endif /*LINUX_VERSION_IS_LESS(3,15,0)*/
-	return -ENOSPC;
+
+	return vecs;
 }
 EXPORT_SYMBOL_GPL(pci_alloc_irq_vectors);
 #endif /* CONFIG_PCI_MSI */
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 08/12] backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8"
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (6 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 07/12] backports: Fix pci_alloc_irq_vectors() backport Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 09/12] backports: Make TI WLCORE depend on kernel >= 4.2 Hauke Mehrtens
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

pci_alloc_irq_vectors() was added in commit 162a6b312f1 ("add support
for pci_alloc_irq_vectors"), with this backport the WIL6210 driver works
again.

This reverts commit fbafdbe972402aad051d91d557f9cbb272844939.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dependencies b/dependencies
index 7d483a28..1972ac7e 100644
--- a/dependencies
+++ b/dependencies
@@ -81,6 +81,3 @@ MT76x2U 4.2
 # select_queue_fallback_t is missing
 RTL8723BS 3.14
 R8188EU  3.14
-
-# pci_alloc_irq_vectors is missing
-WIL6210 4.8
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 09/12] backports: Make TI WLCORE depend on kernel >= 4.2
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (7 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 08/12] backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8" Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 10/12] backports: Remove unused code from backport-public_key.h Hauke Mehrtens
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

This driver includes linux/pm_wakeirq.h which was added in kernel 4.2,
deactivate this driver on older kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dependencies b/dependencies
index 1972ac7e..239c0b17 100644
--- a/dependencies
+++ b/dependencies
@@ -8,10 +8,10 @@ WL1251_SDIO 3.15
 WL1251_SDIO kconfig: CONFIG_WILINK_PLATFORM_DATA
 WLCORE_SDIO 3.15
 
-# needs no_seek_end_llseek()
-WLCORE 3.2
-WL12XX 3.2
-WL18XX 3.2
+# This needs linux/pm_wakeirq.h
+WLCORE 4.2
+WL12XX 4.2
+WL18XX 4.2
 
 # hostapd uses proc_create_single_data()
 HOSTAP 4.18
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 10/12] backports: Remove unused code from backport-public_key.h
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (8 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 09/12] backports: Make TI WLCORE depend on kernel >= 4.2 Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 11/12] backports: Remove unused default configurations Hauke Mehrtens
                   ` (2 subsequent siblings)
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

These functions declared in backport-public_key.h are not implemented in
backports, and they were causing warnings because kernel_pkey_params was
not declared before.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/verify.patch | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/patches/verify.patch b/patches/verify.patch
index 791de881..d52b7ce4 100644
--- a/patches/verify.patch
+++ b/patches/verify.patch
@@ -62,3 +62,40 @@
  struct x509_certificate {
  	struct x509_certificate *next;
  	struct x509_certificate *signer;	/* Certificate that signed this one */
+--- a/include/crypto/backport-public_key.h
++++ b/include/crypto/backport-public_key.h
+@@ -50,34 +50,6 @@ extern void public_key_signature_free(st
+ 
+ extern struct asymmetric_key_subtype public_key_subtype;
+ 
+-struct key;
+-struct key_type;
+-union key_payload;
+-
+-extern int restrict_link_by_signature(struct key *dest_keyring,
+-				      const struct key_type *type,
+-				      const union key_payload *payload,
+-				      struct key *trust_keyring);
+-
+-extern int restrict_link_by_key_or_keyring(struct key *dest_keyring,
+-					   const struct key_type *type,
+-					   const union key_payload *payload,
+-					   struct key *trusted);
+-
+-extern int restrict_link_by_key_or_keyring_chain(struct key *trust_keyring,
+-						 const struct key_type *type,
+-						 const union key_payload *payload,
+-						 struct key *trusted);
+-
+-extern int query_asymmetric_key(const struct kernel_pkey_params *,
+-				struct kernel_pkey_query *);
+-
+-extern int encrypt_blob(struct kernel_pkey_params *, const void *, void *);
+-extern int decrypt_blob(struct kernel_pkey_params *, const void *, void *);
+-extern int create_signature(struct kernel_pkey_params *, const void *, void *);
+-extern int verify_signature(const struct key *,
+-			    const struct public_key_signature *);
+-
+ int public_key_verify_signature(const struct public_key *pkey,
+ 				const struct public_key_signature *sig);
+ 
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 11/12] backports: Remove unused default configurations
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (9 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 10/12] backports: Remove unused code from backport-public_key.h Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-02 11:52 ` [PATCH 12/12] backports: Update wifi default configuration Hauke Mehrtens
  2018-12-07 20:01 ` [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

The alx, igb and the media driver were removed some time ago, also
remove the default configurations.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/defconfigs/alx   |   1 -
 backport/defconfigs/igb   |   2 -
 backport/defconfigs/media | 498 ----------------------------------------------
 3 files changed, 501 deletions(-)
 delete mode 100644 backport/defconfigs/alx
 delete mode 100644 backport/defconfigs/igb
 delete mode 100644 backport/defconfigs/media

diff --git a/backport/defconfigs/alx b/backport/defconfigs/alx
deleted file mode 100644
index b4ae66f7..00000000
--- a/backport/defconfigs/alx
+++ /dev/null
@@ -1 +0,0 @@
-CPTCFG_ALX=m
diff --git a/backport/defconfigs/igb b/backport/defconfigs/igb
deleted file mode 100644
index 80452574..00000000
--- a/backport/defconfigs/igb
+++ /dev/null
@@ -1,2 +0,0 @@
-CPTCFG_NET_VENDOR_INTEL=y
-CPTCFG_IGB=m
diff --git a/backport/defconfigs/media b/backport/defconfigs/media
deleted file mode 100644
index a0445837..00000000
--- a/backport/defconfigs/media
+++ /dev/null
@@ -1,498 +0,0 @@
-CPTCFG_DVB_A8293=m
-CPTCFG_DVB_AF9013=m
-CPTCFG_DVB_AF9033=m
-CPTCFG_DVB_AS102=m
-CPTCFG_DVB_AS102_FE=m
-CPTCFG_DVB_ATBM8830=m
-CPTCFG_DVB_AU8522=m
-CPTCFG_DVB_AU8522_DTV=m
-CPTCFG_DVB_AU8522_V4L=m
-CPTCFG_DVB_AV7110=m
-CPTCFG_DVB_B2C2_FLEXCOP=m
-CPTCFG_DVB_B2C2_FLEXCOP_PCI=m
-CPTCFG_DVB_B2C2_FLEXCOP_USB=m
-CPTCFG_DVB_BCM3510=m
-CPTCFG_DVB_BT8XX=m
-CPTCFG_DVB_BUDGET=m
-CPTCFG_DVB_BUDGET_AV=m
-CPTCFG_DVB_BUDGET_CI=m
-CPTCFG_DVB_BUDGET_CORE=m
-CPTCFG_DVB_BUDGET_PATCH=m
-CPTCFG_DVB_CORE=m
-CPTCFG_DVB_CX22700=m
-CPTCFG_DVB_CX22702=m
-CPTCFG_DVB_CX24110=m
-CPTCFG_DVB_CX24116=m
-CPTCFG_DVB_CX24123=m
-CPTCFG_DVB_CXD2820R=m
-CPTCFG_DVB_DDBRIDGE=m
-CPTCFG_DVB_DIB3000MB=m
-CPTCFG_DVB_DIB3000MC=m
-CPTCFG_DVB_DIB7000M=m
-CPTCFG_DVB_DIB7000P=m
-CPTCFG_DVB_DIB8000=m
-CPTCFG_DVB_DIB9000=m
-CPTCFG_DVB_DM1105=m
-CPTCFG_DVB_DRXD=m
-CPTCFG_DVB_DRXK=m
-CPTCFG_DVB_DS3000=m
-CPTCFG_DVB_DUMMY_FE=m
-CPTCFG_DVB_EC100=m
-CPTCFG_DVB_FIREDTV=m
-CPTCFG_DVB_FIREDTV_INPUT=y
-CPTCFG_DVB_HD29L2=m
-CPTCFG_DVB_HOPPER=m
-CPTCFG_DVB_ISL6405=m
-CPTCFG_DVB_ISL6421=m
-CPTCFG_DVB_ISL6423=m
-CPTCFG_DVB_IX2505V=m
-CPTCFG_DVB_L64781=m
-CPTCFG_DVB_LG2160=m
-CPTCFG_DVB_LGDT3305=m
-CPTCFG_DVB_LGDT330X=m
-CPTCFG_DVB_LGS8GL5=m
-CPTCFG_DVB_LGS8GXX=m
-CPTCFG_DVB_LNBP21=m
-CPTCFG_DVB_LNBP22=m
-CPTCFG_DVB_M88RS2000=m
-CPTCFG_DVB_MANTIS=m
-CPTCFG_DVB_MB86A16=m
-CPTCFG_DVB_MB86A20S=m
-CPTCFG_DVB_MT312=m
-CPTCFG_DVB_MT352=m
-CPTCFG_DVB_NGENE=m
-CPTCFG_DVB_NXT200X=m
-CPTCFG_DVB_NXT6000=m
-CPTCFG_DVB_OR51132=m
-CPTCFG_DVB_OR51211=m
-CPTCFG_DVB_PLL=m
-CPTCFG_DVB_PLUTO2=m
-CPTCFG_DVB_PT1=m
-CPTCFG_DVB_PT3=m
-CPTCFG_DVB_RTL2830=m
-CPTCFG_DVB_RTL2832=m
-CPTCFG_DVB_S5H1409=m
-CPTCFG_DVB_S5H1411=m
-CPTCFG_DVB_S5H1420=m
-CPTCFG_DVB_S5H1432=m
-CPTCFG_DVB_S921=m
-CPTCFG_DVB_SI21XX=m
-CPTCFG_DVB_SP8870=m
-CPTCFG_DVB_SP887X=m
-CPTCFG_DVB_STB0899=m
-CPTCFG_DVB_STB6000=m
-CPTCFG_DVB_STB6100=m
-CPTCFG_DVB_STV0288=m
-CPTCFG_DVB_STV0297=m
-CPTCFG_DVB_STV0299=m
-CPTCFG_DVB_STV0367=m
-CPTCFG_DVB_STV0900=m
-CPTCFG_DVB_STV090x=m
-CPTCFG_DVB_STV6110=m
-CPTCFG_DVB_STV6110x=m
-CPTCFG_DVB_TDA10021=m
-CPTCFG_DVB_TDA10023=m
-CPTCFG_DVB_TDA10048=m
-CPTCFG_DVB_TDA1004X=m
-CPTCFG_DVB_TDA10071=m
-CPTCFG_DVB_TDA10086=m
-CPTCFG_DVB_TDA18271C2DD=m
-CPTCFG_DVB_TDA665x=m
-CPTCFG_DVB_TDA8083=m
-CPTCFG_DVB_TDA8261=m
-CPTCFG_DVB_TDA826X=m
-CPTCFG_DVB_TS2020=m
-CPTCFG_DVB_TTUSB_BUDGET=m
-CPTCFG_DVB_TTUSB_DEC=m
-CPTCFG_DVB_TUA6100=m
-CPTCFG_DVB_TUNER_CX24113=m
-CPTCFG_DVB_TUNER_DIB0070=m
-CPTCFG_DVB_TUNER_DIB0090=m
-CPTCFG_DVB_TUNER_ITD1000=m
-CPTCFG_DVB_USB=m
-CPTCFG_DVB_USB_A800=m
-CPTCFG_DVB_USB_AF9005=m
-CPTCFG_DVB_USB_AF9005_REMOTE=m
-CPTCFG_DVB_USB_AF9015=m
-CPTCFG_DVB_USB_AF9035=m
-CPTCFG_DVB_USB_ANYSEE=m
-CPTCFG_DVB_USB_AU6610=m
-CPTCFG_DVB_USB_AZ6007=m
-CPTCFG_DVB_USB_AZ6027=m
-CPTCFG_DVB_USB_CE6230=m
-CPTCFG_DVB_USB_CINERGY_T2=m
-CPTCFG_DVB_USB_CXUSB=m
-CPTCFG_DVB_USB_CYPRESS_FIRMWARE=m
-CPTCFG_DVB_USB_DIB0700=m
-CPTCFG_DVB_USB_DIBUSB_MB=m
-CPTCFG_DVB_USB_DIBUSB_MC=m
-CPTCFG_DVB_USB_DIGITV=m
-CPTCFG_DVB_USB_DTT200U=m
-CPTCFG_DVB_USB_DTV5100=m
-CPTCFG_DVB_USB_DVBSKY=m
-CPTCFG_DVB_USB_DW2102=m
-CPTCFG_DVB_USB_EC168=m
-CPTCFG_DVB_USB_FRIIO=m
-CPTCFG_DVB_USB_GL861=m
-CPTCFG_DVB_USB_GP8PSK=m
-CPTCFG_DVB_USB_LME2510=m
-CPTCFG_DVB_USB_M920X=m
-CPTCFG_DVB_USB_MXL111SF=m
-CPTCFG_DVB_USB_NOVA_T_USB2=m
-CPTCFG_DVB_USB_OPERA1=m
-CPTCFG_DVB_USB_PCTV452E=m
-CPTCFG_DVB_USB_RTL28XXU=m
-CPTCFG_DVB_USB_TECHNISAT_USB2=m
-CPTCFG_DVB_USB_TTUSB2=m
-CPTCFG_DVB_USB_UMT_010=m
-CPTCFG_DVB_USB_V2=m
-CPTCFG_DVB_USB_VP702X=m
-CPTCFG_DVB_USB_VP7045=m
-CPTCFG_DVB_VES1820=m
-CPTCFG_DVB_VES1X93=m
-CPTCFG_DVB_ZL10036=m
-CPTCFG_DVB_ZL10039=m
-CPTCFG_DVB_ZL10353=m
-CPTCFG_I2C_SI470X=m
-CPTCFG_I2C_SI4713=m
-CPTCFG_IR_ENE=m
-CPTCFG_IR_FINTEK=m
-CPTCFG_IR_GPIO_CIR=m
-CPTCFG_IR_IGUANA=m
-CPTCFG_IR_IMG=m
-CPTCFG_IR_IMG_HW=y
-CPTCFG_IR_IMG_JVC=y
-CPTCFG_IR_IMG_NEC=y
-CPTCFG_IR_IMG_RAW=y
-CPTCFG_IR_IMG_SANYO=y
-CPTCFG_IR_IMG_SHARP=y
-CPTCFG_IR_IMG_SONY=y
-CPTCFG_IR_IMON=m
-CPTCFG_IR_ITE_CIR=m
-CPTCFG_IR_JVC_DECODER=m
-CPTCFG_IR_LIRC_CODEC=m
-CPTCFG_IR_MCEUSB=m
-CPTCFG_IR_MCE_KBD_DECODER=m
-CPTCFG_IR_NEC_DECODER=m
-CPTCFG_IR_NUVOTON=m
-CPTCFG_IR_RC5_DECODER=m
-CPTCFG_IR_RC6_DECODER=m
-CPTCFG_IR_REDRAT3=m
-CPTCFG_IR_RX51=m
-CPTCFG_IR_SANYO_DECODER=m
-CPTCFG_IR_SONY_DECODER=m
-CPTCFG_IR_STREAMZAP=m
-CPTCFG_IR_TTUSBIR=m
-CPTCFG_IR_WINBOND_CIR=m
-CPTCFG_LIRC=m
-CPTCFG_MANTIS_CORE=m
-CPTCFG_MEDIA_ALTERA_CI=m
-CPTCFG_MEDIA_ANALOG_TV_SUPPORT=y
-CPTCFG_MEDIA_CAMERA_SUPPORT=y
-CPTCFG_MEDIA_CONTROLLER=y
-CPTCFG_MEDIA_DIGITAL_TV_SUPPORT=y
-CPTCFG_MEDIA_PCI_SUPPORT=y
-CPTCFG_MEDIA_RADIO_SUPPORT=y
-CPTCFG_MEDIA_RC_SUPPORT=y
-CPTCFG_MEDIA_SDR_SUPPORT=y
-CPTCFG_MEDIA_SUPPORT=m
-CPTCFG_MEDIA_USB_SUPPORT=y
-CPTCFG_PLATFORM_SI4713=m
-CPTCFG_RADIO_AZTECH=m
-CPTCFG_RADIO_CADET=m
-CPTCFG_RADIO_GEMTEK=m
-CPTCFG_RADIO_ISA=m
-CPTCFG_RADIO_MAXIRADIO=m
-CPTCFG_RADIO_MIROPCM20=m
-CPTCFG_RADIO_RTRACK2=m
-CPTCFG_RADIO_RTRACK=m
-CPTCFG_RADIO_SAA7706H=m
-CPTCFG_RADIO_SF16FMI=m
-CPTCFG_RADIO_SF16FMR2=m
-CPTCFG_RADIO_SHARK2=m
-CPTCFG_RADIO_SHARK=m
-CPTCFG_RADIO_SI470X=y
-CPTCFG_RADIO_SI4713=m
-CPTCFG_RADIO_SI476X=m
-CPTCFG_RADIO_TEA5764=m
-CPTCFG_RADIO_TEF6862=m
-CPTCFG_RADIO_TERRATEC=m
-CPTCFG_RADIO_TIMBERDALE=m
-CPTCFG_RADIO_TRUST=m
-CPTCFG_RADIO_TYPHOON=m
-CPTCFG_RADIO_WL1273=m
-CPTCFG_RADIO_WL128X=m
-CPTCFG_RADIO_ZOLTRIX=m
-CPTCFG_RC_ATI_REMOTE=m
-CPTCFG_RC_CORE=m
-CPTCFG_RC_DEVICES=y
-CPTCFG_RC_LOOPBACK=m
-CPTCFG_RC_MAP=m
-CPTCFG_SMS_SDIO_DRV=m
-CPTCFG_SMS_SIANO_MDTV=m
-CPTCFG_SMS_USB_DRV=m
-CPTCFG_SOC_CAMERA=m
-CPTCFG_SOC_CAMERA_IMX074=m
-CPTCFG_SOC_CAMERA_MT9M001=m
-CPTCFG_SOC_CAMERA_MT9M111=m
-CPTCFG_SOC_CAMERA_MT9T031=m
-CPTCFG_SOC_CAMERA_MT9T112=m
-CPTCFG_SOC_CAMERA_MT9V022=m
-CPTCFG_SOC_CAMERA_OV2640=m
-CPTCFG_SOC_CAMERA_OV5642=m
-CPTCFG_SOC_CAMERA_OV6650=m
-CPTCFG_SOC_CAMERA_OV772X=m
-CPTCFG_SOC_CAMERA_OV9640=m
-CPTCFG_SOC_CAMERA_OV9740=m
-CPTCFG_SOC_CAMERA_PLATFORM=m
-CPTCFG_SOC_CAMERA_RJ54N1=m
-CPTCFG_SOC_CAMERA_TW9910=m
-CPTCFG_STA2X11_VIP=m
-CPTCFG_TTPCI_EEPROM=m
-CPTCFG_USB_AIRSPY=m
-CPTCFG_USB_DSBR=m
-CPTCFG_USB_GL860=m
-CPTCFG_USB_GSPCA=m
-CPTCFG_USB_GSPCA_BENQ=m
-CPTCFG_USB_GSPCA_CONEX=m
-CPTCFG_USB_GSPCA_CPIA1=m
-CPTCFG_USB_GSPCA_DTCS033=m
-CPTCFG_USB_GSPCA_ETOMS=m
-CPTCFG_USB_GSPCA_FINEPIX=m
-CPTCFG_USB_GSPCA_JEILINJ=m
-CPTCFG_USB_GSPCA_JL2005BCD=m
-CPTCFG_USB_GSPCA_KINECT=m
-CPTCFG_USB_GSPCA_KONICA=m
-CPTCFG_USB_GSPCA_MARS=m
-CPTCFG_USB_GSPCA_MR97310A=m
-CPTCFG_USB_GSPCA_NW80X=m
-CPTCFG_USB_GSPCA_OV519=m
-CPTCFG_USB_GSPCA_OV534=m
-CPTCFG_USB_GSPCA_OV534_9=m
-CPTCFG_USB_GSPCA_PAC207=m
-CPTCFG_USB_GSPCA_PAC7302=m
-CPTCFG_USB_GSPCA_PAC7311=m
-CPTCFG_USB_GSPCA_SE401=m
-CPTCFG_USB_GSPCA_SN9C2028=m
-CPTCFG_USB_GSPCA_SN9C20X=m
-CPTCFG_USB_GSPCA_SONIXB=m
-CPTCFG_USB_GSPCA_SONIXJ=m
-CPTCFG_USB_GSPCA_SPCA1528=m
-CPTCFG_USB_GSPCA_SPCA500=m
-CPTCFG_USB_GSPCA_SPCA501=m
-CPTCFG_USB_GSPCA_SPCA505=m
-CPTCFG_USB_GSPCA_SPCA506=m
-CPTCFG_USB_GSPCA_SPCA508=m
-CPTCFG_USB_GSPCA_SPCA561=m
-CPTCFG_USB_GSPCA_SQ905=m
-CPTCFG_USB_GSPCA_SQ905C=m
-CPTCFG_USB_GSPCA_SQ930X=m
-CPTCFG_USB_GSPCA_STK014=m
-CPTCFG_USB_GSPCA_STK1135=m
-CPTCFG_USB_GSPCA_STV0680=m
-CPTCFG_USB_GSPCA_SUNPLUS=m
-CPTCFG_USB_GSPCA_T613=m
-CPTCFG_USB_GSPCA_TOPRO=m
-CPTCFG_USB_GSPCA_TV8532=m
-CPTCFG_USB_GSPCA_VC032X=m
-CPTCFG_USB_GSPCA_VICAM=m
-CPTCFG_USB_GSPCA_XIRLINK_CIT=m
-CPTCFG_USB_GSPCA_ZC3XX=m
-CPTCFG_USB_HACKRF=m
-CPTCFG_USB_KEENE=m
-CPTCFG_USB_M5602=m
-CPTCFG_USB_MA901=m
-CPTCFG_USB_MR800=m
-CPTCFG_USB_MSI2500=m
-CPTCFG_USB_PWC=m
-CPTCFG_USB_RAREMONO=m
-CPTCFG_USB_S2255=m
-CPTCFG_USB_SI470X=m
-CPTCFG_USB_SI4713=m
-CPTCFG_USB_STKWEBCAM=m
-CPTCFG_USB_STV06XX=m
-CPTCFG_USB_VIDEO_CLASS=m
-CPTCFG_USB_ZR364XX=m
-CPTCFG_V4L2_MEM2MEM_DEV=m
-CPTCFG_V4L_MEM2MEM_DRIVERS=y
-CPTCFG_V4L_PLATFORM_DRIVERS=y
-CPTCFG_VIDEOBUF2_CORE=m
-CPTCFG_VIDEOBUF2_DMA_CONTIG=m
-CPTCFG_VIDEOBUF2_DMA_SG=m
-CPTCFG_VIDEOBUF2_MEMOPS=m
-CPTCFG_VIDEOBUF2_VMALLOC=m
-CPTCFG_VIDEOBUF_DMA_CONTIG=m
-CPTCFG_VIDEOBUF_DMA_SG=m
-CPTCFG_VIDEOBUF_DVB=m
-CPTCFG_VIDEOBUF_GEN=m
-CPTCFG_VIDEOBUF_VMALLOC=m
-CPTCFG_VIDEO_AD9389B=m
-CPTCFG_VIDEO_ADP1653=m
-CPTCFG_VIDEO_ADV7170=m
-CPTCFG_VIDEO_ADV7175=m
-CPTCFG_VIDEO_ADV7180=m
-CPTCFG_VIDEO_ADV7183=m
-CPTCFG_VIDEO_ADV7343=m
-CPTCFG_VIDEO_ADV7393=m
-CPTCFG_VIDEO_ADV7604=m
-CPTCFG_VIDEO_AK881X=m
-CPTCFG_VIDEO_APTINA_PLL=m
-CPTCFG_VIDEO_AS3645A=m
-CPTCFG_VIDEO_ATMEL_ISI=m
-CPTCFG_VIDEO_AU0828=m
-CPTCFG_VIDEO_AU0828_RC=y
-CPTCFG_VIDEO_BLACKFIN_CAPTURE=m
-CPTCFG_VIDEO_BLACKFIN_PPI=m
-CPTCFG_VIDEO_BT819=m
-CPTCFG_VIDEO_BT848=m
-CPTCFG_VIDEO_BT856=m
-CPTCFG_VIDEO_BT866=m
-CPTCFG_VIDEO_CAFE_CCIC=m
-CPTCFG_VIDEO_CODA=m
-CPTCFG_VIDEO_CPIA2=m
-CPTCFG_VIDEO_CS5345=m
-CPTCFG_VIDEO_CS53L32A=m
-CPTCFG_VIDEO_CX18=m
-CPTCFG_VIDEO_CX18_ALSA=m
-CPTCFG_VIDEO_CX231XX=m
-CPTCFG_VIDEO_CX231XX_ALSA=m
-CPTCFG_VIDEO_CX231XX_DVB=m
-CPTCFG_VIDEO_CX231XX_RC=y
-CPTCFG_VIDEO_CX2341X=m
-CPTCFG_VIDEO_CX23885=m
-CPTCFG_VIDEO_CX25821=m
-CPTCFG_VIDEO_CX25821_ALSA=m
-CPTCFG_VIDEO_CX25840=m
-CPTCFG_VIDEO_CX88=m
-CPTCFG_VIDEO_CX88_ALSA=m
-CPTCFG_VIDEO_CX88_BLACKBIRD=m
-CPTCFG_VIDEO_CX88_DVB=m
-CPTCFG_VIDEO_CX88_MPEG=m
-CPTCFG_VIDEO_CX88_VP3054=m
-CPTCFG_VIDEO_DAVINCI_VPBE_DISPLAY=m
-CPTCFG_VIDEO_DAVINCI_VPIF_CAPTURE=m
-CPTCFG_VIDEO_DAVINCI_VPIF_DISPLAY=m
-CPTCFG_VIDEO_DEV=m
-CPTCFG_VIDEO_DM355_CCDC=m
-CPTCFG_VIDEO_DM6446_CCDC=m
-CPTCFG_VIDEO_EM28XX=m
-CPTCFG_VIDEO_EM28XX_ALSA=m
-CPTCFG_VIDEO_EM28XX_DVB=m
-CPTCFG_VIDEO_EM28XX_RC=m
-CPTCFG_VIDEO_EM28XX_V4L2=m
-CPTCFG_VIDEO_EXYNOS_FIMC_LITE=m
-CPTCFG_VIDEO_FB_IVTV=m
-CPTCFG_VIDEO_GO7007=m
-CPTCFG_VIDEO_GO7007_USB=m
-CPTCFG_VIDEO_GO7007_USB_S2250_BOARD=m
-CPTCFG_VIDEO_HDPVR=m
-CPTCFG_VIDEO_HEXIUM_GEMINI=m
-CPTCFG_VIDEO_HEXIUM_ORION=m
-CPTCFG_VIDEO_IR_I2C=m
-CPTCFG_VIDEO_IVTV=m
-CPTCFG_VIDEO_IVTV_ALSA=m
-CPTCFG_VIDEO_KS0127=m
-CPTCFG_VIDEO_M32R_AR_M64278=m
-CPTCFG_VIDEO_M52790=m
-CPTCFG_VIDEO_M5MOLS=m
-CPTCFG_VIDEO_MEM2MEM_DEINTERLACE=m
-CPTCFG_VIDEO_MEYE=m
-CPTCFG_VIDEO_MMP_CAMERA=m
-CPTCFG_VIDEO_MSP3400=m
-CPTCFG_VIDEO_MT9M032=m
-CPTCFG_VIDEO_MT9P031=m
-CPTCFG_VIDEO_MT9T001=m
-CPTCFG_VIDEO_MT9V011=m
-CPTCFG_VIDEO_MT9V032=m
-CPTCFG_VIDEO_MXB=m
-CPTCFG_VIDEO_NOON010PC30=m
-CPTCFG_VIDEO_OMAP2_VOUT=m
-CPTCFG_VIDEO_OMAP3=m
-CPTCFG_VIDEO_OV7640=m
-CPTCFG_VIDEO_OV7670=m
-CPTCFG_VIDEO_OV9650=m
-CPTCFG_VIDEO_PVRUSB2=m
-CPTCFG_VIDEO_PXA27x=m
-CPTCFG_VIDEO_S3C_CAMIF=m
-CPTCFG_VIDEO_S5C73M3=m
-CPTCFG_VIDEO_S5K4ECGX=m
-CPTCFG_VIDEO_S5K6AA=m
-CPTCFG_VIDEO_S5P_FIMC=m
-CPTCFG_VIDEO_S5P_MIPI_CSIS=m
-CPTCFG_VIDEO_SAA6588=m
-CPTCFG_VIDEO_SAA7110=m
-CPTCFG_VIDEO_SAA711X=m
-CPTCFG_VIDEO_SAA7127=m
-CPTCFG_VIDEO_SAA7134=m
-CPTCFG_VIDEO_SAA7134_ALSA=m
-CPTCFG_VIDEO_SAA7134_DVB=m
-CPTCFG_VIDEO_SAA7134_GO7007=m
-CPTCFG_VIDEO_SAA7134_RC=y
-CPTCFG_VIDEO_SAA7146=m
-CPTCFG_VIDEO_SAA7146_VV=m
-CPTCFG_VIDEO_SAA7164=m
-CPTCFG_VIDEO_SAA717X=m
-CPTCFG_VIDEO_SAA7185=m
-CPTCFG_VIDEO_SAMSUNG_EXYNOS_GSC=m
-CPTCFG_VIDEO_SAMSUNG_S5P_G2D=m
-CPTCFG_VIDEO_SAMSUNG_S5P_HDMI=m
-CPTCFG_VIDEO_SAMSUNG_S5P_HDMIPHY=m
-CPTCFG_VIDEO_SAMSUNG_S5P_JPEG=m
-CPTCFG_VIDEO_SAMSUNG_S5P_MFC=m
-CPTCFG_VIDEO_SAMSUNG_S5P_MIXER=m
-CPTCFG_VIDEO_SAMSUNG_S5P_SDO=m
-CPTCFG_VIDEO_SAMSUNG_S5P_SII9234=m
-CPTCFG_VIDEO_SAMSUNG_S5P_TV=y
-CPTCFG_VIDEO_SH_MOBILE_CEU=m
-CPTCFG_VIDEO_SH_MOBILE_CSI2=m
-CPTCFG_VIDEO_SH_VEU=m
-CPTCFG_VIDEO_SH_VOU=m
-CPTCFG_VIDEO_SMIAPP=m
-CPTCFG_VIDEO_SMIAPP_PLL=m
-CPTCFG_VIDEO_SOLO6X10=m
-CPTCFG_VIDEO_SONY_BTF_MPX=m
-CPTCFG_VIDEO_SR030PC30=m
-CPTCFG_VIDEO_STK1160=m
-CPTCFG_VIDEO_STK1160_AC97=y
-CPTCFG_VIDEO_STK1160_COMMON=m
-CPTCFG_VIDEO_TDA7432=m
-CPTCFG_VIDEO_TDA9840=m
-CPTCFG_VIDEO_TEA6415C=m
-CPTCFG_VIDEO_TEA6420=m
-CPTCFG_VIDEO_THS7303=m
-CPTCFG_VIDEO_TLV320AIC23B=m
-CPTCFG_VIDEO_TM6000=m
-CPTCFG_VIDEO_TM6000_ALSA=m
-CPTCFG_VIDEO_TM6000_DVB=m
-CPTCFG_VIDEO_TUNER=m
-CPTCFG_VIDEO_TVAUDIO=m
-CPTCFG_VIDEO_TVEEPROM=m
-CPTCFG_VIDEO_TVP514X=m
-CPTCFG_VIDEO_TVP5150=m
-CPTCFG_VIDEO_TVP7002=m
-CPTCFG_VIDEO_TW2804=m
-CPTCFG_VIDEO_TW68=m
-CPTCFG_VIDEO_TW9903=m
-CPTCFG_VIDEO_TW9906=m
-CPTCFG_VIDEO_UDA1342=m
-CPTCFG_VIDEO_UPD64031A=m
-CPTCFG_VIDEO_UPD64083=m
-CPTCFG_VIDEO_USBTV=m
-CPTCFG_VIDEO_USBVISION=m
-CPTCFG_VIDEO_V4L2=m
-CPTCFG_VIDEO_V4L2_SUBDEV_API=y
-CPTCFG_VIDEO_VIA_CAMERA=m
-CPTCFG_VIDEO_VIU=m
-CPTCFG_VIDEO_VP27SMPX=m
-CPTCFG_VIDEO_VPX3220=m
-CPTCFG_VIDEO_VS6624=m
-CPTCFG_VIDEO_WM8739=m
-CPTCFG_VIDEO_WM8775=m
-CPTCFG_VIDEO_ZORAN=m
-CPTCFG_VIDEO_ZORAN_AVS6EYES=m
-CPTCFG_VIDEO_ZORAN_BUZ=m
-CPTCFG_VIDEO_ZORAN_DC10=m
-CPTCFG_VIDEO_ZORAN_DC30=m
-CPTCFG_VIDEO_ZORAN_LML33=m
-CPTCFG_VIDEO_ZORAN_LML33R10=m
-CPTCFG_VIDEO_ZORAN_ZR36060=m
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* [PATCH 12/12] backports: Update wifi default configuration
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (10 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 11/12] backports: Remove unused default configurations Hauke Mehrtens
@ 2018-12-02 11:52 ` Hauke Mehrtens
  2018-12-07 20:01 ` [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-02 11:52 UTC (permalink / raw)
  To: johannes; +Cc: backports, Hauke Mehrtens

Add some new wifi drivers to the default configuration.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/defconfigs/ath10k |  2 ++
 backport/defconfigs/wifi   | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/backport/defconfigs/ath10k b/backport/defconfigs/ath10k
index b7be6172..43d200e6 100644
--- a/backport/defconfigs/ath10k
+++ b/backport/defconfigs/ath10k
@@ -6,6 +6,8 @@ CPTCFG_MAC80211_MESH=y
 CPTCFG_WLAN=y
 CPTCFG_WLAN_VENDOR_ATH=y
 CPTCFG_ATH10K_PCI=m
+CPTCFG_ATH10K_SDIO=m
+CPTCFG_ATH10K_USB=m
 CPTCFG_ATH10K=m
 CPTCFG_ATH10K_DEBUG=y
 CPTCFG_ATH10K_DEBUGFS=y
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 4034bb13..e4c140a9 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -5,6 +5,8 @@ CPTCFG_AIRO_CS=m
 CPTCFG_AT76C50X_USB=m
 CPTCFG_ATH10K=m
 CPTCFG_ATH10K_PCI=m
+CPTCFG_ATH10K_SDIO=m
+CPTCFG_ATH10K_USB=m
 CPTCFG_ATH5K=m
 CPTCFG_ATH6KL=m
 CPTCFG_ATH6KL_SDIO=m
@@ -57,6 +59,10 @@ CPTCFG_MAC80211_LEDS=y
 CPTCFG_MAC80211=m
 CPTCFG_MAC80211_MESH=y
 CPTCFG_MT7601U=m
+CPTCFG_MT76x0U=m
+CPTCFG_MT76x0E=m
+CPTCFG_MT76x2E=m
+CPTCFG_MT76x2U=m
 CPTCFG_MWIFIEX=m
 CPTCFG_MWIFIEX_PCIE=m
 CPTCFG_MWIFIEX_SDIO=m
@@ -68,6 +74,7 @@ CPTCFG_P54_COMMON=m
 CPTCFG_P54_PCI=m
 CPTCFG_P54_SPI=m
 CPTCFG_P54_USB=m
+CPTCFG_PRISM54=m
 CPTCFG_PCI_ATMEL=m
 CPTCFG_PCI_HERMES=m
 CPTCFG_PCMCIA_ATMEL=m
@@ -75,6 +82,9 @@ CPTCFG_PCMCIA_HERMES=m
 CPTCFG_PCMCIA_SPECTRUM=m
 CPTCFG_PLX_HERMES=m
 CPTCFG_RSI_91X=m
+CPTCFG_QTNFMAC_PEARL_PCIE=m
+CPTCFG_R8188EU=m
+CPTCFG_R8822BE=m
 CPTCFG_RT2400PCI=m
 CPTCFG_RT2500PCI=m
 CPTCFG_RT2500USB=m
@@ -98,12 +108,14 @@ CPTCFG_RTL8192EE=m
 CPTCFG_RTL8192SE=m
 CPTCFG_RTL8723AE=m
 CPTCFG_RTL8723BE=m
+CPTCFG_RTL8723BS=m
 CPTCFG_RTL8821AE=m
 CPTCFG_RTL8XXXU=m
 CPTCFG_RTLWIFI=m
 CPTCFG_SSB=m
 CPTCFG_SSB_PCMCIAHOST=y
 CPTCFG_SSB_SDIOHOST=y
+CPTCFG_STAGING=y
 CPTCFG_TMD_HERMES=m
 CPTCFG_USB_NET_RNDIS_WLAN=m
 CPTCFG_USB_ZD1201=m
@@ -127,6 +139,7 @@ CPTCFG_WLAN_VENDOR_INTEL=y
 CPTCFG_WLAN_VENDOR_INTERSIL=y
 CPTCFG_WLAN_VENDOR_MARVELL=y
 CPTCFG_WLAN_VENDOR_MEDIATEK=y
+CPTCFG_WLAN_VENDOR_QUANTENNA=y
 CPTCFG_WLAN_VENDOR_RALINK=y
 CPTCFG_WLAN_VENDOR_REALTEK=y
 CPTCFG_WLAN_VENDOR_RSI=y
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

^ permalink raw reply related	[flat|nested] 14+ messages in thread

* Re: [PATCH 00/12] backports: Multiple fixes for kernel 4.20
  2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
                   ` (11 preceding siblings ...)
  2018-12-02 11:52 ` [PATCH 12/12] backports: Update wifi default configuration Hauke Mehrtens
@ 2018-12-07 20:01 ` Hauke Mehrtens
  12 siblings, 0 replies; 14+ messages in thread
From: Hauke Mehrtens @ 2018-12-07 20:01 UTC (permalink / raw)
  To: johannes; +Cc: backports


[-- Attachment #1.1: Type: text/plain, Size: 2047 bytes --]

On 12/2/18 12:52 PM, Hauke Mehrtens wrote:
> This fixes multiple problems in backport when using it with kernel 4.20-rc4.
> 
> "ckmake --allyesconfig" results with kernel 4.20-rc4:
> 
> 1   3.10.108            [  LINK  ]
> 2   3.11.10             [  LINK  ]
> 3   3.12.74             [  OK  ]
> 4   3.13.11             [  LINK  ]
> 5   3.14.79             [  LINK  ]
> 6   3.15.10             [  LINK  ]
> 7   3.16.61             [  OK  ]
> 8   3.17.8              [  LINK  ]
> 9   3.18.128            [  OK  ]
> 10  3.19.8              [  LINK  ]
> 11  4.0.9               [  LINK  ]
> 12  4.1.52              [  OK  ]
> 13  4.2.8               [  LINK  ]
> 14  4.3.6               [  LINK  ]
> 15  4.4.166             [  OK  ]
> 16  4.5.7               [  OK  ]
> 17  4.6.7               [  OK  ]
> 18  4.7.10              [  OK  ]
> 19  4.8.17              [  OK  ]
> 20  4.9.142             [  OK  ]
> 21  4.10.17             [  OK  ]
> 22  4.11.12             [  OK  ]
> 23  4.12.14             [  OK  ]
> 24  4.13.16             [  OK  ]
> 25  4.14.85             [  OK  ]
> 26  4.15.18             [  OK  ]
> 27  4.16.18             [  OK  ]
> 28  4.17.19             [  OK  ]
> 29  4.18.20             [  OK  ]
> 30  4.19.6              [  OK  ]
> 
> 
> Hauke Mehrtens (12):
>   backports: Refresh patches on kernel 4.20-rc4
>   backports: Add page_ref_count() and page_ref_sub_and_test()
>   backports: Add page_frag_alloc() and __page_frag_cache_drain()
>   backports: Add missing include for mt76
>   backports: Add device_get_mac_address()
>   backports: Remove BPAUTO_CRYPTO_SKCIPHER
>   backports: Fix pci_alloc_irq_vectors() backport
>   backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8"
>   backports: Make TI WLCORE depend on kernel >= 4.2
>   backports: Remove unused code from backport-public_key.h
>   backports: Remove unused default configurations
>   backports: Update wifi default configuration
> 
Applied in a little bit different order.

Hauke


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2018-12-07 20:01 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-02 11:52 [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 01/12] backports: Refresh patches on kernel 4.20-rc4 Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 02/12] backports: Add page_ref_count() and page_ref_sub_and_test() Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 03/12] backports: Add page_frag_alloc() and __page_frag_cache_drain() Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 04/12] backports: Add missing include for mt76 Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 05/12] backports: Add device_get_mac_address() Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 06/12] backports: Remove BPAUTO_CRYPTO_SKCIPHER Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 07/12] backports: Fix pci_alloc_irq_vectors() backport Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 08/12] backports: Revert "dependencies: Make WIL6210 depend on kernel >= 4.8" Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 09/12] backports: Make TI WLCORE depend on kernel >= 4.2 Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 10/12] backports: Remove unused code from backport-public_key.h Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 11/12] backports: Remove unused default configurations Hauke Mehrtens
2018-12-02 11:52 ` [PATCH 12/12] backports: Update wifi default configuration Hauke Mehrtens
2018-12-07 20:01 ` [PATCH 00/12] backports: Multiple fixes for kernel 4.20 Hauke Mehrtens

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).