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>
---
arch/Kconfig | 11 ----
drivers/dax/super.c | 11 ----
drivers/gpu/drm/i915/intel_dp.c | 6 --
drivers/gpu/drm/i915/intel_engine_cs.c | 4 -
drivers/gpu/drm/v3d/Kconfig | 3 -
drivers/hwtracing/coresight/coresight-tmc-etr.c | 18 -------
drivers/power/supply/power_supply_sysfs.c | 32 --------------
fs/xfs/libxfs/xfs_sb.c | 14 ------
fs/xfs/xfs_file.c | 3 -
fs/xfs/xfs_ioctl.c | 4 -
init/Kconfig | 3 -
scripts/Kconfig.include | 3 -
12 files changed, 112 deletions(-)
diff -puN arch/Kconfig~linux-next-git-rejects arch/Kconfig
--- a/arch/Kconfig~linux-next-git-rejects
+++ a/arch/Kconfig
@@ -597,17 +597,6 @@ config CC_STACKPROTECTOR_STRONG
about 20% of all kernel functions, which increases the kernel code
size by about 2%.
-<<<<<<< HEAD
-config CC_STACKPROTECTOR_AUTO
- bool "Automatic"
- help
- If the compiler supports it, the best available stack-protector
- option will be chosen.
-
-endchoice
-
-=======
->>>>>>> linux-next/akpm-base
config HAVE_ARCH_WITHIN_STACK_FRAMES
bool
help
diff -puN drivers/dax/super.c~linux-next-git-rejects drivers/dax/super.c
--- a/drivers/dax/super.c~linux-next-git-rejects
+++ a/drivers/dax/super.c
@@ -137,16 +137,6 @@ bool __bdev_dax_supported(struct block_d
WARN_ON(IS_ENABLED(CONFIG_ARCH_HAS_PMEM_API));
dax_enabled = true;
} else if (pfn_t_devmap(pfn)) {
-<<<<<<< HEAD
- /* pass */;
- } else {
- pr_debug("%s: error: dax support not enabled\n",
- bdevname(bdev, buf));
- return false;
- }
-
- return true;
-=======
struct dev_pagemap *pgmap;
pgmap = get_dev_pagemap(pfn_t_to_pfn(pfn), NULL);
@@ -160,7 +150,6 @@ bool __bdev_dax_supported(struct block_d
bdevname(bdev, buf));
return dax_enabled;
->>>>>>> linux-next/akpm-base
}
EXPORT_SYMBOL_GPL(__bdev_dax_supported);
#endif
diff -puN drivers/gpu/drm/i915/intel_dp.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_dp.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_dp.c
@@ -1674,11 +1674,6 @@ static int intel_dp_compute_bpp(struct i
dev_priv->vbt.edp.bpp);
bpp = dev_priv->vbt.edp.bpp;
}
-<<<<<<< HEAD
- }
-
- return bpp;
-=======
}
return bpp;
@@ -1718,7 +1713,6 @@ intel_dp_adjust_compliance_config(struct
intel_dp->compliance.test_lane_count;
}
}
->>>>>>> linux-next/akpm-base
}
/* Optimize link config in order: max bpp, min clock, min lanes */
diff -puN drivers/gpu/drm/i915/intel_engine_cs.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_engine_cs.c
--- a/drivers/gpu/drm/i915/intel_engine_cs.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1114,11 +1114,7 @@ static void print_request(struct drm_pri
const char *prefix)
{
const char *name = rq->fence.ops->get_timeline_name(&rq->fence);
-<<<<<<< HEAD
- char buf[80];
-=======
char buf[80] = "";
->>>>>>> linux-next/akpm-base
int x = 0;
x = print_sched_attr(rq->i915, &rq->sched.attr, buf, x, sizeof(buf));
diff -puN drivers/gpu/drm/v3d/Kconfig~linux-next-git-rejects drivers/gpu/drm/v3d/Kconfig
--- a/drivers/gpu/drm/v3d/Kconfig~linux-next-git-rejects
+++ a/drivers/gpu/drm/v3d/Kconfig
@@ -3,10 +3,7 @@ config DRM_V3D
depends on ARCH_BCM || ARCH_BCMSTB || COMPILE_TEST
depends on DRM
depends on COMMON_CLK
-<<<<<<< HEAD
-=======
depends on MMU
->>>>>>> linux-next/akpm-base
select DRM_SCHED
help
Choose this option if you have a system that has a Broadcom
diff -puN drivers/hwtracing/coresight/coresight-tmc-etr.c~linux-next-git-rejects drivers/hwtracing/coresight/coresight-tmc-etr.c
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c~linux-next-git-rejects
+++ a/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -958,14 +958,8 @@ static int tmc_enable_etr_sink_sysfs(str
{
int ret = 0;
unsigned long flags;
-<<<<<<< HEAD
- void __iomem *vaddr = NULL;
- dma_addr_t paddr = 0;
- struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
-=======
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
struct etr_buf *new_buf = NULL, *free_buf = NULL;
->>>>>>> linux-next/akpm-base
/*
* If we are enabling the ETR from disabled state, we need to make
@@ -1002,17 +996,6 @@ static int tmc_enable_etr_sink_sysfs(str
goto out;
/*
-<<<<<<< HEAD
- * If drvdata::vaddr == NULL, use the memory allocated above.
- * Otherwise a buffer still exists from a previous session, so
- * simply use that.
- */
- if (drvdata->vaddr == NULL) {
- used = true;
- drvdata->vaddr = vaddr;
- drvdata->paddr = paddr;
- drvdata->buf = drvdata->vaddr;
-=======
* If we don't have a buffer or it doesn't match the requested size,
* use the buffer allocated above. Otherwise reuse the existing buffer.
*/
@@ -1020,7 +1003,6 @@ static int tmc_enable_etr_sink_sysfs(str
(new_buf && drvdata->etr_buf->size != new_buf->size)) {
free_buf = drvdata->etr_buf;
drvdata->etr_buf = new_buf;
->>>>>>> linux-next/akpm-base
}
drvdata->mode = CS_MODE_SYSFS;
diff -puN drivers/power/supply/power_supply_sysfs.c~linux-next-git-rejects drivers/power/supply/power_supply_sysfs.c
--- a/drivers/power/supply/power_supply_sysfs.c~linux-next-git-rejects
+++ a/drivers/power/supply/power_supply_sysfs.c
@@ -137,37 +137,6 @@ static ssize_t power_supply_show_propert
}
}
-<<<<<<< HEAD
- if (off == POWER_SUPPLY_PROP_STATUS)
- return sprintf(buf, "%s\n",
- power_supply_status_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_CHARGE_TYPE)
- return sprintf(buf, "%s\n",
- power_supply_charge_type_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_HEALTH)
- return sprintf(buf, "%s\n",
- power_supply_health_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_TECHNOLOGY)
- return sprintf(buf, "%s\n",
- power_supply_technology_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_CAPACITY_LEVEL)
- return sprintf(buf, "%s\n",
- power_supply_capacity_level_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_TYPE)
- return sprintf(buf, "%s\n",
- power_supply_type_text[value.intval]);
- else if (off == POWER_SUPPLY_PROP_USB_TYPE)
- return power_supply_show_usb_type(dev, psy->desc->usb_types,
- psy->desc->num_usb_types,
- &value, buf);
- else if (off == POWER_SUPPLY_PROP_SCOPE)
- return sprintf(buf, "%s\n",
- power_supply_scope_text[value.intval]);
- else if (off >= POWER_SUPPLY_PROP_MODEL_NAME)
- return sprintf(buf, "%s\n", value.strval);
-
- return sprintf(buf, "%d\n", value.intval);
-=======
switch (psp) {
case POWER_SUPPLY_PROP_STATUS:
ret = sprintf(buf, "%s\n",
@@ -210,7 +179,6 @@ static ssize_t power_supply_show_propert
}
return ret;
->>>>>>> linux-next/akpm-base
}
static ssize_t power_supply_store_property(struct device *dev,
diff -puN fs/xfs/libxfs/xfs_sb.c~linux-next-git-rejects fs/xfs/libxfs/xfs_sb.c
--- a/fs/xfs/libxfs/xfs_sb.c~linux-next-git-rejects
+++ a/fs/xfs/libxfs/xfs_sb.c
@@ -970,24 +970,16 @@ xfs_sync_sb_buf(
struct xfs_mount *mp)
{
struct xfs_trans *tp;
-<<<<<<< HEAD
-=======
struct xfs_buf *bp;
->>>>>>> linux-next/akpm-base
int error;
error = xfs_trans_alloc(mp, &M_RES(mp)->tr_sb, 0, 0, 0, &tp);
if (error)
return error;
-<<<<<<< HEAD
- xfs_log_sb(tp);
- xfs_trans_bhold(tp, mp->m_sb_bp);
-=======
bp = xfs_trans_getsb(tp, mp, 0);
xfs_log_sb(tp);
xfs_trans_bhold(tp, bp);
->>>>>>> linux-next/akpm-base
xfs_trans_set_sync(tp);
error = xfs_trans_commit(tp);
if (error)
@@ -995,15 +987,9 @@ xfs_sync_sb_buf(
/*
* write out the sb buffer to get the changes to disk
*/
-<<<<<<< HEAD
- error = xfs_bwrite(mp->m_sb_bp);
-out:
- xfs_buf_relse(mp->m_sb_bp);
-=======
error = xfs_bwrite(bp);
out:
xfs_buf_relse(bp);
->>>>>>> linux-next/akpm-base
return error;
}
diff -puN fs/xfs/xfs_file.c~linux-next-git-rejects fs/xfs/xfs_file.c
--- a/fs/xfs/xfs_file.c~linux-next-git-rejects
+++ a/fs/xfs/xfs_file.c
@@ -729,8 +729,6 @@ xfs_file_write_iter(
}
return xfs_file_buffered_aio_write(iocb, from);
-<<<<<<< HEAD
-=======
}
static void
@@ -794,7 +792,6 @@ xfs_break_layouts(
} while (error == 0 && retry);
return error;
->>>>>>> linux-next/akpm-base
}
#define XFS_FALLOC_FL_SUPPORTED \
diff -puN fs/xfs/xfs_ioctl.c~linux-next-git-rejects fs/xfs/xfs_ioctl.c
--- a/fs/xfs/xfs_ioctl.c~linux-next-git-rejects
+++ a/fs/xfs/xfs_ioctl.c
@@ -1100,12 +1100,8 @@ xfs_ioctl_setattr_dax_invalidate(
if (fa->fsx_xflags & FS_XFLAG_DAX) {
if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)))
return -EINVAL;
-<<<<<<< HEAD
- if (!bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),
-=======
if (S_ISREG(inode->i_mode) &&
!bdev_dax_supported(xfs_find_bdev_for_inode(VFS_I(ip)),
->>>>>>> linux-next/akpm-base
sb->s_blocksize))
return -EINVAL;
}
diff -puN init/Kconfig~linux-next-git-rejects init/Kconfig
--- a/init/Kconfig~linux-next-git-rejects
+++ a/init/Kconfig
@@ -7,8 +7,6 @@ config DEFCONFIG_LIST
default "/boot/config-$(shell,uname --release)"
default ARCH_DEFCONFIG
default "arch/$(ARCH)/defconfig"
-<<<<<<< HEAD
-=======
config CC_IS_GCC
def_bool $(success,$(CC) --version | head -n 1 | grep -q gcc)
@@ -24,7 +22,6 @@ config CC_IS_CLANG
config CLANG_VERSION
int
default $(shell,$(srctree)/scripts/clang-version.sh $(CC))
->>>>>>> linux-next/akpm-base
config CONSTRUCTORS
bool
diff -puN scripts/Kconfig.include~linux-next-git-rejects scripts/Kconfig.include
--- a/scripts/Kconfig.include~linux-next-git-rejects
+++ a/scripts/Kconfig.include
@@ -25,9 +25,6 @@ cc-option = $(success,$(CC) -Werror $(1)
# $(ld-option,<flag>)
# Return y if the linker supports <flag>, n otherwise
ld-option = $(success,$(LD) -v $(1))
-<<<<<<< HEAD
-=======
# gcc version including patch level
gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//')
->>>>>>> linux-next/akpm-base
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
revert-autofs-update-fs-autofs4-kconfig-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
