summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-fedora.config1
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel.spec10
-rw-r--r--netfilter_ppc_fix.patch69
-rw-r--r--sources2
10 files changed, 85 insertions, 4 deletions
diff --git a/gitrev b/gitrev
index 301125f97..65a384fe6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-b0d4beaa5a4b7d31070c41c2e50740304a3f1138
+e42617b825f8073569da76dc4510bfa019b1c35a
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 6a94e631b..28254cdc7 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4842,6 +4842,7 @@ CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
CONFIG_QCOM_LLCC=m
CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_Q6V5_ADSP=m
CONFIG_QCOM_Q6V5_MSS=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 4a6e64c99..8249c6f61 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -4821,6 +4821,7 @@ CONFIG_QCOM_L2_PMU=y
CONFIG_QCOM_L3_PMU=y
CONFIG_QCOM_LLCC=m
CONFIG_QCOM_MDT_LOADER=m
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_Q6V5_ADSP=m
CONFIG_QCOM_Q6V5_MSS=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 46f1d3cfe..cc709585f 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -4929,6 +4929,7 @@ CONFIG_QCOM_HFPLL=m
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QCOM_IOMMU=y
# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_PM=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 065a0c878..76ce11adf 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -4909,6 +4909,7 @@ CONFIG_QCOM_HFPLL=m
# CONFIG_QCOM_HIDMA_MGMT is not set
CONFIG_QCOM_IOMMU=y
# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_PM=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index a9923e11b..afe55162f 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4737,6 +4737,7 @@ CONFIG_QCOM_HFPLL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_RMTFS_MEM=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index e2cac8611..884d35185 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -4717,6 +4717,7 @@ CONFIG_QCOM_HFPLL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_RMTFS_MEM=m
diff --git a/kernel.spec b/kernel.spec
index 786a52231..6a77896ae 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -102,9 +102,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 0
+%global rcrev 1
# The git snapshot level
-%define gitrev 7
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -852,6 +852,9 @@ Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
# CVE-2019-14901 rhbz 1773519 1776184
Patch527: mwifiex-Fix-heap-overflow-in-mmwifiex_process_tdls_action_frame.patch
+# Test fix for PPC build
+Patch528: netfilter_ppc_fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2887,6 +2890,9 @@ fi
#
#
%changelog
+* Mon Dec 09 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc1.git0.1
+- Linux v5.5-rc1
+
* Mon Dec 09 2019 Justin M. Forbes <jforbes@fedoraproject.org>
- Disable debugging options.
diff --git a/netfilter_ppc_fix.patch b/netfilter_ppc_fix.patch
new file mode 100644
index 000000000..421f80d41
--- /dev/null
+++ b/netfilter_ppc_fix.patch
@@ -0,0 +1,69 @@
+From: Pablo Neira Ayuso <pablo () netfilter ! org>
+Date: Sat, 07 Dec 2019 17:38:05 +0000
+To: netfilter-devel
+Subject: Re: [PATCH] netfilter: nf_flow_table_offload: Correct memcpy size for flow_overload_mangle
+
+I'm attaching a tentative patch to address this problem.
+
+Thanks.
+
+diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
+index c54c9a6cc981..3d6b2bea9a63 100644
+--- a/net/netfilter/nf_flow_table_offload.c
++++ b/net/netfilter/nf_flow_table_offload.c
+@@ -326,23 +326,23 @@ static void flow_offload_port_snat(struct net *net,
+ struct nf_flow_rule *flow_rule)
+ {
+ struct flow_action_entry *entry = flow_action_entry_next(flow_rule);
+- u32 mask = ~htonl(0xffff0000);
+- __be16 port;
++ u32 mask = ~htonl(0xffff0000), port;
+ u32 offset;
+
+ switch (dir) {
+ case FLOW_OFFLOAD_DIR_ORIGINAL:
+- port = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port;
++ port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port);
+ offset = 0; /* offsetof(struct tcphdr, source); */
+ break;
+ case FLOW_OFFLOAD_DIR_REPLY:
+- port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port;
++ port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port);
+ offset = 0; /* offsetof(struct tcphdr, dest); */
+ break;
+ default:
+ break;
+ }
+
++ port = htonl(port << 16);
+ flow_offload_mangle(entry, flow_offload_l4proto(flow), offset,
+ (u8 *)&port, (u8 *)&mask);
+ }
+@@ -353,23 +353,23 @@ static void flow_offload_port_dnat(struct net *net,
+ struct nf_flow_rule *flow_rule)
+ {
+ struct flow_action_entry *entry = flow_action_entry_next(flow_rule);
+- u32 mask = ~htonl(0xffff);
+- __be16 port;
++ u32 mask = ~htonl(0xffff), port;
+ u32 offset;
+
+ switch (dir) {
+ case FLOW_OFFLOAD_DIR_ORIGINAL:
+- port = flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port;
++ port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port);
+ offset = 0; /* offsetof(struct tcphdr, source); */
+ break;
+ case FLOW_OFFLOAD_DIR_REPLY:
+- port = flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port;
++ port = ntohs(flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port);
+ offset = 0; /* offsetof(struct tcphdr, dest); */
+ break;
+ default:
+ break;
+ }
+
++ port = htonl(port);
+ flow_offload_mangle(entry, flow_offload_l4proto(flow), offset,
+ (u8 *)&port, (u8 *)&mask);
+ }
diff --git a/sources b/sources
index d053fbc93..55898b335 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-SHA512 (patch-5.4-git7.xz) = 915f14ae30e7d7dc238ac8f90e95ceba5c56c9c356e7d88bfbc9acaf61b0d34347a10ebdd9d0fa6a91ca8715efdc5c1f41406dae2a986d79c9236d696f29c89b
+SHA512 (patch-5.5-rc1.xz) = 151d993746f5947827617468b79541f8376502f9ad2285b675f4e4464dfd427e5874a2a9976af1fa9867ac1728c9fda13cad85ac810e12b1fc039a9b2ee5a174
generated by cgit (git 2.34.1) at 2024-11-16 05:11:59 +0000