linux-libre-lts-knock: update loongson-community patch

2 files changed, 18 insertions, 15 deletions

diff --git a/kernels/linux-libre-lts-knock/3.14.14-a410a5e2b7-loongson-community.patch b/kernels/linux-libre-lts-knock/3.14.26-8475f027b4-loongson-community.patch
index c7a63c2e5..20f540673 100644
--- a/kernels/linux-libre-lts-knock/3.14.14-a410a5e2b7-loongson-community.patch
+++ b/kernels/linux-libre-lts-knock/3.14.26-8475f027b4-loongson-community.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 230c7f6..69dfbc4 100644
+index 63a5ee8..9b779e2 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -244,8 +244,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -205,10 +205,10 @@ index 61af6b6..8598044 100644
 -clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec}
 +clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec,unsstrip}
 diff --git a/arch/mips/boot/compressed/decompress.c b/arch/mips/boot/compressed/decompress.c
-index c00c4dd..f4a656d 100644
+index 5244cec..965734f1 100644
 --- a/arch/mips/boot/compressed/decompress.c
 +++ b/arch/mips/boot/compressed/decompress.c
-@@ -27,8 +27,13 @@ unsigned long free_mem_end_ptr;
+@@ -28,8 +28,13 @@ unsigned long free_mem_end_ptr;
  extern unsigned char __image_begin, __image_end;
  
  /* debug interfaces  */
@@ -646,7 +646,7 @@ index f25181b..d243152 100644
  	msub_s_op    =	0x28, msub_d_op	   =  0x29,
  	msub_e_op    =	0x2a, nmadd_s_op   =  0x30,
 diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
-index 6788727..0f81805 100644
+index 6788727d..0f81805 100644
 --- a/arch/mips/kernel/scall64-o32.S
 +++ b/arch/mips/kernel/scall64-o32.S
 @@ -26,6 +26,18 @@
@@ -850,14 +850,17 @@ index 29692e5..6be5dff 100644
  load-$(CONFIG_LEMOTE_MACH2F) += 0xffffffff80200000
 +load-$(CONFIG_DEXXON_GDIUM) += 0xffffffff80200000
 diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
-index 9e4484c..73f1f9f 100644
+index 9005a8d6..73f1f9f 100644
 --- a/arch/mips/loongson/common/Makefile
 +++ b/arch/mips/loongson/common/Makefile
-@@ -12,7 +12,6 @@ obj-$(CONFIG_PCI) += pci.o
+@@ -11,9 +11,7 @@ obj-$(CONFIG_PCI) += pci.o
+ # Serial port support
  #
  obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
- obj-$(CONFIG_SERIAL_8250) += serial.o
+-loongson-serial-$(CONFIG_SERIAL_8250) := serial.o
+-obj-y += $(loongson-serial-m) $(loongson-serial-y)
 -obj-$(CONFIG_LOONGSON_UART_BASE) += uart_base.o
++obj-$(CONFIG_SERIAL_8250) += serial.o
  obj-$(CONFIG_LOONGSON_MC146818) += rtc.o
  
  #
@@ -3695,10 +3698,10 @@ index 0000000..67cc095
 +MODULE_LICENSE("GPL");
 +
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 6e12cd0..1ce18ed 100644
+index 91bc66b..49f06b8 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -956,6 +956,9 @@
+@@ -961,6 +961,9 @@
  #define USB_VENDOR_ID_ZYTRONIC		0x14c8
  #define USB_DEVICE_ID_ZYTRONIC_ZXY100	0x0005
  
@@ -10552,7 +10555,7 @@ index 6176d98..e40ce80 100644
  	{"0x317", 1024, 768,  16},
  	{"0x31A", 1280, 1024, 16},
 diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
-index 3586460..15f66e5 100644
+index 34fc86c..1569247 100644
 --- a/drivers/usb/host/ohci-hcd.c
 +++ b/drivers/usb/host/ohci-hcd.c
 @@ -864,9 +864,13 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
@@ -10642,7 +10645,7 @@ index 2f3aceb..6647c3f 100644
  static void quirk_usb_early_handoff(struct pci_dev *pdev)
  {
 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 9da566a..fffecfb 100644
+index 8b34841..54e494d 100644
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
 @@ -79,6 +79,9 @@ static void option_instat_callback(struct urb *urb);
@@ -10655,7 +10658,7 @@ index 9da566a..fffecfb 100644
  #define HUAWEI_VENDOR_ID			0x12D1
  #define HUAWEI_PRODUCT_E173			0x140C
  #define HUAWEI_PRODUCT_E1750			0x1406
-@@ -610,6 +613,7 @@ static const struct usb_device_id option_ids[] = {
+@@ -633,6 +636,7 @@ static const struct usb_device_id option_ids[] = {
  	{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
  	{ USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
  		.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 8860428b4..25b8e1689 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -42,7 +42,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '0003-module-remove-MODULE_GENERIC_TABLE.patch'
         '0006-genksyms-fix-typeof-handling.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
-        '3.14.14-a410a5e2b7-loongson-community.patch')
+        '3.14.26-8475f027b4-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
             'ac2ae79e3a50b2865d584f3f2cd6d5262f01255a8fdb804b4fb5ee52b5e78fae'
@@ -61,7 +61,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '3baf1279805edd561e80877a1baf32d98fe07220dc6e7cb4ced73ab531947bc4')
+            '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch
@@ -113,7 +113,7 @@ prepare() {
 
   # Adding loongson-community patch
   if [ "${CARCH}" == "mips64el" ]; then
-    patch -p1 -i ${srcdir}/3.14.14-a410a5e2b7-loongson-community.patch
+    patch -p1 -i ${srcdir}/3.14.26-8475f027b4-loongson-community.patch
   fi
 
   cat "${srcdir}/config.${CARCH}" > ./.config