Linux v3.19-rc7-189-g26cdd1f76a88
This commit is contained in:
parent
f311a65416
commit
c5c9c7b16e
@ -3563,20 +3563,6 @@ index 53f5f66..3957e63 100644
|
|||||||
/* The PCS registers are accessed using mmio. The underlying APB3
|
/* The PCS registers are accessed using mmio. The underlying APB3
|
||||||
* management interface uses indirect addressing to access the MMD
|
* management interface uses indirect addressing to access the MMD
|
||||||
* register sets. This requires accessing of the PCS register in two
|
* register sets. This requires accessing of the PCS register in two
|
||||||
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
|
|
||||||
index 7bb5f07..0ed3379 100644
|
|
||||||
--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
|
|
||||||
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
|
|
||||||
@@ -560,6 +560,9 @@ void xgbe_get_all_hw_features(struct xgbe_prv_data *pdata)
|
|
||||||
hw_feat->rx_ch_cnt++;
|
|
||||||
hw_feat->tx_ch_cnt++;
|
|
||||||
|
|
||||||
+ /* A0 does not support NUMTC, hardcode it for now */
|
|
||||||
+ hw_feat->tc_cnt = XGBE_TC_CNT;
|
|
||||||
+
|
|
||||||
DBGPR("<--xgbe_get_all_hw_features\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
|
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
|
||||||
index dbd3850..74be78e 100644
|
index dbd3850..74be78e 100644
|
||||||
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
|
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
|
||||||
|
@ -69,7 +69,7 @@ Summary: The Linux kernel
|
|||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 7
|
%define rcrev 7
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 2
|
%define gitrev 3
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 3.%{upstream_sublevel}.0
|
%define rpmversion 3.%{upstream_sublevel}.0
|
||||||
%endif
|
%endif
|
||||||
@ -2212,6 +2212,9 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 07 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git3.1
|
||||||
|
- Linux v3.19-rc7-189-g26cdd1f76a88
|
||||||
|
|
||||||
* Thu Feb 5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
|
* Thu Feb 5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||||
- Allwinner A23 (sun8i) SoC
|
- Allwinner A23 (sun8i) SoC
|
||||||
- Move ARM usb platform options to arm-generic
|
- Move ARM usb platform options to arm-generic
|
||||||
|
@ -9,7 +9,7 @@ Upstream-status: Fedora mustard (might be worth dropping...)
|
|||||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
|
||||||
index 399516925d80..2ac9a156da39 100644
|
index 05ea0d49a3a3..95f18e07491b 100644
|
||||||
--- a/drivers/scsi/sd.c
|
--- a/drivers/scsi/sd.c
|
||||||
+++ b/drivers/scsi/sd.c
|
+++ b/drivers/scsi/sd.c
|
||||||
@@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
|
@@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
|
||||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
|||||||
9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz
|
9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz
|
||||||
813ccb96f0b379d656e57442c2587ca3 perf-man-3.18.tar.gz
|
813ccb96f0b379d656e57442c2587ca3 perf-man-3.18.tar.gz
|
||||||
1d522b72840cbf5269a1383da339690a patch-3.19-rc7.xz
|
1d522b72840cbf5269a1383da339690a patch-3.19-rc7.xz
|
||||||
1df1f11e4da338f38b9599c0fd45a4ad patch-3.19-rc7-git2.xz
|
5bf344d43b7b11b4b2d2ebddb239dcfd patch-3.19-rc7-git3.xz
|
||||||
|
Loading…
Reference in New Issue
Block a user