The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/devicetree/bindings/net/ethernet.txt | 71 ---
arch/arm/tools/syscall.tbl | 4
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3
arch/arm64/include/asm/unistd.h | 4
arch/arm64/include/asm/unistd32.h | 4
arch/m68k/Kconfig | 3
arch/microblaze/kernel/syscalls/syscall.tbl | 4
arch/sh/configs/se7712_defconfig | 4
arch/sh/configs/se7721_defconfig | 5
arch/sh/configs/titan_defconfig | 4
arch/x86/entry/syscalls/syscall_32.tbl | 5
arch/x86/entry/syscalls/syscall_64.tbl | 4
arch/xtensa/kernel/syscalls/syscall.tbl | 4
drivers/infiniband/hw/mlx5/cq.c | 5
drivers/infiniband/hw/mlx5/devx.c | 5
drivers/infiniband/hw/mlx5/mlx5_ib.h | 3
fs/ecryptfs/keystore.c | 5
fs/gfs2/super.c | 81 ----
fs/nfsd/nfsctl.c | 199 -----------
include/linux/dim.h | 9
include/linux/mlx5/mlx5_ifc.h | 4
include/net/cfg80211.h | 4
include/uapi/asm-generic/unistd.h | 8
lib/dim/Makefile | 8
24 files changed, 1 insertion(+), 449 deletions(-)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -542,8 +542,6 @@
clocks = <&clockgen 4 0>;
little-endian;
};
-<<<<<<< HEAD
-=======
};
};
@@ -561,7 +559,6 @@
dp0_out: endpoint {
};
->>>>>>> linux-next/akpm-base
};
};
};
--- a/arch/arm64/include/asm/unistd32.h~linux-next-git-rejects
+++ a/arch/arm64/include/asm/unistd32.h
@@ -877,11 +877,7 @@ __SYSCALL(__NR_fsmount, sys_fsmount)
__SYSCALL(__NR_fspick, sys_fspick)
#define __NR_pidfd_open 434
__SYSCALL(__NR_pidfd_open, sys_pidfd_open)
-<<<<<<< HEAD
#define __NR_clone3 435
-=======
-#define __NR_clone3 436
->>>>>>> linux-next/akpm-base
__SYSCALL(__NR_clone3, sys_clone3)
/*
--- a/arch/arm64/include/asm/unistd.h~linux-next-git-rejects
+++ a/arch/arm64/include/asm/unistd.h
@@ -38,11 +38,7 @@
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
-<<<<<<< HEAD
#define __NR_compat_syscalls 436
-=======
-#define __NR_compat_syscalls 437
->>>>>>> linux-next/akpm-base
#endif
#define __ARCH_WANT_SYS_CLONE
--- a/arch/arm/tools/syscall.tbl~linux-next-git-rejects
+++ a/arch/arm/tools/syscall.tbl
@@ -448,8 +448,4 @@
432 common fsmount sys_fsmount
433 common fspick sys_fspick
434 common pidfd_open sys_pidfd_open
-<<<<<<< HEAD
435 common clone3 sys_clone3
-=======
-436 common clone3 sys_clone3
->>>>>>> linux-next/akpm-base
--- a/arch/m68k/Kconfig~linux-next-git-rejects
+++ a/arch/m68k/Kconfig
@@ -6,10 +6,7 @@ config M68K
select ARCH_HAS_BINFMT_FLAT
select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
-<<<<<<< HEAD
-=======
select ARCH_HAS_BINFMT_FLAT
->>>>>>> linux-next/akpm-base
select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
select ARCH_NO_COHERENT_DMA_MMAP if !MMU
--- a/arch/microblaze/kernel/syscalls/syscall.tbl~linux-next-git-rejects
+++ a/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -440,8 +440,4 @@
432 common fsmount sys_fsmount
433 common fspick sys_fspick
434 common pidfd_open sys_pidfd_open
-<<<<<<< HEAD
435 common clone3 sys_clone3
-=======
-436 common clone3 sys_clone3
->>>>>>> linux-next/akpm-base
--- a/arch/sh/configs/se7712_defconfig~linux-next-git-rejects
+++ a/arch/sh/configs/se7712_defconfig
@@ -63,10 +63,6 @@ CONFIG_NET_SCH_NETEM=y
CONFIG_NET_CLS_TCINDEX=y
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_FW=y
-<<<<<<< HEAD
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-=======
->>>>>>> linux-next/akpm-base
CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
--- a/arch/sh/configs/se7721_defconfig~linux-next-git-rejects
+++ a/arch/sh/configs/se7721_defconfig
@@ -62,11 +62,6 @@ CONFIG_NET_SCH_NETEM=y
CONFIG_NET_CLS_TCINDEX=y
CONFIG_NET_CLS_ROUTE4=y
CONFIG_NET_CLS_FW=y
-<<<<<<< HEAD
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-=======
->>>>>>> linux-next/akpm-base
-CONFIG_MTD=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_AMDSTD=y
--- a/arch/sh/configs/titan_defconfig~linux-next-git-rejects
+++ a/arch/sh/configs/titan_defconfig
@@ -142,10 +142,6 @@ CONFIG_GACT_PROB=y
CONFIG_NET_ACT_MIRRED=m
CONFIG_NET_ACT_IPT=m
CONFIG_NET_ACT_PEDIT=m
-<<<<<<< HEAD
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-=======
->>>>>>> linux-next/akpm-base
CONFIG_FW_LOADER=m
CONFIG_CONNECTOR=m
CONFIG_MTD=m
--- a/arch/x86/entry/syscalls/syscall_32.tbl~linux-next-git-rejects
+++ a/arch/x86/entry/syscalls/syscall_32.tbl
@@ -439,8 +439,5 @@
432 i386 fsmount sys_fsmount __ia32_sys_fsmount
433 i386 fspick sys_fspick __ia32_sys_fspick
434 i386 pidfd_open sys_pidfd_open __ia32_sys_pidfd_open
-<<<<<<< HEAD
435 i386 clone3 sys_clone3 __ia32_sys_clone3
-=======
-436 i386 clone3 sys_clone3 __ia32_sys_clone3
->>>>>>> linux-next/akpm-base
+
--- a/arch/x86/entry/syscalls/syscall_64.tbl~linux-next-git-rejects
+++ a/arch/x86/entry/syscalls/syscall_64.tbl
@@ -356,11 +356,7 @@
432 common fsmount __x64_sys_fsmount
433 common fspick __x64_sys_fspick
434 common pidfd_open __x64_sys_pidfd_open
-<<<<<<< HEAD
435 common clone3 __x64_sys_clone3/ptregs
-=======
-436 common clone3 __x64_sys_clone3/ptregs
->>>>>>> linux-next/akpm-base
#
# x32-specific system call numbers start at 512 to avoid cache impact
--- a/arch/xtensa/kernel/syscalls/syscall.tbl~linux-next-git-rejects
+++ a/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -405,8 +405,4 @@
432 common fsmount sys_fsmount
433 common fspick sys_fspick
434 common pidfd_open sys_pidfd_open
-<<<<<<< HEAD
435 common clone3 sys_clone3
-=======
-436 common clone3 sys_clone3
->>>>>>> linux-next/akpm-base
--- a/Documentation/devicetree/bindings/net/ethernet.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/net/ethernet.txt
@@ -1,72 +1 @@
-<<<<<<< HEAD
-The following properties are common to the Ethernet controllers:
-
-NOTE: All 'phy*' properties documented below are Ethernet specific. For the
-generic PHY 'phys' property, see
-Documentation/devicetree/bindings/phy/phy-bindings.txt.
-
-- mac-address: array of 6 bytes, specifies the MAC address that was last used by
- the boot program; should be used in cases where the MAC address assigned to
- the device by the boot program is different from the "local-mac-address"
- property;
-- local-mac-address: array of 6 bytes, specifies the MAC address that was
- assigned to the network device;
-- nvmem-cells: phandle, reference to an nvmem node for the MAC address
-- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used
-- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
-- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
- the maximum frame size (there's contradiction in the Devicetree
- Specification).
-- phy-mode: string, operation mode of the PHY interface. This is now a de-facto
- standard property; supported values are:
- * "internal" (Internal means there is not a standard bus between the MAC and
- the PHY, something proprietary is being used to embed the PHY in the MAC.)
- * "mii"
- * "gmii"
- * "sgmii"
- * "qsgmii"
- * "tbi"
- * "rev-mii"
- * "rmii"
- * "rgmii" (RX and TX delays are added by the MAC when required)
- * "rgmii-id" (RGMII with internal RX and TX delays provided by the PHY, the
- MAC should not add the RX or TX delays in this case)
- * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
- should not add an RX delay in this case)
- * "rgmii-txid" (RGMII with internal TX delay provided by the PHY, the MAC
- should not add an TX delay in this case)
- * "rtbi"
- * "smii"
- * "xgmii"
- * "trgmii"
- * "1000base-x",
- * "2500base-x",
- * "rxaui"
- * "xaui"
- * "10gbase-kr" (10GBASE-KR, XFI, SFI)
- * "usxgmii"
-- phy-connection-type: the same as "phy-mode" property but described in the
- Devicetree Specification;
-- phy-handle: phandle, specifies a reference to a node representing a PHY
- device; this property is described in the Devicetree Specification and so
- preferred;
-- phy: the same as "phy-handle" property, not recommended for new bindings.
-- phy-device: the same as "phy-handle" property, not recommended for new
- bindings.
-- rx-fifo-depth: the size of the controller's receive fifo in bytes. This
- is used for components that can have configurable receive fifo sizes,
- and is useful for determining certain configuration settings such as
- flow control thresholds.
-- tx-fifo-depth: the size of the controller's transmit fifo in bytes. This
- is used for components that can have configurable fifo sizes.
-- managed: string, specifies the PHY management type. Supported values are:
- "auto", "in-band-status". "auto" is the default, it usess MDIO for
- management if fixed-link is not specified.
-
-Child nodes of the Ethernet controller are typically the individual PHY devices
-connected via the MDIO bus (sometimes the MDIO bus controller is separate).
-They are described in the phy.txt file in this same directory.
-For non-MDIO PHY management see fixed-link.txt.
-=======
This file has moved to ethernet-controller.yaml.
->>>>>>> linux-next/akpm-base
--- a/drivers/infiniband/hw/mlx5/cq.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/cq.c
@@ -891,13 +891,8 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq
int entries = attr->cqe;
int vector = attr->comp_vector;
struct mlx5_ib_dev *dev = to_mdev(ibdev);
-<<<<<<< HEAD
- u32 out[MLX5_ST_SZ_DW(create_cq_out)];
- struct mlx5_ib_cq *cq;
-=======
struct mlx5_ib_cq *cq = to_mcq(ibcq);
u32 out[MLX5_ST_SZ_DW(create_cq_out)];
->>>>>>> linux-next/akpm-base
int uninitialized_var(index);
int uninitialized_var(inlen);
u32 *cqb = NULL;
--- a/drivers/infiniband/hw/mlx5/devx.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/devx.c
@@ -1294,10 +1294,6 @@ static void devx_free_indirect_mkey(stru
*/
static void devx_cleanup_mkey(struct devx_obj *obj)
{
-<<<<<<< HEAD
- xa_erase(&obj->mdev->priv.mkey_table,
- mlx5_base_mkey(obj->devx_mr.mmkey.key));
-=======
xa_erase(&obj->ib_dev->mdev->priv.mkey_table,
mlx5_base_mkey(obj->devx_mr.mmkey.key));
}
@@ -1329,7 +1325,6 @@ static void devx_cleanup_subscription(st
sub->xa_key_level2);
kfree_rcu(xa_val_level2, rcu);
}
->>>>>>> linux-next/akpm-base
}
static int devx_obj_cleanup(struct ib_uobject *uobject,
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -996,10 +996,7 @@ struct mlx5_ib_dev {
u16 devx_whitelist_uid;
struct mlx5_srq_table srq_table;
struct mlx5_async_ctx async_ctx;
-<<<<<<< HEAD
-=======
struct mlx5_devx_event_table devx_event_table;
->>>>>>> linux-next/akpm-base
};
static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)
--- a/fs/ecryptfs/keystore.c~linux-next-git-rejects
+++ a/fs/ecryptfs/keystore.c
@@ -1611,13 +1611,8 @@ int ecryptfs_keyring_auth_tok_for_sig(st
{
int rc = 0;
-<<<<<<< HEAD
- (*auth_tok_key) = request_key(&key_type_user, sig, NULL);
- if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
-=======
(*auth_tok_key) = request_key(&key_type_user, sig, NULL, NULL);
if (IS_ERR(*auth_tok_key)) {
->>>>>>> linux-next/akpm-base
(*auth_tok_key) = ecryptfs_get_encrypted_key(sig);
if (IS_ERR(*auth_tok_key)) {
printk(KERN_ERR "Could not find key with description: [%s]\n",
--- a/fs/gfs2/super.c~linux-next-git-rejects
+++ a/fs/gfs2/super.c
@@ -975,87 +975,6 @@ static int gfs2_statfs(struct dentry *de
}
/**
-<<<<<<< HEAD
- * gfs2_remount_fs - called when the FS is remounted
- * @sb: the filesystem
- * @flags: the remount flags
- * @data: extra data passed in (not used right now)
- *
- * Returns: errno
- */
-
-static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data)
-{
- struct gfs2_sbd *sdp = sb->s_fs_info;
- struct gfs2_args args = sdp->sd_args; /* Default to current settings */
- struct gfs2_tune *gt = &sdp->sd_tune;
- int error;
-
- sync_filesystem(sb);
-
- spin_lock(>->gt_spin);
- args.ar_commit = gt->gt_logd_secs;
- args.ar_quota_quantum = gt->gt_quota_quantum;
- if (gt->gt_statfs_slow)
- args.ar_statfs_quantum = 0;
- else
- args.ar_statfs_quantum = gt->gt_statfs_quantum;
- spin_unlock(>->gt_spin);
- error = gfs2_mount_args(&args, data);
- if (error)
- return error;
-
- /* Not allowed to change locking details */
- if (strcmp(args.ar_lockproto, sdp->sd_args.ar_lockproto) ||
- strcmp(args.ar_locktable, sdp->sd_args.ar_locktable) ||
- strcmp(args.ar_hostdata, sdp->sd_args.ar_hostdata))
- return -EINVAL;
-
- /* Some flags must not be changed */
- if (args_neq(&args, &sdp->sd_args, spectator) ||
- args_neq(&args, &sdp->sd_args, localflocks) ||
- args_neq(&args, &sdp->sd_args, meta))
- return -EINVAL;
-
- if (sdp->sd_args.ar_spectator)
- *flags |= SB_RDONLY;
-
- if ((sb->s_flags ^ *flags) & SB_RDONLY) {
- if (*flags & SB_RDONLY)
- error = gfs2_make_fs_ro(sdp);
- else
- error = gfs2_make_fs_rw(sdp);
- }
-
- sdp->sd_args = args;
- if (sdp->sd_args.ar_posix_acl)
- sb->s_flags |= SB_POSIXACL;
- else
- sb->s_flags &= ~SB_POSIXACL;
- if (sdp->sd_args.ar_nobarrier)
- set_bit(SDF_NOBARRIERS, &sdp->sd_flags);
- else
- clear_bit(SDF_NOBARRIERS, &sdp->sd_flags);
- spin_lock(>->gt_spin);
- gt->gt_logd_secs = args.ar_commit;
- gt->gt_quota_quantum = args.ar_quota_quantum;
- if (args.ar_statfs_quantum) {
- gt->gt_statfs_slow = 0;
- gt->gt_statfs_quantum = args.ar_statfs_quantum;
- }
- else {
- gt->gt_statfs_slow = 1;
- gt->gt_statfs_quantum = 30;
- }
- spin_unlock(>->gt_spin);
-
- gfs2_online_uevent(sdp);
- return error;
-}
-
-/**
-=======
->>>>>>> linux-next/akpm-base
* gfs2_drop_inode - Drop an inode (test for remote unlink)
* @inode: The inode to drop
*
--- a/fs/nfsd/nfsctl.c~linux-next-git-rejects
+++ a/fs/nfsd/nfsctl.c
@@ -1152,196 +1152,6 @@ static ssize_t write_v4_end_grace(struct
/* Basically copying rpc_get_inode. */
static struct inode *nfsd_get_inode(struct super_block *sb, umode_t mode)
-<<<<<<< HEAD
-{
- struct inode *inode = new_inode(sb);
- if (!inode)
- return NULL;
- /* Following advice from simple_fill_super documentation: */
- inode->i_ino = iunique(sb, NFSD_MaxReserved);
- inode->i_mode = mode;
- inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
- switch (mode & S_IFMT) {
- case S_IFDIR:
- inode->i_fop = &simple_dir_operations;
- inode->i_op = &simple_dir_inode_operations;
- inc_nlink(inode);
- default:
- break;
- }
- return inode;
-}
-
-static int __nfsd_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
-{
- struct inode *inode;
-
- inode = nfsd_get_inode(dir->i_sb, mode);
- if (!inode)
- return -ENOMEM;
- d_add(dentry, inode);
- inc_nlink(dir);
- fsnotify_mkdir(dir, dentry);
- return 0;
-}
-
-static struct dentry *nfsd_mkdir(struct dentry *parent, struct nfsdfs_client *ncl, char *name)
-{
- struct inode *dir = parent->d_inode;
- struct dentry *dentry;
- int ret = -ENOMEM;
-
- inode_lock(dir);
- dentry = d_alloc_name(parent, name);
- if (!dentry)
- goto out_err;
- ret = __nfsd_mkdir(d_inode(parent), dentry, S_IFDIR | 0600);
- if (ret)
- goto out_err;
- if (ncl) {
- d_inode(dentry)->i_private = ncl;
- kref_get(&ncl->cl_ref);
- }
-out:
- inode_unlock(dir);
- return dentry;
-out_err:
- dentry = ERR_PTR(ret);
- goto out;
-}
-
-static void clear_ncl(struct inode *inode)
-{
- struct nfsdfs_client *ncl = inode->i_private;
-
- inode->i_private = NULL;
- synchronize_rcu();
- kref_put(&ncl->cl_ref, ncl->cl_release);
-}
-
-
-static struct nfsdfs_client *__get_nfsdfs_client(struct inode *inode)
-{
- struct nfsdfs_client *nc = inode->i_private;
-
- if (nc)
- kref_get(&nc->cl_ref);
- return nc;
-}
-
-struct nfsdfs_client *get_nfsdfs_client(struct inode *inode)
-{
- struct nfsdfs_client *nc;
-
- rcu_read_lock();
- nc = __get_nfsdfs_client(inode);
- rcu_read_unlock();
- return nc;
-}
-/* from __rpc_unlink */
-static void nfsdfs_remove_file(struct inode *dir, struct dentry *dentry)
-{
- int ret;
-
- clear_ncl(d_inode(dentry));
- dget(dentry);
- ret = simple_unlink(dir, dentry);
- d_delete(dentry);
- dput(dentry);
- WARN_ON_ONCE(ret);
-}
-
-static void nfsdfs_remove_files(struct dentry *root)
-{
- struct dentry *dentry, *tmp;
-
- list_for_each_entry_safe(dentry, tmp, &root->d_subdirs, d_child) {
- if (!simple_positive(dentry)) {
- WARN_ON_ONCE(1); /* I think this can't happen? */
- continue;
- }
- nfsdfs_remove_file(d_inode(root), dentry);
- }
-}
-
-/* XXX: cut'n'paste from simple_fill_super; figure out if we could share
- * code instead. */
-static int nfsdfs_create_files(struct dentry *root,
- const struct tree_descr *files)
-{
- struct inode *dir = d_inode(root);
- struct inode *inode;
- struct dentry *dentry;
- int i;
-
- inode_lock(dir);
- for (i = 0; files->name && files->name[0]; i++, files++) {
- if (!files->name)
- continue;
- dentry = d_alloc_name(root, files->name);
- if (!dentry)
- goto out;
- inode = nfsd_get_inode(d_inode(root)->i_sb,
- S_IFREG | files->mode);
- if (!inode) {
- dput(dentry);
- goto out;
- }
- inode->i_fop = files->ops;
- inode->i_private = __get_nfsdfs_client(dir);
- d_add(dentry, inode);
- fsnotify_create(dir, dentry);
- }
- inode_unlock(dir);
- return 0;
-out:
- nfsdfs_remove_files(root);
- inode_unlock(dir);
- return -ENOMEM;
-}
-
-/* on success, returns positive number unique to that client. */
-struct dentry *nfsd_client_mkdir(struct nfsd_net *nn,
- struct nfsdfs_client *ncl, u32 id,
- const struct tree_descr *files)
-{
- struct dentry *dentry;
- char name[11];
- int ret;
-
- sprintf(name, "%u", id);
-
- dentry = nfsd_mkdir(nn->nfsd_client_dir, ncl, name);
- if (IS_ERR(dentry)) /* XXX: tossing errors? */
- return NULL;
- ret = nfsdfs_create_files(dentry, files);
- if (ret) {
- nfsd_client_rmdir(dentry);
- return NULL;
- }
- return dentry;
-}
-
-/* Taken from __rpc_rmdir: */
-void nfsd_client_rmdir(struct dentry *dentry)
-{
- struct inode *dir = d_inode(dentry->d_parent);
- struct inode *inode = d_inode(dentry);
- int ret;
-
- inode_lock(dir);
- nfsdfs_remove_files(dentry);
- clear_ncl(inode);
- dget(dentry);
- ret = simple_rmdir(dir, dentry);
- WARN_ON_ONCE(ret);
- d_delete(dentry);
- inode_unlock(dir);
-}
-
-static int nfsd_fill_super(struct super_block * sb, void * data, int silent)
-{
-=======
{
struct inode *inode = new_inode(sb);
if (!inode)
@@ -1530,7 +1340,6 @@ void nfsd_client_rmdir(struct dentry *de
static int nfsd_fill_super(struct super_block *sb, struct fs_context *fc)
{
->>>>>>> linux-next/akpm-base
struct nfsd_net *nn = net_generic(current->nsproxy->net_ns,
nfsd_net_id);
struct dentry *dentry;
@@ -1564,10 +1373,6 @@ static int nfsd_fill_super(struct super_
#endif
/* last one */ {""}
};
-<<<<<<< HEAD
- get_net(sb->s_fs_info);
-=======
->>>>>>> linux-next/akpm-base
ret = simple_fill_super(sb, 0x6e667364, nfsd_files);
if (ret)
return ret;
@@ -1576,16 +1381,12 @@ static int nfsd_fill_super(struct super_
return PTR_ERR(dentry);
nn->nfsd_client_dir = dentry;
return 0;
-<<<<<<< HEAD
-
-=======
}
static int nfsd_fs_get_tree(struct fs_context *fc)
{
fc->s_fs_info = get_net(fc->net_ns);
return vfs_get_super(fc, vfs_get_keyed_super, nfsd_fill_super);
->>>>>>> linux-next/akpm-base
}
static void nfsd_fs_free_fc(struct fs_context *fc)
--- a/include/linux/dim.h~linux-next-git-rejects
+++ a/include/linux/dim.h
@@ -82,10 +82,7 @@ struct dim_stats {
* @prev_stats: Measured rates from previous iteration (for comparison)
* @start_sample: Sampled data at start of current iteration
* @work: Work to perform on action required
-<<<<<<< HEAD
-=======
* @priv: A pointer to the struct that points to dim
->>>>>>> linux-next/akpm-base
* @profile_ix: Current moderation profile
* @mode: CQ period count mode
* @tune_state: Algorithm tuning state (see below)
@@ -99,10 +96,7 @@ struct dim {
struct dim_sample start_sample;
struct dim_sample measuring_sample;
struct work_struct work;
-<<<<<<< HEAD
-=======
void *priv;
->>>>>>> linux-next/akpm-base
u8 profile_ix;
u8 mode;
u8 tune_state;
@@ -371,8 +365,6 @@ struct dim_cq_moder net_dim_get_def_tx_m
*/
void net_dim(struct dim *dim, struct dim_sample end_sample);
-<<<<<<< HEAD
-=======
/* RDMA DIM */
/*
@@ -407,5 +399,4 @@ rdma_dim_prof[RDMA_DIM_PARAMS_NUM_PROFIL
*/
void rdma_dim(struct dim *dim, u64 completions);
->>>>>>> linux-next/akpm-base
#endif /* DIM_H */
--- a/include/linux/mlx5/mlx5_ifc.h~linux-next-git-rejects
+++ a/include/linux/mlx5/mlx5_ifc.h
@@ -1390,13 +1390,9 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 reserved_at_6c8[0x28];
u8 sf_base_id[0x10];
-<<<<<<< HEAD
- u8 reserved_at_700[0x100];
-=======
u8 reserved_at_700[0x80];
u8 vhca_tunnel_commands[0x40];
u8 reserved_at_7c0[0x40];
->>>>>>> linux-next/akpm-base
};
enum mlx5_flow_destination_type {
--- a/include/net/cfg80211.h~linux-next-git-rejects
+++ a/include/net/cfg80211.h
@@ -4170,11 +4170,7 @@ struct sta_opmode_info {
u8 rx_nss;
};
-<<<<<<< HEAD
-#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)ERR_PTR(-ENODATA))
-=======
#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)(long)(-ENODATA))
->>>>>>> linux-next/akpm-base
/**
* struct wiphy_vendor_command - vendor command definition
--- a/include/uapi/asm-generic/unistd.h~linux-next-git-rejects
+++ a/include/uapi/asm-generic/unistd.h
@@ -846,19 +846,11 @@ __SYSCALL(__NR_fsmount, sys_fsmount)
__SYSCALL(__NR_fspick, sys_fspick)
#define __NR_pidfd_open 434
__SYSCALL(__NR_pidfd_open, sys_pidfd_open)
-<<<<<<< HEAD
#define __NR_clone3 435
__SYSCALL(__NR_clone3, sys_clone3)
#undef __NR_syscalls
#define __NR_syscalls 436
-=======
-#define __NR_clone3 436
-__SYSCALL(__NR_clone3, sys_clone3)
-
-#undef __NR_syscalls
-#define __NR_syscalls 437
->>>>>>> linux-next/akpm-base
/*
* 32 bit systems traditionally used different
--- a/lib/dim/Makefile~linux-next-git-rejects
+++ a/lib/dim/Makefile
@@ -2,14 +2,6 @@
# DIM Dynamic Interrupt Moderation library
#
-<<<<<<< HEAD
-obj-$(CONFIG_DIMLIB) = net_dim.o
-
-net_dim-y = \
- dim.o \
- net_dim.o
-=======
obj-$(CONFIG_DIMLIB) += dim.o
dim-y := dim.o net_dim.o rdma_dim.o
->>>>>>> linux-next/akpm-base
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
include-linux-pfn_th-remove-pfn_t_to_virt.patch
include-linux-pagemaph-document-trylock_page-return-value.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-vmscanc-add-checks-for-incorrect-handling-of-current-reclaim_state.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
rbtree-avoid-generating-code-twice-for-the-cached-versions-checkpatch-fixes.patch
coda-add-hinting-support-for-partial-file-caching-fix.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
resource-fix-locking-in-find_next_iomem_res-fix.patch
linux-next-rejects.patch
diff-sucks.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
mm-sparsemem-cleanup-section-number-data-types-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-4.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
