kernel: update kernel 4.4 to version 4.4.22
Forgot to update kernel-version.mk, so updated patch. Compile-tested on x86/64 and ar71xx; run-tested on x86/64 and ar71xx. Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
This commit is contained in:
committed by
Álvaro Fernández Rojas
parent
fc88eb3fdf
commit
949cfbb243
@@ -292,30 +292,31 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
|
||||
- err = ubifs_add_dirt(c, lnum, dlen2);
|
||||
- if (err)
|
||||
- goto out_ro;
|
||||
-
|
||||
- dent_key_init(c, &key, old_dir->i_ino, &old_dentry->d_name);
|
||||
- err = ubifs_tnc_remove_nm(c, &key, &old_dentry->d_name);
|
||||
- if (err)
|
||||
- goto out_ro;
|
||||
+ offs += aligned_dlen1;
|
||||
+ if (whiteout) {
|
||||
+ dent_key_init(c, &key, old_dir->i_ino, &old_dentry->d_name);
|
||||
+ err = ubifs_tnc_add_nm(c, &key, lnum, offs, dlen2, &old_dentry->d_name);
|
||||
+ if (err)
|
||||
+ goto out_ro;
|
||||
|
||||
- dent_key_init(c, &key, old_dir->i_ino, &old_dentry->d_name);
|
||||
- err = ubifs_tnc_remove_nm(c, &key, &old_dentry->d_name);
|
||||
- if (err)
|
||||
- goto out_ro;
|
||||
+
|
||||
+ ubifs_delete_orphan(c, whiteout->i_ino);
|
||||
+ } else {
|
||||
+ err = ubifs_add_dirt(c, lnum, dlen2);
|
||||
+ if (err)
|
||||
+ goto out_ro;
|
||||
|
||||
- offs += aligned_dlen1 + aligned_dlen2;
|
||||
+
|
||||
+ dent_key_init(c, &key, old_dir->i_ino, &old_dentry->d_name);
|
||||
+ err = ubifs_tnc_remove_nm(c, &key, &old_dentry->d_name);
|
||||
+ if (err)
|
||||
+ goto out_ro;
|
||||
+ }
|
||||
+
|
||||
|
||||
- offs += aligned_dlen1 + aligned_dlen2;
|
||||
+ offs += aligned_dlen2;
|
||||
if (new_inode) {
|
||||
ino_key_init(c, &key, new_inode->i_ino);
|
||||
|
||||
@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
return 0;
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1638,6 +1638,8 @@ struct net_device {
|
||||
@@ -1637,6 +1637,8 @@ struct net_device {
|
||||
struct netdev_hw_addr_list mc;
|
||||
struct netdev_hw_addr_list dev_addrs;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1298,6 +1298,7 @@ enum netdev_priv_flags {
|
||||
@@ -1297,6 +1297,7 @@ enum netdev_priv_flags {
|
||||
IFF_NO_QUEUE = 1<<21,
|
||||
IFF_OPENVSWITCH = 1<<22,
|
||||
IFF_L3MDEV_SLAVE = 1<<23,
|
||||
@@ -8,7 +8,7 @@
|
||||
};
|
||||
|
||||
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
|
||||
@@ -1324,6 +1325,7 @@ enum netdev_priv_flags {
|
||||
@@ -1323,6 +1324,7 @@ enum netdev_priv_flags {
|
||||
#define IFF_NO_QUEUE IFF_NO_QUEUE
|
||||
#define IFF_OPENVSWITCH IFF_OPENVSWITCH
|
||||
#define IFF_L3MDEV_SLAVE IFF_L3MDEV_SLAVE
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
/**
|
||||
* struct net_device - The DEVICE structure.
|
||||
@@ -1603,6 +1605,11 @@ struct net_device {
|
||||
@@ -1602,6 +1604,11 @@ struct net_device {
|
||||
const struct l3mdev_ops *l3mdev_ops;
|
||||
#endif
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
const struct header_ops *header_ops;
|
||||
|
||||
unsigned int flags;
|
||||
@@ -1669,6 +1676,10 @@ struct net_device {
|
||||
@@ -1668,6 +1675,10 @@ struct net_device {
|
||||
struct mpls_dev __rcu *mpls_ptr;
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
--- a/drivers/misc/Kconfig 2016-09-18 15:23:07.100190724 +0200
|
||||
+++ b/drivers/misc/Kconfig 2016-09-18 15:26:56.130785350 +0200
|
||||
--- a/drivers/misc/Kconfig
|
||||
+++ b/drivers/misc/Kconfig
|
||||
@@ -150,6 +150,18 @@ config SGI_IOC4
|
||||
If you have an SGI Altix with an IOC4-based card say Y.
|
||||
Otherwise say N.
|
||||
|
||||
|
||||
+config OWL_LOADER
|
||||
+ tristate "Owl loader for initializing Atheros PCI(e) Wifi chips"
|
||||
+ depends on PCI
|
||||
@@ -19,8 +19,8 @@
|
||||
config TIFM_CORE
|
||||
tristate "TI Flash Media interface support"
|
||||
depends on PCI
|
||||
--- a/drivers/misc/Makefile 2016-09-18 15:21:56.406675181 +0200
|
||||
+++ b/drivers/misc/Makefile 2016-09-18 15:22:46.866805239 +0200
|
||||
--- a/drivers/misc/Makefile
|
||||
+++ b/drivers/misc/Makefile
|
||||
@@ -15,6 +15,7 @@ obj-$(CONFIG_BMP085_SPI) += bmp085-spi.o
|
||||
obj-$(CONFIG_DUMMY_IRQ) += dummy-irq.o
|
||||
obj-$(CONFIG_ICS932S401) += ics932s401.o
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
+MODULE_LICENSE("GPL");
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -2075,6 +2075,7 @@ int wake_up_state(struct task_struct *p,
|
||||
@@ -2097,6 +2097,7 @@ int wake_up_state(struct task_struct *p,
|
||||
{
|
||||
return try_to_wake_up(p, state, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user