diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-18 10:24:38 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-19 15:03:17 +0100 |
| commit | 0a9147be6a5e920ea190c9a2bc35fe8e5d772693 (patch) | |
| tree | ff08162ba173a8cfd9cb973d0ada77b2b74d6704 /target/linux/generic/hack-4.14/721-phy_packets.patch | |
| parent | b9e685eed53e1ac98a080ed5d2516949d90467c9 (diff) | |
| download | upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.gz upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.tar.bz2 upstream-0a9147be6a5e920ea190c9a2bc35fe8e5d772693.zip | |
kernel: bump 4.14 to 4.14.154
Refreshed all patches.
Altered patches:
- 902-debloat_proc.patch
- 040-dmaengine-qcom-bam-Process-multiple-pending-descript.patch
Remove upstreamed:
- 303-spi-nor-enable-4B-opcodes-for-mx66l51235l.patch
New symbols:
X86_INTEL_MPX
X86_INTEL_MEMORY_PROTECTION_KEYS
X86_INTEL_TSX_MODE_OFF
X86_INTEL_TSX_MODE_ON
X86_INTEL_TSX_MODE_AUTO
SGL_ALLOC
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/hack-4.14/721-phy_packets.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch index 6cbb25429f..9e1c57d92d 100644 --- a/target/linux/generic/hack-4.14/721-phy_packets.patch +++ b/target/linux/generic/hack-4.14/721-phy_packets.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2514,6 +2514,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2530,6 +2530,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2645,16 +2649,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2661,16 +2665,6 @@ static inline struct sk_buff *dev_alloc_ } |