Home Home > GIT Browse > SLE12-SP3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2019-01-11 22:17:12 +0100
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:21:55 +0100
commit007c5b9415f93e95380062550d8c3bd41115413a (patch)
treefbfee41358125658e70e072171c14fa201ac3e17
parent07bbe0be17d0048c6a36dba234d2c104237712c5 (diff)
housekeeping: Refresh patches, non-functional whitespace changes
-rw-r--r--patches.arch/arm64-0002-net-thunderx-Adjust-nicvf-structure-to-reduce-cache-.patch2
-rw-r--r--patches.arch/arm64-thd-net-0019-net-thunderx-Use-bool-in-stucts-there-possible.patch6
-rw-r--r--patches.arch/arm64-thd-net-0028-net-thunderx-HW-TSO-support-for-pass2-chips.patch2
-rw-r--r--patches.drivers/0017-pmem-dax-disable-dax-in-the-presence-of-bad-blocks.patch3
-rw-r--r--patches.drivers/drm-mgag200-Fix-to-always-set-HiPri-for-G200e4.patch2
-rw-r--r--patches.drivers/i2c-designware-baytrail-Disallow-the-CPU-to-enter-C62
-rw-r--r--patches.drivers/i40e-add-private-flag-to-control-source-pruning.patch27
-rw-r--r--patches.fixes/xfs-don-t-take-the-IOLOCK-exclusive-for-direct-I-O-p-bsc1015609.patch2
-rw-r--r--patches.suse/0003-more-kABI-padding-in-USB.patch13
9 files changed, 32 insertions, 27 deletions
diff --git a/patches.arch/arm64-0002-net-thunderx-Adjust-nicvf-structure-to-reduce-cache-.patch b/patches.arch/arm64-0002-net-thunderx-Adjust-nicvf-structure-to-reduce-cache-.patch
index b82d85e180..ca528b17fe 100644
--- a/patches.arch/arm64-0002-net-thunderx-Adjust-nicvf-structure-to-reduce-cache-.patch
+++ b/patches.arch/arm64-0002-net-thunderx-Adjust-nicvf-structure-to-reduce-cache-.patch
@@ -34,7 +34,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
- u8 node;
- bool tns_mode;
+ u8 sqs_id;
- bool sqs_mode;
+ bool sqs_mode;
- bool loopback_supported;
bool hw_tso;
- u16 mtu;
diff --git a/patches.arch/arm64-thd-net-0019-net-thunderx-Use-bool-in-stucts-there-possible.patch b/patches.arch/arm64-thd-net-0019-net-thunderx-Use-bool-in-stucts-there-possible.patch
index 01caf13d69..ae8d4f28c7 100644
--- a/patches.arch/arm64-thd-net-0019-net-thunderx-Use-bool-in-stucts-there-possible.patch
+++ b/patches.arch/arm64-thd-net-0019-net-thunderx-Use-bool-in-stucts-there-possible.patch
@@ -3,12 +3,14 @@ From: Robert Richter <rrichter@cavium.com>
Date: Mon, 23 Nov 2015 16:29:15 +0100
Subject: [PATCH 09/23] net, thunderx: Use bool in stucts there possible
Patch-mainline: Not yet, needs submission
+References: updated commit
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
- drivers/net/ethernet/cavium/thunder/nic.h | 12 ++++++------
+
+ drivers/net/ethernet/cavium/thunder/nic.h | 12 +++---
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/cavium/thunder/nic.h b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -23,7 +25,7 @@ index 39ca674..e051dc2 100644
- u8 sqs_mode:1;
- u8 loopback_supported:1;
+ bool tns_mode;
-+ bool sqs_mode;
++ bool sqs_mode;
+ bool loopback_supported;
u16 mtu;
struct queue_set *qs;
diff --git a/patches.arch/arm64-thd-net-0028-net-thunderx-HW-TSO-support-for-pass2-chips.patch b/patches.arch/arm64-thd-net-0028-net-thunderx-HW-TSO-support-for-pass2-chips.patch
index 61df81f50b..7a32d17b4d 100644
--- a/patches.arch/arm64-thd-net-0028-net-thunderx-HW-TSO-support-for-pass2-chips.patch
+++ b/patches.arch/arm64-thd-net-0028-net-thunderx-HW-TSO-support-for-pass2-chips.patch
@@ -26,7 +26,7 @@ Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+++ b/drivers/net/ethernet/cavium/thunder/nic.h
@@ -265,6 +265,7 @@ struct nicvf {
bool tns_mode;
- bool sqs_mode;
+ bool sqs_mode;
bool loopback_supported;
+ bool hw_tso;
u16 mtu;
diff --git a/patches.drivers/0017-pmem-dax-disable-dax-in-the-presence-of-bad-blocks.patch b/patches.drivers/0017-pmem-dax-disable-dax-in-the-presence-of-bad-blocks.patch
index a06af6e4a9..a09436cfa7 100644
--- a/patches.drivers/0017-pmem-dax-disable-dax-in-the-presence-of-bad-blocks.patch
+++ b/patches.drivers/0017-pmem-dax-disable-dax-in-the-presence-of-bad-blocks.patch
@@ -45,11 +45,10 @@ Acked-by: Johannes Thumshirn <jthumshirn@suse.com>
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
-@@ -295,6 +295,8 @@ static int pmem_attach_disk(struct devic
+@@ -295,6 +295,7 @@ static int pmem_attach_disk(struct devic
if (devm_init_badblocks(dev, &pmem->bb))
return -ENOMEM;
nvdimm_badblocks_populate(to_nd_region(dev->parent), &pmem->bb, res);
-+
+ disk->bb = &pmem->bb;
add_disk(disk);
revalidate_disk(disk);
diff --git a/patches.drivers/drm-mgag200-Fix-to-always-set-HiPri-for-G200e4.patch b/patches.drivers/drm-mgag200-Fix-to-always-set-HiPri-for-G200e4.patch
index 3400602562..a830d1d231 100644
--- a/patches.drivers/drm-mgag200-Fix-to-always-set-HiPri-for-G200e4.patch
+++ b/patches.drivers/drm-mgag200-Fix-to-always-set-HiPri-for-G200e4.patch
@@ -40,7 +40,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
}
+ } else {
+ if ((bw =
-+ mga_vga_calculate_mode_bandwidth(mode, bpp))
++ mga_vga_calculate_mode_bandwidth(mode, bpp))
+ > (55000 * 1024)) {
+ DRM_DEBUG_KMS("Mode %d exceeds bandwidth: %d > %d",
+ mode->base.id, bw, 55000 * 1024);
diff --git a/patches.drivers/i2c-designware-baytrail-Disallow-the-CPU-to-enter-C6 b/patches.drivers/i2c-designware-baytrail-Disallow-the-CPU-to-enter-C6
index e14b5d1ca8..73e4380f20 100644
--- a/patches.drivers/i2c-designware-baytrail-Disallow-the-CPU-to-enter-C6
+++ b/patches.drivers/i2c-designware-baytrail-Disallow-the-CPU-to-enter-C6
@@ -70,7 +70,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
} while (time_before(jiffies, end));
dev_err(dev->dev, "punit semaphore timed out, resetting\n");
-+ out:
++out:
reset_semaphore(dev);
ret = iosf_mbi_read(BT_MBI_UNIT_PMC, BT_MBI_BUNIT_READ, addr, &sem);
diff --git a/patches.drivers/i40e-add-private-flag-to-control-source-pruning.patch b/patches.drivers/i40e-add-private-flag-to-control-source-pruning.patch
index 9ac8ac397e..97a54db3b9 100644
--- a/patches.drivers/i40e-add-private-flag-to-control-source-pruning.patch
+++ b/patches.drivers/i40e-add-private-flag-to-control-source-pruning.patch
@@ -23,11 +23,13 @@ Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Michal Kubecek <mkubecek@suse.cz>
---
- drivers/net/ethernet/intel/i40e/i40e.h | 2 ++
- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 13 +++++++++++++
- drivers/net/ethernet/intel/i40e/i40e_main.c | 25 +++++++++++++++++++++++++
+ drivers/net/ethernet/intel/i40e/i40e.h | 2 ++
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 13 +++++++++++++
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 25 +++++++++++++++++++++++++
3 files changed, 40 insertions(+)
+diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
+index d1d0467003e5..b1ab596a4c76 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -104,6 +104,7 @@
@@ -46,9 +48,11 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
/* tracks features that get auto disabled by errors */
u64 auto_disable_flags;
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+index 2664ed8daddf..d8cce9752e8e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
-@@ -235,6 +235,7 @@ static const char i40e_priv_flags_string
+@@ -235,6 +235,7 @@ static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN] = {
"veb-stats",
"packet-split",
"hw-atr-eviction",
@@ -56,7 +60,7 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
};
#define I40E_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40e_priv_flags_strings)
-@@ -2797,6 +2798,8 @@ static u32 i40e_get_priv_flags(struct ne
+@@ -2797,6 +2798,8 @@ static u32 i40e_get_priv_flags(struct net_device *dev)
I40E_PRIV_FLAGS_PS : 0;
ret_flags |= pf->auto_disable_flags & I40E_FLAG_HW_ATR_EVICT_CAPABLE ?
0 : I40E_PRIV_FLAGS_HW_ATR_EVICT;
@@ -65,7 +69,7 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
return ret_flags;
}
-@@ -2864,6 +2867,16 @@ static int i40e_set_priv_flags(struct ne
+@@ -2864,6 +2867,16 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)
else
pf->auto_disable_flags |= I40E_FLAG_HW_ATR_EVICT_CAPABLE;
@@ -82,9 +86,11 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
/* if needed, issue reset to cause things to take effect */
if (reset_required)
i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));
+diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
+index adefd9ce13c7..44dbf4e83a6e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
-@@ -9485,6 +9485,31 @@ static int i40e_add_vsi(struct i40e_vsi
+@@ -9485,6 +9485,31 @@ static int i40e_add_vsi(struct i40e_vsi *vsi)
enabled_tc = i40e_pf_get_tc_map(pf);
@@ -98,7 +104,7 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
+ ctxt.pf_num = pf->hw.pf_id;
+ ctxt.vf_num = 0;
+ ctxt.info.valid_sections |=
-+ cpu_to_le16(I40E_AQ_VSI_PROP_SWITCH_VALID);
++ cpu_to_le16(I40E_AQ_VSI_PROP_SWITCH_VALID);
+ ctxt.info.switch_id =
+ cpu_to_le16(I40E_AQ_VSI_SW_ID_FLAG_LOCAL_LB);
+ ret = i40e_aq_update_vsi_params(hw, &ctxt, NULL);
@@ -107,7 +113,7 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
+ "update vsi failed, err %s aq_err %s\n",
+ i40e_stat_str(&pf->hw, ret),
+ i40e_aq_str(&pf->hw,
-+ pf->hw.aq.asq_last_status));
++ pf->hw.aq.asq_last_status));
+ ret = -ENOENT;
+ goto err;
+ }
@@ -116,3 +122,6 @@ Acked-by: Michal Kubecek <mkubecek@suse.cz>
/* MFP mode setup queue map and update VSI */
if ((pf->flags & I40E_FLAG_MFP_ENABLED) &&
!(pf->hw.func_caps.iscsi)) { /* NIC type PF */
+--
+2.14.2
+
diff --git a/patches.fixes/xfs-don-t-take-the-IOLOCK-exclusive-for-direct-I-O-p-bsc1015609.patch b/patches.fixes/xfs-don-t-take-the-IOLOCK-exclusive-for-direct-I-O-p-bsc1015609.patch
index 46f8608630..708b8b4c5b 100644
--- a/patches.fixes/xfs-don-t-take-the-IOLOCK-exclusive-for-direct-I-O-p-bsc1015609.patch
+++ b/patches.fixes/xfs-don-t-take-the-IOLOCK-exclusive-for-direct-I-O-p-bsc1015609.patch
@@ -136,7 +136,7 @@ index 09a250d..7f88a75 100644
*/
- if (unaligned_io || mapping->nrpages)
+ if ((pos & mp->m_blockmask) ||
-+ ((pos + count) & mp->m_blockmask)) {
++ ((pos + count) & mp->m_blockmask)) {
+ unaligned_io = 1;
iolock = XFS_IOLOCK_EXCL;
- else
diff --git a/patches.suse/0003-more-kABI-padding-in-USB.patch b/patches.suse/0003-more-kABI-padding-in-USB.patch
index 0d5a2b819d..86ca1d79b1 100644
--- a/patches.suse/0003-more-kABI-padding-in-USB.patch
+++ b/patches.suse/0003-more-kABI-padding-in-USB.patch
@@ -10,14 +10,12 @@ structures to guard against nasty surprises with SS+
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
- include/linux/usb.h | 3 +++
+ include/linux/usb.h | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/include/linux/usb.h b/include/linux/usb.h
-index 56ab77c..f166fff2 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
-@@ -332,6 +332,7 @@ struct usb_host_bos {
+@@ -331,6 +331,7 @@ struct usb_host_bos {
struct usb_ssp_cap_descriptor *ssp_cap;
struct usb_ss_container_id_descriptor *ss_id;
struct usb_ptm_cap_descriptor *ptm_cap;
@@ -25,7 +23,7 @@ index 56ab77c..f166fff2 100644
};
int __usb_get_extra_descriptor(char *buffer, unsigned size,
-@@ -397,6 +398,7 @@ struct usb_bus {
+@@ -395,6 +396,7 @@ struct usb_bus {
struct mon_bus *mon_bus; /* non-null when associated */
int monitored; /* non-zero when monitored */
#endif
@@ -33,7 +31,7 @@ index 56ab77c..f166fff2 100644
};
struct usb_dev_state;
-@@ -616,6 +618,7 @@ struct usb_device {
+@@ -618,6 +620,7 @@ struct usb_device {
struct usb3_lpm_parameters u1_params;
struct usb3_lpm_parameters u2_params;
unsigned lpm_disable_count;
@@ -41,6 +39,3 @@ index 56ab77c..f166fff2 100644
};
#define to_usb_device(d) container_of(d, struct usb_device, dev)
---
-2.1.4
-