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>
---
MAINTAINERS | 3
arch/s390/kernel/syscalls/syscall.tbl | 42 ------------
arch/x86/Kconfig | 4 -
arch/x86/um/Kconfig | 3
drivers/infiniband/hw/mlx4/Kconfig | 4 -
drivers/infiniband/hw/mlx5/ib_rep.c | 8 --
drivers/infiniband/hw/mlx5/mlx5_ib.h | 3
drivers/net/ethernet/mellanox/mlx5/core/main.c | 4 -
drivers/phy/marvell/Kconfig | 3
drivers/phy/marvell/Makefile | 3
drivers/soc/fsl/dpio/dpio-cmd.h | 3
drivers/soc/fsl/dpio/dpio-driver.c | 13 ---
include/uapi/linux/time_types.h | 14 ----
kernel/cgroup/cgroup-internal.h | 4 -
kernel/cgroup/cgroup-v1.c | 50 ---------------
kernel/cgroup/cgroup.c | 20 ------
16 files changed, 181 deletions(-)
--- a/arch/s390/kernel/syscalls/syscall.tbl~linux-next-git-rejects
+++ a/arch/s390/kernel/syscalls/syscall.tbl
@@ -20,11 +20,7 @@
10 common unlink sys_unlink sys_unlink
11 common execve sys_execve compat_sys_execve
12 common chdir sys_chdir sys_chdir
-<<<<<<< HEAD
-13 32 time - compat_sys_time
-=======
13 32 time - sys_time32
->>>>>>> linux-next/akpm-base
14 common mknod sys_mknod sys_mknod
15 common chmod sys_chmod sys_chmod
16 32 lchown - sys_lchown16
@@ -34,19 +30,11 @@
22 common umount sys_oldumount sys_oldumount
23 32 setuid - sys_setuid16
24 32 getuid - sys_getuid16
-<<<<<<< HEAD
-25 32 stime - compat_sys_stime
-26 common ptrace sys_ptrace compat_sys_ptrace
-27 common alarm sys_alarm sys_alarm
-29 common pause sys_pause sys_pause
-30 common utime sys_utime compat_sys_utime
-=======
25 32 stime - sys_stime32
26 common ptrace sys_ptrace compat_sys_ptrace
27 common alarm sys_alarm sys_alarm
29 common pause sys_pause sys_pause
30 common utime sys_utime sys_utime32
->>>>>>> linux-next/akpm-base
33 common access sys_access sys_access
34 common nice sys_nice sys_nice
36 common sync sys_sync sys_sync
@@ -124,11 +112,7 @@
120 common clone sys_clone sys_clone
121 common setdomainname sys_setdomainname sys_setdomainname
122 common uname sys_newuname sys_newuname
-<<<<<<< HEAD
-124 common adjtimex sys_adjtimex compat_sys_adjtimex
-=======
124 common adjtimex sys_adjtimex sys_adjtimex_time32
->>>>>>> linux-next/akpm-base
125 common mprotect sys_mprotect sys_mprotect
126 common sigprocmask sys_sigprocmask compat_sys_sigprocmask
127 common create_module - -
@@ -166,13 +150,8 @@
158 common sched_yield sys_sched_yield sys_sched_yield
159 common sched_get_priority_max sys_sched_get_priority_max sys_sched_get_priority_max
160 common sched_get_priority_min sys_sched_get_priority_min sys_sched_get_priority_min
-<<<<<<< HEAD
-161 common sched_rr_get_interval sys_sched_rr_get_interval compat_sys_sched_rr_get_interval
-162 common nanosleep sys_nanosleep compat_sys_nanosleep
-=======
161 common sched_rr_get_interval sys_sched_rr_get_interval sys_sched_rr_get_interval_time32
162 common nanosleep sys_nanosleep sys_nanosleep_time32
->>>>>>> linux-next/akpm-base
163 common mremap sys_mremap sys_mremap
164 32 setresuid - sys_setresuid16
165 32 getresuid - sys_getresuid16
@@ -273,11 +252,7 @@
241 common tgkill sys_tgkill sys_tgkill
243 common io_setup sys_io_setup compat_sys_io_setup
244 common io_destroy sys_io_destroy sys_io_destroy
-<<<<<<< HEAD
-245 common io_getevents sys_io_getevents compat_sys_io_getevents
-=======
245 common io_getevents sys_io_getevents sys_io_getevents_time32
->>>>>>> linux-next/akpm-base
246 common io_submit sys_io_submit compat_sys_io_submit
247 common io_cancel sys_io_cancel sys_io_cancel
248 common exit_group sys_exit_group sys_exit_group
@@ -304,13 +279,8 @@
270 common set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy
271 common mq_open sys_mq_open compat_sys_mq_open
272 common mq_unlink sys_mq_unlink sys_mq_unlink
-<<<<<<< HEAD
-273 common mq_timedsend sys_mq_timedsend compat_sys_mq_timedsend
-274 common mq_timedreceive sys_mq_timedreceive compat_sys_mq_timedreceive
-=======
273 common mq_timedsend sys_mq_timedsend sys_mq_timedsend_time32
274 common mq_timedreceive sys_mq_timedreceive sys_mq_timedreceive_time32
->>>>>>> linux-next/akpm-base
275 common mq_notify sys_mq_notify compat_sys_mq_notify
276 common mq_getsetattr sys_mq_getsetattr compat_sys_mq_getsetattr
277 common kexec_load sys_kexec_load compat_sys_kexec_load
@@ -328,11 +298,7 @@
289 common mkdirat sys_mkdirat sys_mkdirat
290 common mknodat sys_mknodat sys_mknodat
291 common fchownat sys_fchownat sys_fchownat
-<<<<<<< HEAD
-292 common futimesat sys_futimesat compat_sys_futimesat
-=======
292 common futimesat sys_futimesat sys_futimesat_time32
->>>>>>> linux-next/akpm-base
293 32 fstatat64 - compat_sys_s390_fstatat64
293 64 newfstatat sys_newfstatat -
294 common unlinkat sys_unlinkat sys_unlinkat
@@ -342,13 +308,8 @@
298 common readlinkat sys_readlinkat sys_readlinkat
299 common fchmodat sys_fchmodat sys_fchmodat
300 common faccessat sys_faccessat sys_faccessat
-<<<<<<< HEAD
-301 common pselect6 sys_pselect6 compat_sys_pselect6
-302 common ppoll sys_ppoll compat_sys_ppoll
-=======
301 common pselect6 sys_pselect6 compat_sys_pselect6_time32
302 common ppoll sys_ppoll compat_sys_ppoll_time32
->>>>>>> linux-next/akpm-base
303 common unshare sys_unshare sys_unshare
304 common set_robust_list sys_set_robust_list compat_sys_set_robust_list
305 common get_robust_list sys_get_robust_list compat_sys_get_robust_list
@@ -430,8 +391,6 @@
381 common kexec_file_load sys_kexec_file_load sys_kexec_file_load
382 common io_pgetevents sys_io_pgetevents compat_sys_io_pgetevents
383 common rseq sys_rseq sys_rseq
-<<<<<<< HEAD
-=======
384 common pkey_mprotect sys_pkey_mprotect sys_pkey_mprotect
385 common pkey_alloc sys_pkey_alloc sys_pkey_alloc
386 common pkey_free sys_pkey_free sys_pkey_free
@@ -467,4 +426,3 @@
421 32 rt_sigtimedwait_time64 - compat_sys_rt_sigtimedwait_time64
422 32 futex_time64 - sys_futex
423 32 sched_rr_get_interval_time64 - sys_sched_rr_get_interval
->>>>>>> linux-next/akpm-base
--- a/arch/x86/Kconfig~linux-next-git-rejects
+++ a/arch/x86/Kconfig
@@ -14,11 +14,7 @@ config X86_32
select ARCH_WANT_IPC_PARSE_VERSION
select CLKSRC_I8253
select CLONE_BACKWARDS
-<<<<<<< HEAD
- select HAVE_GENERIC_DMA_COHERENT
-=======
select HAVE_AOUT
->>>>>>> linux-next/akpm-base
select MODULES_USE_ELF_REL
select OLD_SIGACTION
--- a/arch/x86/um/Kconfig~linux-next-git-rejects
+++ a/arch/x86/um/Kconfig
@@ -16,11 +16,8 @@ config 64BIT
config X86_32
def_bool !64BIT
-<<<<<<< HEAD
-=======
select HAVE_AOUT
select ARCH_32BIT_OFF_T
->>>>>>> linux-next/akpm-base
select ARCH_WANT_IPC_PARSE_VERSION
select MODULES_USE_ELF_REL
select CLONE_BACKWARDS
--- a/drivers/infiniband/hw/mlx4/Kconfig~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,10 +1,6 @@
config MLX4_INFINIBAND
tristate "Mellanox ConnectX HCA support"
depends on NETDEVICES && ETHERNET && PCI && INET
-<<<<<<< HEAD
- depends on INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS
-=======
->>>>>>> linux-next/akpm-base
select NET_VENDOR_MELLANOX
select MLX4_CORE
---help---
--- a/drivers/infiniband/hw/mlx5/ib_rep.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/ib_rep.c
@@ -57,11 +57,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_
else
profile = &vf_rep_profile;
-<<<<<<< HEAD
- ibdev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*ibdev));
-=======
ibdev = ib_alloc_device(mlx5_ib_dev, ib_dev);
->>>>>>> linux-next/akpm-base
if (!ibdev)
return -ENOMEM;
@@ -69,12 +65,8 @@ mlx5_ib_vport_rep_load(struct mlx5_core_
ibdev->mdev = dev;
ibdev->num_ports = max(MLX5_CAP_GEN(dev, num_ports),
MLX5_CAP_GEN(dev, num_vhca_ports));
-<<<<<<< HEAD
- if (!__mlx5_ib_add(ibdev, profile))
-=======
if (!__mlx5_ib_add(ibdev, profile)) {
ib_dealloc_device(&ibdev->ib_dev);
->>>>>>> linux-next/akpm-base
return -EINVAL;
}
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -589,10 +589,7 @@ struct mlx5_ib_mr {
atomic_t num_leaf_free;
wait_queue_head_t q_leaf_free;
struct mlx5_async_work cb_work;
-<<<<<<< HEAD
-=======
atomic_t num_pending_prefetch;
->>>>>>> linux-next/akpm-base
};
static inline bool is_odp_mr(struct mlx5_ib_mr *mr)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c~linux-next-git-rejects
+++ a/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -467,12 +467,8 @@ static int handle_hca_cap_odp(struct mlx
int set_sz;
int err;
-<<<<<<< HEAD
- if (!MLX5_CAP_GEN(dev, pg))
-=======
if (!IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING) ||
!MLX5_CAP_GEN(dev, pg))
->>>>>>> linux-next/akpm-base
return 0;
err = mlx5_core_get_caps(dev, MLX5_CAP_ODP);
--- a/drivers/phy/marvell/Kconfig~linux-next-git-rejects
+++ a/drivers/phy/marvell/Kconfig
@@ -21,8 +21,6 @@ config PHY_BERLIN_USB
help
Enable this to support the USB PHY on Marvell Berlin SoCs.
-<<<<<<< HEAD
-=======
config PHY_MVEBU_A3700_COMPHY
tristate "Marvell A3700 comphy driver"
depends on ARCH_MVEBU || COMPILE_TEST
@@ -44,7 +42,6 @@ config PHY_MVEBU_A3700_UTMI
help
Enable this to support Marvell A3700 UTMI PHY driver.
->>>>>>> linux-next/akpm-base
config PHY_MVEBU_A38X_COMPHY
tristate "Marvell Armada 38x comphy driver"
depends on ARCH_MVEBU || COMPILE_TEST
--- a/drivers/phy/marvell/Makefile~linux-next-git-rejects
+++ a/drivers/phy/marvell/Makefile
@@ -2,11 +2,8 @@
obj-$(CONFIG_ARMADA375_USBCLUSTER_PHY) += phy-armada375-usb2.o
obj-$(CONFIG_PHY_BERLIN_SATA) += phy-berlin-sata.o
obj-$(CONFIG_PHY_BERLIN_USB) += phy-berlin-usb.o
-<<<<<<< HEAD
-=======
obj-$(CONFIG_PHY_MVEBU_A3700_COMPHY) += phy-mvebu-a3700-comphy.o
obj-$(CONFIG_PHY_MVEBU_A3700_UTMI) += phy-mvebu-a3700-utmi.o
->>>>>>> linux-next/akpm-base
obj-$(CONFIG_PHY_MVEBU_A38X_COMPHY) += phy-armada38x-comphy.o
obj-$(CONFIG_PHY_MVEBU_CP110_COMPHY) += phy-mvebu-cp110-comphy.o
obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o
--- a/drivers/soc/fsl/dpio/dpio-cmd.h~linux-next-git-rejects
+++ a/drivers/soc/fsl/dpio/dpio-cmd.h
@@ -26,10 +26,7 @@
#define DPIO_CMDID_DISABLE DPIO_CMD(0x003)
#define DPIO_CMDID_GET_ATTR DPIO_CMD(0x004)
#define DPIO_CMDID_RESET DPIO_CMD(0x005)
-<<<<<<< HEAD
-=======
#define DPIO_CMDID_SET_STASHING_DEST DPIO_CMD(0x120)
->>>>>>> linux-next/akpm-base
struct dpio_cmd_open {
__le32 dpio_id;
--- a/drivers/soc/fsl/dpio/dpio-driver.c~linux-next-git-rejects
+++ a/drivers/soc/fsl/dpio/dpio-driver.c
@@ -33,8 +33,6 @@ struct dpio_priv {
static cpumask_var_t cpus_unused_mask;
-<<<<<<< HEAD
-=======
static const struct soc_device_attribute ls1088a_soc[] = {
{.family = "QorIQ LS1088A"},
{ /* sentinel */ }
@@ -75,7 +73,6 @@ static int dpaa2_dpio_get_cluster_sdest(
return cluster_base + cpu / cluster_size;
}
->>>>>>> linux-next/akpm-base
static irqreturn_t dpio_irq_handler(int irq_num, void *arg)
{
struct device *dev = (struct device *)arg;
@@ -133,10 +130,7 @@ static int dpaa2_dpio_probe(struct fsl_m
int err = -ENOMEM;
struct device *dev = &dpio_dev->dev;
int possible_next_cpu;
-<<<<<<< HEAD
-=======
int sdest;
->>>>>>> linux-next/akpm-base
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -192,8 +186,6 @@ static int dpaa2_dpio_probe(struct fsl_m
}
desc.cpu = possible_next_cpu;
cpumask_clear_cpu(possible_next_cpu, cpus_unused_mask);
-<<<<<<< HEAD
-=======
sdest = dpaa2_dpio_get_cluster_sdest(dpio_dev, desc.cpu);
if (sdest >= 0) {
@@ -204,7 +196,6 @@ static int dpaa2_dpio_probe(struct fsl_m
dev_err(dev, "dpio_set_stashing_destination failed for cpu%d\n",
desc.cpu);
}
->>>>>>> linux-next/akpm-base
/*
* Set the CENA regs to be the cache inhibited area of the portal to
@@ -287,10 +278,6 @@ static int dpaa2_dpio_remove(struct fsl_
dpio_teardown_irqs(dpio_dev);
-<<<<<<< HEAD
- cpu = dpaa2_io_get_cpu(priv->io);
-=======
->>>>>>> linux-next/akpm-base
cpumask_set_cpu(cpu, cpus_unused_mask);
err = dpio_open(dpio_dev->mc_io, 0, dpio_dev->obj_desc.id,
--- a/include/uapi/linux/time_types.h~linux-next-git-rejects
+++ a/include/uapi/linux/time_types.h
@@ -4,29 +4,15 @@
#include <linux/types.h>
-<<<<<<< HEAD
-#ifndef __kernel_timespec
-=======
->>>>>>> linux-next/akpm-base
struct __kernel_timespec {
__kernel_time64_t tv_sec; /* seconds */
long long tv_nsec; /* nanoseconds */
};
-<<<<<<< HEAD
-#endif
-#ifndef __kernel_itimerspec
-=======
-
->>>>>>> linux-next/akpm-base
struct __kernel_itimerspec {
struct __kernel_timespec it_interval; /* timer period */
struct __kernel_timespec it_value; /* timer expiration */
};
-<<<<<<< HEAD
-#endif
-=======
->>>>>>> linux-next/akpm-base
/*
* legacy timeval structure, only embedded in structures that
--- a/kernel/cgroup/cgroup.c~linux-next-git-rejects
+++ a/kernel/cgroup/cgroup.c
@@ -2038,13 +2038,8 @@ out:
int cgroup_do_get_tree(struct fs_context *fc)
{
-<<<<<<< HEAD
- struct dentry *dentry;
- bool new_sb = false;
-=======
struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
int ret;
->>>>>>> linux-next/akpm-base
ctx->kfc.root = ctx->root->kf_root;
if (fc->fs_type == &cgroup2_fs_type)
@@ -2059,11 +2054,7 @@ int cgroup_do_get_tree(struct fs_context
*/
if (!ret && ctx->ns != &init_cgroup_ns) {
struct dentry *nsdentry;
-<<<<<<< HEAD
- struct super_block *sb = dentry->d_sb;
-=======
struct super_block *sb = fc->root->d_sb;
->>>>>>> linux-next/akpm-base
struct cgroup *cgrp;
mutex_lock(&cgroup_mutex);
@@ -2075,16 +2066,6 @@ int cgroup_do_get_tree(struct fs_context
mutex_unlock(&cgroup_mutex);
nsdentry = kernfs_node_dentry(cgrp->kn, sb);
-<<<<<<< HEAD
- dput(dentry);
- if (IS_ERR(nsdentry))
- deactivate_locked_super(sb);
- dentry = nsdentry;
- }
-
- if (!new_sb)
- cgroup_put(&root->cgrp);
-=======
dput(fc->root);
fc->root = nsdentry;
if (IS_ERR(nsdentry)) {
@@ -2095,7 +2076,6 @@ int cgroup_do_get_tree(struct fs_context
if (!ctx->kfc.new_sb_created)
cgroup_put(&ctx->root->cgrp);
->>>>>>> linux-next/akpm-base
return ret;
}
--- a/kernel/cgroup/cgroup-internal.h~linux-next-git-rejects
+++ a/kernel/cgroup/cgroup-internal.h
@@ -213,11 +213,7 @@ int cgroup_path_ns_locked(struct cgroup
struct cgroup_namespace *ns);
void cgroup_free_root(struct cgroup_root *root);
-<<<<<<< HEAD
-void init_cgroup_root(struct cgroup_root *root, struct cgroup_sb_opts *opts);
-=======
void init_cgroup_root(struct cgroup_fs_context *ctx);
->>>>>>> linux-next/akpm-base
int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask);
int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask);
int cgroup_do_get_tree(struct fs_context *fc);
--- a/kernel/cgroup/cgroup-v1.c~linux-next-git-rejects
+++ a/kernel/cgroup/cgroup-v1.c
@@ -1145,19 +1145,10 @@ struct kernfs_syscall_ops cgroup1_kf_sys
*/
static int cgroup1_root_to_use(struct fs_context *fc)
{
-<<<<<<< HEAD
- struct cgroup_sb_opts opts;
-=======
struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
->>>>>>> linux-next/akpm-base
struct cgroup_root *root;
struct cgroup_subsys *ss;
int i, ret;
-<<<<<<< HEAD
-
- cgroup_lock_and_drain_offline(&cgrp_dfl_root.cgrp);
-=======
->>>>>>> linux-next/akpm-base
/* First find the desired set of subsystems */
ret = check_cgroupfs_options(fc);
@@ -1212,13 +1203,8 @@ static int cgroup1_root_to_use(struct fs
if (root->flags ^ ctx->flags)
pr_warn("new mount options do not match the existing superblock, will be ignored\n");
-<<<<<<< HEAD
- ret = 0;
- goto out_unlock;
-=======
ctx->root = root;
return 0;
->>>>>>> linux-next/akpm-base
}
/*
@@ -1234,47 +1220,22 @@ static int cgroup1_root_to_use(struct fs
return -EPERM;
root = kzalloc(sizeof(*root), GFP_KERNEL);
-<<<<<<< HEAD
- if (!root) {
- ret = -ENOMEM;
- goto out_unlock;
- }
-=======
if (!root)
return -ENOMEM;
->>>>>>> linux-next/akpm-base
ctx->root = root;
init_cgroup_root(ctx);
-<<<<<<< HEAD
- ret = cgroup_setup_root(root, opts.subsys_mask);
-=======
ret = cgroup_setup_root(root, ctx->subsys_mask);
->>>>>>> linux-next/akpm-base
if (ret)
cgroup_free_root(root);
return ret;
}
-<<<<<<< HEAD
-out_unlock:
- if (!ret && !percpu_ref_tryget_live(&root->cgrp.self.refcnt)) {
- mutex_unlock(&cgroup_mutex);
- msleep(10);
- ret = restart_syscall();
- goto out_free;
- }
- mutex_unlock(&cgroup_mutex);
-out_free:
- kfree(opts.release_agent);
- kfree(opts.name);
-=======
int cgroup1_get_tree(struct fs_context *fc)
{
struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
int ret;
->>>>>>> linux-next/akpm-base
/* Check if the caller has permission to mount. */
if (!ns_capable(ctx->ns->user_ns, CAP_SYS_ADMIN))
@@ -1282,16 +1243,6 @@ int cgroup1_get_tree(struct fs_context *
cgroup_lock_and_drain_offline(&cgrp_dfl_root.cgrp);
-<<<<<<< HEAD
- if (!IS_ERR(dentry) && percpu_ref_is_dying(&root->cgrp.self.refcnt)) {
- struct super_block *sb = dentry->d_sb;
- dput(dentry);
- deactivate_locked_super(sb);
- msleep(10);
- dentry = ERR_PTR(restart_syscall());
- }
- return dentry;
-=======
ret = cgroup1_root_to_use(fc);
if (!ret && !percpu_ref_tryget_live(&ctx->root->cgrp.self.refcnt))
ret = 1; /* restart */
@@ -1313,7 +1264,6 @@ int cgroup1_get_tree(struct fs_context *
return restart_syscall();
}
return ret;
->>>>>>> linux-next/akpm-base
}
static int __init cgroup1_wq_init(void)
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -10048,14 +10048,11 @@ S: Maintained
F: drivers/mtd/nand/raw/meson_*
F: Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
-<<<<<<< HEAD
-=======
METHODE UDPU SUPPORT
M: Vladimir Vid <vladimir.vid@xxxxxxxxxx>
S: Maintained
F: arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
->>>>>>> linux-next/akpm-base
MICROBLAZE ARCHITECTURE
M: Michal Simek <monstr@xxxxxxxxx>
W: http://www.monstr.eu/fdt/
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slub-introduce-slab_warn_on_error-fix.patch
mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
psi-introduce-psi-monitor-fix.patch
psi-introduce-psi-monitor-fix-fix.patch
psi-introduce-psi-monitor-fix-3.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-fix-fix.patch
mm-add-probe_user_read-fix.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch
filemap-drop-the-mmap_sem-for-all-blocking-operations-checkpatch-fixes.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-refactor-readahead-defines-in-mmh-fix.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3-fix.patch
memblock-update-comments-and-kernel-doc-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
