Kernel: T3318: update Linux Kernel to v5.4.268

4 files changed, 13 insertions, 11 deletions

diff --git a/data/defaults.json b/data/defaults.json
index 775d15e5..10452d00 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -5,7 +5,7 @@
   "debian_distribution": "buster",
   "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus",
   "vyos_branch": "equuleus",
-  "kernel_version": "5.4.261",
+  "kernel_version": "5.4.268",
   "kernel_flavor": "amd64-vyos",
   "release_train": "equuleus",
   "additional_repositories": [
diff --git a/packages/linux-kernel/.gitignore b/packages/linux-kernel/.gitignore
index 84ffa9c4..eb1ec8ce 100644
--- a/packages/linux-kernel/.gitignore
+++ b/packages/linux-kernel/.gitignore
@@ -8,7 +8,9 @@
 *.deb
 *.changes
 *.buildinfo
+*.build
 *.tar.xz
+*.tar.bz2
 /*.postinst
 
 # Intel Driver source
@@ -18,5 +20,6 @@ igb-*/
 ixgbe-*/
 ixgbevf-*/
 vyos-intel-*/
+vyos-drivers-realtek-*/
 vyos-linux-firmware*/
 kernel-vars
diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index fb94c163..8866eed8 100644
--- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -6,7 +6,6 @@ Subject: [PATCH] VyOS: Add linkstate IP device attribute
 Backport of earlier Vyatta patch.
 
 (cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
-
 ---
  Documentation/networking/ip-sysctl.txt | 13 +++++++++++++
  include/linux/inetdevice.h             |  1 +
@@ -104,7 +103,7 @@ index 4c013f8800f0..409050b2bc44 100644
  };
  
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index c523236d934e..1bd2b92a017f 100644
+index 4bec4c061741..3762e74d0f10 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
 @@ -5507,6 +5507,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
@@ -115,7 +114,7 @@ index c523236d934e..1bd2b92a017f 100644
  }
  
  static inline size_t inet6_ifla6_size(void)
-@@ -6879,6 +6880,14 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -6875,6 +6876,14 @@ static const struct ctl_table addrconf_sysctl[] = {
  		.mode           = 0644,
  		.proc_handler   = addrconf_sysctl_disable_policy,
  	},
@@ -131,7 +130,7 @@ index c523236d934e..1bd2b92a017f 100644
  		.procname	= "ndisc_tclass",
  		.data		= &ipv6_devconf.ndisc_tclass,
 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 209d52ebbd19..edf7b5e9466a 100644
+index c26e832fddb7..1ae8b6f76cbb 100644
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
 @@ -687,6 +687,15 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
@@ -160,5 +159,5 @@ index 209d52ebbd19..edf7b5e9466a 100644
  	m |= IPV6_DECODE_PREF(IPV6_EXTRACT_PREF(fib6_flags)) << 2;
  #endif
 -- 
-2.39.2
+2.20.1
 
diff --git a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
index 8f4b003d..537bb0fd 100644
--- a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
+++ b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch
@@ -186,7 +186,7 @@ index b949b2c02f4b..5bbb53db64a4 100644
  			      struct inotify_inode_mark *i_mark)
  {
 diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index f5cf0938f298..c3bb42c9d291 100644
+index fcf453f7f4ae..76d32d1cb952 100644
 --- a/fs/overlayfs/super.c
 +++ b/fs/overlayfs/super.c
 @@ -15,6 +15,7 @@
@@ -197,7 +197,7 @@ index f5cf0938f298..c3bb42c9d291 100644
  #include "overlayfs.h"
  
  MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
-@@ -1767,6 +1768,18 @@ static void ovl_inode_init_once(void *foo)
+@@ -1768,6 +1769,18 @@ static void ovl_inode_init_once(void *foo)
  	inode_init_once(&oi->vfs_inode);
  }
  
@@ -216,7 +216,7 @@ index f5cf0938f298..c3bb42c9d291 100644
  static int __init ovl_init(void)
  {
  	int err;
-@@ -1781,13 +1794,21 @@ static int __init ovl_init(void)
+@@ -1782,13 +1795,21 @@ static int __init ovl_init(void)
  
  	err = register_filesystem(&ovl_fs_type);
  	if (err)
@@ -239,7 +239,7 @@ index f5cf0938f298..c3bb42c9d291 100644
  	unregister_filesystem(&ovl_fs_type);
  
  	/*
-@@ -1796,7 +1817,6 @@ static void __exit ovl_exit(void)
+@@ -1797,7 +1818,6 @@ static void __exit ovl_exit(void)
  	 */
  	rcu_barrier();
  	kmem_cache_destroy(ovl_inode_cachep);
@@ -292,5 +292,5 @@ index 6a24905f6e1e..4484f0760588 100644
 +
  #endif	/* _LINUX_INOTIFY_H */
 -- 
-2.39.2
+2.20.1