The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 3 ---
fs/ecryptfs/inode.c | 4 ----
net/switchdev/switchdev.c | 9 ---------
3 files changed, 16 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -447,8 +447,6 @@ int mlx5e_ethtool_set_channels(struct ml
goto out;
}
-<<<<<<< HEAD
-=======
/* Don't allow changing the number of channels if HTB offload is active,
* because the numeration of the QoS SQs will change, while per-queue
* qdiscs are attached.
@@ -460,7 +458,6 @@ int mlx5e_ethtool_set_channels(struct ml
goto out;
}
->>>>>>> linux-next/akpm-base
new_channels.params = *cur_params;
new_channels.params.num_channels = count;
--- a/fs/ecryptfs/inode.c~linux-next-git-rejects
+++ a/fs/ecryptfs/inode.c
@@ -1046,11 +1046,7 @@ ecryptfs_setxattr(struct dentry *dentry,
goto out;
}
inode_lock(lower_inode);
-<<<<<<< HEAD
- rc = __vfs_setxattr_locked(lower_dentry, name, value, size, flags, NULL);
-=======
rc = __vfs_setxattr_locked(&init_user_ns, lower_dentry, name, value, size, flags, NULL);
->>>>>>> linux-next/akpm-base
inode_unlock(lower_inode);
if (!rc && inode)
fsstack_copy_attr_all(inode, lower_inode);
--- a/net/switchdev/switchdev.c~linux-next-git-rejects
+++ a/net/switchdev/switchdev.c
@@ -388,12 +388,7 @@ static int __switchdev_handle_port_obj_a
extack = switchdev_notifier_info_to_extack(&port_obj_info->info);
if (check_cb(dev)) {
-<<<<<<< HEAD
- err = add_cb(dev, port_obj_info->obj, port_obj_info->trans,
- extack);
-=======
err = add_cb(dev, port_obj_info->obj, extack);
->>>>>>> linux-next/akpm-base
if (err != -EOPNOTSUPP)
port_obj_info->handled = true;
return err;
@@ -500,11 +495,7 @@ static int __switchdev_handle_port_attr_
int err = -EOPNOTSUPP;
if (check_cb(dev)) {
-<<<<<<< HEAD
- err = set_cb(dev, port_attr_info->attr, port_attr_info->trans);
-=======
err = set_cb(dev, port_attr_info->attr);
->>>>>>> linux-next/akpm-base
if (err != -EOPNOTSUPP)
port_attr_info->handled = true;
return err;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
mm-memcg-slab-pre-allocate-obj_cgroups-for-slab-caches-with-slab_account-fix.patch
mm-memcontrol-optimize-per-lruvec-stats-counter-memory-usage-checkpatch-fixes.patch
mm-memcg-add-swapcache-stat-for-memcg-v2-fix.patch
kasan-add-match-all-tag-tests-fix-fix.patch
mm-cma-allocate-cma-areas-bottom-up-fix-3-fix.patch
mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch
bdi-use-might_alloc-fix.patch
kfence-kasan-make-kfence-compatible-with-kasan-fix.patch
lib-stackdepot-add-support-to-disable-stack-depot-fix.patch
initramfs-panic-with-memory-information-fix.patch
linux-next-rejects.patch
fs-ramfs-inodec-update-inode_operationstmpfile.patch
kernel-forkc-export-kernel_thread-to-modules.patch
