shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update to 5.2.5

Browse Source
This commit is contained in:
Romain Perier
2019-08-01 13:42:06 +02:00
committed by Romain Perier
parent acdae3be4f
commit 86dc4135cc
5 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@@ -1,9 +1,13 @@
linux (5.2.1-1~exp1) UNRELEASED; urgency=medium
linux (5.2.5-1~exp1) UNRELEASED; urgency=medium
* New upstream release: https://kernelnewbies.org/Linux_5.2
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.1
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.2
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.3
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.4
https://www.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.2.5
[ Bastian Germann ]
* [armhf] Enable C_CAN as a module. (Closes: #929968)

2
debian/config/defines vendored
View File

@@ -128,7 +128,7 @@ debug-info: true
signed-code: false
[featureset-rt_base]
enabled: true
enabled: false
[description]
part-long-up: This kernel is not suitable for SMP (multi-processor,

35
debian/patches/bugfix/all/revert-net-stmmac-send-tso-packets-always-from-queue.patch vendored
View File

@@ -1,35 +0,0 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 9 Apr 2019 01:01:56 +0100
Subject: Revert "net: stmmac: Send TSO packets always from Queue 0"
Forwarded: https://lore.kernel.org/lkml/a5f9b02fbb5ca830e598f1c601cdbecc6c86b789.camel@decadent.org.uk/T/#u
This reverts commit 496eaed7fe94df7202d7cbe37873f96bcdda375e, which
was commit c5acdbee22a1b200dde07effd26fd1f649e9ab8a upstream. This
introduces data races.
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 886176be818e..8c3e228b1da6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3033,17 +3033,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* Manage oversized TCP frames for GMAC4 device */
if (skb_is_gso(skb) && priv->tso) {
- if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
- /*
- * There is no way to determine the number of TSO
- * capable Queues. Let's use always the Queue 0
- * because if TSO is supported then at least this
- * one will be capable.
- */
- skb_set_queue_mapping(skb, 0);
-
+ if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))
return stmmac_tso_xmit(skb, dev);
- }
}
if (unlikely(stmmac_tx_avail(priv, queue) < nfrags + 1)) {

12
debian/patches/features/all/aufs5/aufs5-mmap.patch vendored
View File

@@ -13,8 +13,8 @@ Index: debian-kernel/fs/proc/base.c
===================================================================
--- debian-kernel.orig/fs/proc/base.c
+++ debian-kernel/fs/proc/base.c
@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct den
down_read(&mm->mmap_sem);
@@ -2020,7 +2020,7 @@ static int map_files_get_link(struct den
rc = -ENOENT;
vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) {
- *path = vma->vm_file->f_path;
@@ -42,7 +42,7 @@ Index: debian-kernel/fs/proc/task_mmu.c
===================================================================
--- debian-kernel.orig/fs/proc/task_mmu.c
+++ debian-kernel/fs/proc/task_mmu.c
@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct
@@ -309,7 +309,10 @@ show_map_vma(struct seq_file *m, struct
const char *name = NULL;
if (file) {
@@ -54,7 +54,7 @@ Index: debian-kernel/fs/proc/task_mmu.c
dev = inode->i_sb->s_dev;
ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1761,7 +1764,7 @@ static int show_numa_map(struct seq_file
@@ -1774,7 +1777,7 @@ static int show_numa_map(struct seq_file
struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md;
@@ -83,7 +83,7 @@ Index: debian-kernel/include/linux/mm.h
===================================================================
--- debian-kernel.orig/include/linux/mm.h
+++ debian-kernel/include/linux/mm.h
@@ -1553,6 +1553,28 @@ static inline void unmap_shared_mapping_
@@ -1558,6 +1558,28 @@ static inline void unmap_shared_mapping_
unmap_mapping_range(mapping, holebegin, holelen, 0);
}
@@ -162,7 +162,7 @@ Index: debian-kernel/mm/filemap.c
===================================================================
--- debian-kernel.orig/mm/filemap.c
+++ debian-kernel/mm/filemap.c
@@ -2671,7 +2671,7 @@ vm_fault_t filemap_page_mkwrite(struct v
@@ -2723,7 +2723,7 @@ vm_fault_t filemap_page_mkwrite(struct v
vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb);

1
debian/patches/series vendored
View File

@@ -82,7 +82,6 @@ bugfix/all/disable-some-marvell-phys.patch
bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
debian/revert-objtool-fix-config_stack_validation-y-warning.patch
bugfix/all/revert-net-stmmac-send-tso-packets-always-from-queue.patch
# Miscellaneous features