From: Greg Kroah-Hartman Date: Sat, 28 Apr 2018 05:49:36 +0000 (+0200) Subject: drop microblaze patch from 4.14.y X-Git-Tag: v3.18.107~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=656a457962a173f713ee5505fc79fb81b15d0502;p=thirdparty%2Fkernel%2Fstable-queue.git drop microblaze patch from 4.14.y --- diff --git a/queue-4.14/revert-microblaze-fix-endian-handling.patch b/queue-4.14/revert-microblaze-fix-endian-handling.patch deleted file mode 100644 index e696b042d81..00000000000 --- a/queue-4.14/revert-microblaze-fix-endian-handling.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0a9dff6c3d875c3af32683ac7d3f4cc92010852a Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Fri, 27 Apr 2018 10:51:41 +0200 -Subject: Revert "microblaze: fix endian handling" - -From: Greg Kroah-Hartman - -This reverts commit ac3d021048be9edb825f0794da5b42f04fefecef which is -commit 71e7673dadfdae0605d4c1f66ecb4b045c79fe0f upstream. - -kbuild reports that this causes build regressions in 4.14.y, so drop it. - -Reported-by: kbuild test robot -Reported-by: "Hao, Shun" -Cc: Arnd Bergmann -Cc: Michal Simek -Cc: Guenter Roeck -Signed-off-by: Greg Kroah-Hartman ---- - arch/microblaze/Makefile | 17 ++++++----------- - 1 file changed, 6 insertions(+), 11 deletions(-) - ---- a/arch/microblaze/Makefile -+++ b/arch/microblaze/Makefile -@@ -36,21 +36,16 @@ endif - CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_DIV) += -mno-xl-soft-div - CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_BARREL) += -mxl-barrel-shift - CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare -- --ifdef CONFIG_CPU_BIG_ENDIAN --KBUILD_CFLAGS += -mbig-endian --KBUILD_AFLAGS += -mbig-endian --LD += -EB --else --KBUILD_CFLAGS += -mlittle-endian --KBUILD_AFLAGS += -mlittle-endian --LD += -EL --endif -+CPUFLAGS-$(CONFIG_BIG_ENDIAN) += -mbig-endian -+CPUFLAGS-$(CONFIG_LITTLE_ENDIAN) += -mlittle-endian - - CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER)) - - # r31 holds current when in kernel mode --KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) -+KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2) -+ -+LDFLAGS := -+LDFLAGS_vmlinux := - - head-y := arch/microblaze/kernel/head.o - libs-y += arch/microblaze/lib/ diff --git a/queue-4.14/series b/queue-4.14/series index 8f52f853618..285bf2e9146 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -38,7 +38,6 @@ llc-fix-null-pointer-deref-for-sock_zapped.patch net-ethernet-ti-cpsw-fix-tx-vlan-priority-mapping.patch virtio_net-split-out-ctrl-buffer.patch virtio_net-fix-adding-vids-on-big-endian.patch -revert-microblaze-fix-endian-handling.patch s390-introduce-cpu-alternatives.patch s390-enable-cpu-alternatives-unconditionally.patch kvm-s390-wire-up-bpb-feature.patch