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>
---
--- a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi~linux-next-git-rejects
+++ a/arch/arm64/boot/dts/renesas/r8a774c0.dtsi
@@ -2,11 +2,7 @@
/*
* Device Tree Source for the RZ/G2E (R8A774C0) SoC
*
-<<<<<<< HEAD
- * Copyright (C) 2018 Renesas Electronics Corp.
-=======
* Copyright (C) 2018-2019 Renesas Electronics Corp.
->>>>>>> linux-next/akpm-base
*/
#include <dt-bindings/clock/r8a774c0-cpg-mssr.h>
@@ -1154,14 +1150,8 @@
<&cpg CPG_CORE R8A774C0_CLK_S3D1C>,
<&scif_clk>;
clock-names = "fck", "brg_int", "scif_clk";
-<<<<<<< HEAD
- dmas = <&dmac1 0x5b>, <&dmac1 0x5a>,
- <&dmac2 0x5b>, <&dmac2 0x5a>;
- dma-names = "tx", "rx", "tx", "rx";
-=======
dmas = <&dmac0 0x5b>, <&dmac0 0x5a>;
dma-names = "tx", "rx";
->>>>>>> linux-next/akpm-base
power-domains = <&sysc R8A774C0_PD_ALWAYS_ON>;
resets = <&cpg 202>;
status = "disabled";
--- a/arch/arm64/Kconfig.platforms~linux-next-git-rejects
+++ a/arch/arm64/Kconfig.platforms
@@ -151,11 +151,7 @@ config ARCH_MVEBU
config ARCH_MXC
bool "ARMv8 based NXP i.MX SoC family"
select ARM64_ERRATUM_843419
-<<<<<<< HEAD
- select ARM64_ERRATUM_845719
-=======
select ARM64_ERRATUM_845719 if COMPAT
->>>>>>> linux-next/akpm-base
select IMX_GPCV2
select IMX_GPCV2_PM_DOMAINS
select PM
--- a/arch/x86/entry/syscalls/syscall_32.tbl~linux-next-git-rejects
+++ a/arch/x86/entry/syscalls/syscall_32.tbl
@@ -429,10 +429,7 @@
421 i386 rt_sigtimedwait_time64 sys_rt_sigtimedwait __ia32_compat_sys_rt_sigtimedwait_time64
422 i386 futex_time64 sys_futex __ia32_sys_futex
423 i386 sched_rr_get_interval_time64 sys_sched_rr_get_interval __ia32_sys_sched_rr_get_interval
-<<<<<<< HEAD
-=======
424 i386 pidfd_send_signal sys_pidfd_send_signal __ia32_sys_pidfd_send_signal
425 i386 io_uring_setup sys_io_uring_setup __ia32_sys_io_uring_setup
426 i386 io_uring_enter sys_io_uring_enter __ia32_sys_io_uring_enter
427 i386 io_uring_register sys_io_uring_register __ia32_sys_io_uring_register
->>>>>>> linux-next/akpm-base
--- a/arch/x86/entry/syscalls/syscall_64.tbl~linux-next-git-rejects
+++ a/arch/x86/entry/syscalls/syscall_64.tbl
@@ -345,13 +345,10 @@
334 common rseq __x64_sys_rseq
# don't use numbers 387 through 423, add new calls after the last
# 'common' entry
-<<<<<<< HEAD
-=======
424 common pidfd_send_signal __x64_sys_pidfd_send_signal
425 common io_uring_setup __x64_sys_io_uring_setup
426 common io_uring_enter __x64_sys_io_uring_enter
427 common io_uring_register __x64_sys_io_uring_register
->>>>>>> linux-next/akpm-base
#
# x32-specific system call numbers start at 512 to avoid cache impact
--- a/arch/x86/include/asm/cpu_device_id.h~linux-next-git-rejects
+++ a/arch/x86/include/asm/cpu_device_id.h
@@ -38,36 +38,4 @@ struct x86_cpu_desc {
extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id *match);
extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
-<<<<<<< HEAD
-/*
- * Match specific microcode revisions.
- *
- * vendor/family/model/stepping must be all set.
- *
- * Only checks against the boot CPU. When mixed-stepping configs are
- * valid for a CPU model, add a quirk for every valid stepping and
- * do the fine-tuning in the quirk handler.
- */
-
-struct x86_cpu_desc {
- __u8 x86_family;
- __u8 x86_vendor;
- __u8 x86_model;
- __u8 x86_stepping;
- __u32 x86_microcode_rev;
-};
-
-#define INTEL_CPU_DESC(mod, step, rev) { \
- .x86_family = 6, \
- .x86_vendor = X86_VENDOR_INTEL, \
- .x86_model = mod, \
- .x86_stepping = step, \
- .x86_microcode_rev = rev, \
-}
-
-extern bool x86_cpu_has_min_microcode_rev(const struct x86_cpu_desc *table);
-
-#endif
-=======
#endif /* _ASM_X86_CPU_DEVICE_ID */
->>>>>>> linux-next/akpm-base
--- a/Documentation/devicetree/bindings/arm/amlogic.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -110,10 +110,7 @@ Board compatible values (alphabetically,
- "amlogic,u200" (Meson g12a s905d2)
- "amediatech,x96-max" (Meson g12a s905x2)
-<<<<<<< HEAD
-=======
- "seirobotics,sei510" (Meson g12a s905x2)
->>>>>>> linux-next/akpm-base
Amlogic Meson Firmware registers Interface
------------------------------------------
--- a/drivers/irqchip/irq-imx-irqsteer.c~linux-next-git-rejects
+++ a/drivers/irqchip/irq-imx-irqsteer.c
@@ -169,10 +169,6 @@ static int imx_irqsteer_probe(struct pla
raw_spin_lock_init(&data->lock);
-<<<<<<< HEAD
- of_property_read_u32(np, "fsl,num-irqs", &irqs_num);
- of_property_read_u32(np, "fsl,channel", &data->channel);
-=======
ret = of_property_read_u32(np, "fsl,num-irqs", &irqs_num);
if (ret)
return ret;
@@ -186,7 +182,6 @@ static int imx_irqsteer_probe(struct pla
*/
data->irq_count = DIV_ROUND_UP(irqs_num, 64);
data->reg_num = irqs_num / 32;
->>>>>>> linux-next/akpm-base
/*
* There is one output irq for each group of 64 inputs.
@@ -218,7 +213,6 @@ static int imx_irqsteer_probe(struct pla
dev_err(&pdev->dev, "failed to create IRQ domain\n");
ret = -ENOMEM;
goto out;
-<<<<<<< HEAD
}
if (!data->irq_count || data->irq_count > CHAN_MAX_OUTPUT_INT) {
@@ -226,15 +220,6 @@ static int imx_irqsteer_probe(struct pla
goto out;
}
-=======
- }
-
- if (!data->irq_count || data->irq_count > CHAN_MAX_OUTPUT_INT) {
- ret = -EINVAL;
- goto out;
- }
-
->>>>>>> linux-next/akpm-base
for (i = 0; i < data->irq_count; i++) {
data->irq[i] = irq_of_parse_and_map(np, i);
if (!data->irq[i]) {
--- a/fs/kernfs/mount.c~linux-next-git-rejects
+++ a/fs/kernfs/mount.c
@@ -21,19 +21,6 @@
#include "kernfs-internal.h"
struct kmem_cache *kernfs_node_cache, *kernfs_iattrs_cache;
-<<<<<<< HEAD
-
-static int kernfs_sop_remount_fs(struct super_block *sb, int *flags, char *data)
-{
- struct kernfs_root *root = kernfs_info(sb)->root;
- struct kernfs_syscall_ops *scops = root->syscall_ops;
-
- if (scops && scops->remount_fs)
- return scops->remount_fs(root, flags, data);
- return 0;
-}
-=======
->>>>>>> linux-next/akpm-base
static int kernfs_sop_show_options(struct seq_file *sf, struct dentry *dentry)
{
--- a/include/linux/kernfs.h~linux-next-git-rejects
+++ a/include/linux/kernfs.h
@@ -25,11 +25,7 @@ struct seq_file;
struct vm_area_struct;
struct super_block;
struct file_system_type;
-<<<<<<< HEAD
-struct poll_table_struct;
-=======
struct fs_context;
->>>>>>> linux-next/akpm-base
struct kernfs_fs_context;
struct kernfs_open_node;
--- a/include/linux/sched.h~linux-next-git-rejects
+++ a/include/linux/sched.h
@@ -1411,10 +1411,6 @@ extern struct pid *cad_pid;
#define PF_UMH 0x02000000 /* I'm an Usermodehelper process */
#define PF_NO_SETAFFINITY 0x04000000 /* Userland is not allowed to meddle with cpus_allowed */
#define PF_MCE_EARLY 0x08000000 /* Early kill for mce process policy */
-<<<<<<< HEAD
-#define PF_MEMALLOC_NOCMA 0x10000000 /* All allocation request will have _GFP_MOVABLE cleared */
-=======
->>>>>>> linux-next/akpm-base
#define PF_FREEZER_SKIP 0x40000000 /* Freezer should not count it as freezable */
#define PF_SUSPEND_TASK 0x80000000 /* This thread called freeze_processes() and should not be frozen */
--- a/include/uapi/asm-generic/unistd.h~linux-next-git-rejects
+++ a/include/uapi/asm-generic/unistd.h
@@ -823,11 +823,6 @@ __SYSCALL(__NR_futex_time64, sys_futex)
#define __NR_sched_rr_get_interval_time64 423
__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)
#endif
-<<<<<<< HEAD
-
-#undef __NR_syscalls
-#define __NR_syscalls 424
-=======
#define __NR_pidfd_send_signal 424
__SYSCALL(__NR_pidfd_send_signal, sys_pidfd_send_signal)
#define __NR_io_uring_setup 425
@@ -839,7 +834,6 @@ __SYSCALL(__NR_io_uring_register, sys_io
#undef __NR_syscalls
#define __NR_syscalls 428
->>>>>>> linux-next/akpm-base
/*
* 32 bit systems traditionally used different
--- a/Kbuild~linux-next-git-rejects
+++ a/Kbuild
@@ -1,16 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
#
# Kbuild for top-level directory of the kernel
-<<<<<<< HEAD
-# This file takes care of the following:
-# 1) Generate bounds.h
-# 2) Generate timeconst.h
-# 3) Generate asm-offsets.h (may need bounds.h and timeconst.h)
-# 4) Check for missing system calls
-# 5) check atomics headers are up-to-date
-# 6) Generate constants.py (may need bounds.h)
-=======
->>>>>>> linux-next/akpm-base
#####
# Generate bounds.h
@@ -61,24 +51,7 @@ missing-syscalls: scripts/checksyscalls.
$(call cmd,syscalls)
#####
-<<<<<<< HEAD
-# 5) Check atomic headers are up-to-date
-#
-
-always += old-atomics
-targets += old-atomics
-
-quiet_cmd_atomics = CALL $<
- cmd_atomics = $(CONFIG_SHELL) $<
-
-old-atomics: scripts/atomic/check-atomics.sh FORCE
- $(call cmd,atomics)
-
-#####
-# 6) Generate constants for Python GDB integration
-=======
# Check atomic headers are up-to-date
->>>>>>> linux-next/akpm-base
#
always += old-atomics
--- a/scripts/gcc-plugins/Kconfig~linux-next-git-rejects
+++ a/scripts/gcc-plugins/Kconfig
@@ -67,15 +67,11 @@ config GCC_PLUGIN_LATENT_ENTROPY
* https://pax.grsecurity.net/
config GCC_PLUGIN_STRUCTLEAK
-<<<<<<< HEAD
- bool "Force initialization of variables containing userspace addresses"
-=======
bool "Zero initialize stack variables"
# Currently STRUCTLEAK inserts initialization out of live scope of
# variables from KASAN point of view. This leads to KASAN false
# positive reports. Prohibit this combination for now.
depends on !KASAN_EXTRA
->>>>>>> linux-next/akpm-base
help
While the kernel is built with warnings enabled for any missed
stack variable initializations, this warning is silenced for
--- a/sound/soc/mediatek/common/mtk-btcvsd.c~linux-next-git-rejects
+++ a/sound/soc/mediatek/common/mtk-btcvsd.c
@@ -49,10 +49,7 @@ enum bt_sco_state {
BT_SCO_STATE_IDLE,
BT_SCO_STATE_RUNNING,
BT_SCO_STATE_ENDING,
-<<<<<<< HEAD
-=======
BT_SCO_STATE_LOOPBACK,
->>>>>>> linux-next/akpm-base
};
enum bt_sco_direct {
@@ -490,12 +487,8 @@ static irqreturn_t mtk_btcvsd_snd_irq_ha
if (bt->rx->state != BT_SCO_STATE_RUNNING &&
bt->rx->state != BT_SCO_STATE_ENDING &&
bt->tx->state != BT_SCO_STATE_RUNNING &&
-<<<<<<< HEAD
- bt->tx->state != BT_SCO_STATE_ENDING) {
-=======
bt->tx->state != BT_SCO_STATE_ENDING &&
bt->tx->state != BT_SCO_STATE_LOOPBACK) {
->>>>>>> linux-next/akpm-base
dev_warn(bt->dev, "%s(), in idle state: rx->state: %d, tx->state: %d\n",
__func__, bt->rx->state, bt->tx->state);
goto irq_handler_exit;
@@ -521,8 +514,6 @@ static irqreturn_t mtk_btcvsd_snd_irq_ha
buf_cnt_tx = btsco_packet_info[packet_type][2];
buf_cnt_rx = btsco_packet_info[packet_type][3];
-<<<<<<< HEAD
-=======
if (bt->tx->state == BT_SCO_STATE_LOOPBACK) {
u8 *src, *dst;
unsigned long connsys_addr_rx, ap_addr_rx;
@@ -559,7 +550,6 @@ static irqreturn_t mtk_btcvsd_snd_irq_ha
bt->tx->rw_cnt++;
}
->>>>>>> linux-next/akpm-base
if (bt->rx->state == BT_SCO_STATE_RUNNING ||
bt->rx->state == BT_SCO_STATE_ENDING) {
if (bt->rx->xrun) {
@@ -1115,8 +1105,6 @@ static int btcvsd_band_set(struct snd_kc
return 0;
}
-<<<<<<< HEAD
-=======
static int btcvsd_loopback_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -1144,7 +1132,6 @@ static int btcvsd_loopback_set(struct sn
return 0;
}
->>>>>>> linux-next/akpm-base
static int btcvsd_tx_mute_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
@@ -1280,11 +1267,8 @@ static int btcvsd_tx_timestamp_get(struc
static const struct snd_kcontrol_new mtk_btcvsd_snd_controls[] = {
SOC_ENUM_EXT("BTCVSD Band", btcvsd_enum[0],
btcvsd_band_get, btcvsd_band_set),
-<<<<<<< HEAD
-=======
SOC_SINGLE_BOOL_EXT("BTCVSD Loopback Switch", 0,
btcvsd_loopback_get, btcvsd_loopback_set),
->>>>>>> linux-next/akpm-base
SOC_SINGLE_BOOL_EXT("BTCVSD Tx Mute Switch", 0,
btcvsd_tx_mute_get, btcvsd_tx_mute_set),
SOC_SINGLE_BOOL_EXT("BTCVSD Tx Irq Received Switch", 0,
--- a/sound/soc/stm/stm32_sai.c~linux-next-git-rejects
+++ a/sound/soc/stm/stm32_sai.c
@@ -114,33 +114,20 @@ static int stm32_sai_set_sync(struct stm
dev_err(&sai_client->pdev->dev,
"SAI sync provider data not found\n");
ret = -EINVAL;
-<<<<<<< HEAD
- goto out_put_dev;
-=======
goto error;
->>>>>>> linux-next/akpm-base
}
/* Configure sync client */
ret = stm32_sai_sync_conf_client(sai_client, synci);
if (ret < 0)
-<<<<<<< HEAD
- goto out_put_dev;
-=======
goto error;
->>>>>>> linux-next/akpm-base
/* Configure sync provider */
ret = stm32_sai_sync_conf_provider(sai_provider, synco);
-<<<<<<< HEAD
-out_put_dev:
- put_device(&pdev->dev);
-=======
error:
put_device(&pdev->dev);
of_node_put(np_provider);
->>>>>>> linux-next/akpm-base
return ret;
}
--- a/sound/soc/stm/stm32_sai_sub.c~linux-next-git-rejects
+++ a/sound/soc/stm/stm32_sai_sub.c
@@ -913,11 +913,7 @@ static int stm32_sai_configure_clock(str
struct snd_pcm_hw_params *params)
{
struct stm32_sai_sub_data *sai = snd_soc_dai_get_drvdata(cpu_dai);
-<<<<<<< HEAD
- int div = 0;
-=======
int div = 0, cr1 = 0;
->>>>>>> linux-next/akpm-base
int sai_clk_rate, mclk_ratio, den;
unsigned int rate = params_rate(params);
@@ -962,14 +958,9 @@ static int stm32_sai_configure_clock(str
} else {
if (sai->mclk_rate) {
mclk_ratio = sai->mclk_rate / rate;
-<<<<<<< HEAD
- if ((mclk_ratio != 512) &&
- (mclk_ratio != 256)) {
-=======
if (mclk_ratio == 512) {
cr1 = SAI_XCR1_OSR;
} else if (mclk_ratio != 256) {
->>>>>>> linux-next/akpm-base
dev_err(cpu_dai->dev,
"Wrong mclk ratio %d\n",
mclk_ratio);
--- a/tools/memory-model/linux-kernel.cat~linux-next-git-rejects
+++ a/tools/memory-model/linux-kernel.cat
@@ -33,11 +33,7 @@ let mb = ([M] ; fencerel(Mb) ; [M]) |
([M] ; po? ; [LKW] ; fencerel(After-spinlock) ; [M]) |
([M] ; po ; [UL] ; (co | po) ; [LKW] ;
fencerel(After-unlock-lock) ; [M])
-<<<<<<< HEAD
-let gp = po ; [Sync-rcu] ; po?
-=======
let gp = po ; [Sync-rcu | Sync-srcu] ; po?
->>>>>>> linux-next/akpm-base
let strong-fence = mb | gp
--- a/tools/testing/selftests/Makefile~linux-next-git-rejects
+++ a/tools/testing/selftests/Makefile
@@ -50,11 +50,7 @@ TARGETS += sysctl
ifneq (1, $(quicktest))
TARGETS += timers
endif
-<<<<<<< HEAD
-TARGETS += tmpfs
-=======
TARGETS += tpm2
->>>>>>> linux-next/akpm-base
TARGETS += user
TARGETS += vm
TARGETS += x86
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
psi-introduce-psi-monitor-fix.patch
psi-introduce-psi-monitor-fix-fix.patch
psi-introduce-psi-monitor-fix-3.patch
mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-fix-fix.patch
mm-add-probe_user_read-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
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
linux-next-git-rejects.patch
