Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.2.0-0.rc5.git1.1.vanilla.knurd.1.fc30

18 files changed, 23 insertions, 3 deletions

diff --git a/configs/fedora/generic/CONFIG_AX88796B_PHY b/configs/fedora/generic/CONFIG_AX88796B_PHY
new file mode 100644
index 000000000..ee2e42ff2
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_AX88796B_PHY
@@ -0,0 +1 @@
+CONFIG_AX88796B_PHY=m
diff --git a/gitrev b/gitrev
index e88fcc1df..505f69d2d 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-9e0babf2c06c73cda2c0cd37a1653d823adb40ec
+29f785ff76b65696800b75c3d8e0b58e603bb1d0
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 53126dcce..93a77001b 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -469,6 +469,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 13839e528..cf06a4b4a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -469,6 +469,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
 CONFIG_AXP20X_POWER=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d7d13ffd0..43039452d 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -468,6 +468,7 @@ CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
+CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6d06da51a..dc9b82797 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -455,6 +455,7 @@ CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
+CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0e68d1942..0c0fe444d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -455,6 +455,7 @@ CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
+CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index a8d3bf129..2b65964e1 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -468,6 +468,7 @@ CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
 CONFIG_AX88796_93CX6=y
+CONFIG_AX88796B_PHY=m
 CONFIG_AX88796=m
 CONFIG_AXI_DMAC=m
 CONFIG_AXP20X_ADC=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 1cd402c5d..c8fd7f684 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -346,6 +346,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-i686.config b/kernel-i686.config
index f3c44efd9..41cb3cca1 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -345,6 +345,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 136b35d10..19fce1e42 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -286,6 +286,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index ba3f2dab3..d248e8882 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -285,6 +285,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index bee29391c..9bb9f41e8 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -291,6 +291,7 @@ CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2a90465f2..77669218f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -290,6 +290,7 @@ CONFIG_AUTOFS_FS=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 CONFIG_B43_BCMA_PIO=y
 CONFIG_B43_BCMA=y
 CONFIG_B43_BUSES_BCMA_AND_SSB=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a5294a976..77375f724 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -348,6 +348,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
 CONFIG_AXP288_ADC=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 3b8cf116a..5b977709d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -347,6 +347,7 @@ CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
 CONFIG_AX25=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AXP20X_ADC is not set
 # CONFIG_AXP20X_POWER is not set
 CONFIG_AXP288_ADC=m
diff --git a/kernel.spec b/kernel.spec
index ebeb49e8b..8c72b1300 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # Kernel headers are being split out into a separate package
 %if 0%{?fedora}
@@ -1844,6 +1844,10 @@ fi
 #
 #
 %changelog
+* Tue Jun 18 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git1.1
+- Linux v5.2-rc5-177-g29f785ff76b6
+- Reenable debugging options.
+
 * Mon Jun 17 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git0.1
 - Linux v5.2-rc5
 
diff --git a/sources b/sources
index 16dcd6dc2..dd7bc4066 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 SHA512 (patch-5.2-rc5.xz) = ee7caea50dccd299182da1453ca2a6f3f4947d544da81703e00b7f63e7c99d19975d4a34261282bbce36a8cf08060a60e51c095189a3aa43fdc34b67b05004c7
+SHA512 (patch-5.2-rc5-git1.xz) = 83e0dc6671b7ea52675c79a8940e3b561b4d8eb9b217bd3c72fb6faec76c1c434fd51fb26a5e84392a81e4d2c7bef0674ba207e61916ada9e0809975e283c371