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/admin-guide/kernel-parameters.txt | 6
Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt | 5
Documentation/index.rst | 19 -
arch/arm64/Kconfig | 7
arch/arm64/mm/mmu.c | 8
arch/m68k/mac/misc.c | 6
arch/mips/Kconfig | 7
arch/nios2/Kconfig | 3
arch/openrisc/Kconfig | 7
arch/s390/kvm/priv.c | 4
arch/x86/include/asm/cpufeatures.h | 5
arch/x86/include/asm/kvm_host.h | 4
arch/x86/include/asm/trace/hyperv.h | 3
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 12
arch/x86/kernel/kvmclock.c | 4
arch/x86/kvm/vmx.c | 146 ----------
drivers/infiniband/core/rdma_core.c | 4
drivers/md/bcache/bcache.h | 4
drivers/md/bcache/bset.c | 24 -
drivers/md/bcache/sysfs.c | 4
drivers/md/bcache/writeback.c | 4
drivers/md/bcache/writeback.h | 4
drivers/nvme/host/rdma.c | 4
drivers/nvme/target/rdma.c | 18 -
fs/btrfs/ctree.h | 4
fs/dax.c | 38 --
fs/file_table.c | 30 --
fs/internal.h | 3
fs/open.c | 4
include/linux/device.h | 3
include/linux/fs.h | 3
include/uapi/linux/kvm.h | 3
security/integrity/ima/ima_main.c | 3
33 files changed, 1 insertion(+), 402 deletions(-)
diff -puN arch/arm64/Kconfig~linux-next-git-rejects arch/arm64/Kconfig
--- a/arch/arm64/Kconfig~linux-next-git-rejects
+++ a/arch/arm64/Kconfig
@@ -280,13 +280,6 @@ config ARCH_SUPPORTS_UPROBES
config ARCH_PROC_KCORE_TEXT
def_bool y
-<<<<<<< HEAD
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
-
-=======
->>>>>>> linux-next/akpm-base
source "arch/arm64/Kconfig.platforms"
menu "Bus support"
diff -puN arch/arm64/mm/mmu.c~linux-next-git-rejects arch/arm64/mm/mmu.c
--- a/arch/arm64/mm/mmu.c~linux-next-git-rejects
+++ a/arch/arm64/mm/mmu.c
@@ -978,11 +978,7 @@ int pmd_clear_huge(pmd_t *pmdp)
return 1;
}
-<<<<<<< HEAD
-int pud_free_pmd_page(pud_t *pud, unsigned long addr)
-=======
int pmd_free_pte_page(pmd_t *pmdp, unsigned long addr)
->>>>>>> linux-next/akpm-base
{
pte_t *table;
pmd_t pmd;
@@ -1002,11 +998,7 @@ int pmd_free_pte_page(pmd_t *pmdp, unsig
return 1;
}
-<<<<<<< HEAD
-int pmd_free_pte_page(pmd_t *pmd, unsigned long addr)
-=======
int pud_free_pmd_page(pud_t *pudp, unsigned long addr)
->>>>>>> linux-next/akpm-base
{
pmd_t *table;
pmd_t *pmdp;
diff -puN arch/m68k/mac/misc.c~linux-next-git-rejects arch/m68k/mac/misc.c
--- a/arch/m68k/mac/misc.c~linux-next-git-rejects
+++ a/arch/m68k/mac/misc.c
@@ -48,7 +48,7 @@ static time64_t cuda_read_time(void)
cuda_poll();
time = (u32)((req.reply[3] << 24) | (req.reply[4] << 16) |
- (req.reply[5] << 8) | req.reply[6]);
+ (rqeq.reply[5] << 8) | req.reply[6]);
return time - RTC_OFFSET;
}
@@ -90,11 +90,7 @@ static void cuda_write_pram(int offset,
}
#endif /* CONFIG_ADB_CUDA */
-<<<<<<< HEAD
-#ifdef CONFIG_ADB_PMU68K
-=======
#ifdef CONFIG_ADB_PMU
->>>>>>> linux-next/akpm-base
static time64_t pmu_read_time(void)
{
struct adb_request req;
diff -puN arch/mips/Kconfig~linux-next-git-rejects arch/mips/Kconfig
--- a/arch/mips/Kconfig~linux-next-git-rejects
+++ a/arch/mips/Kconfig
@@ -2986,13 +2986,6 @@ config PGTABLE_LEVELS
config MIPS_AUTO_PFN_OFFSET
bool
-<<<<<<< HEAD
-
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
-=======
->>>>>>> linux-next/akpm-base
menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
diff -puN arch/nios2/Kconfig~linux-next-git-rejects arch/nios2/Kconfig
--- a/arch/nios2/Kconfig~linux-next-git-rejects
+++ a/arch/nios2/Kconfig
@@ -1,10 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
config NIOS2
def_bool y
-<<<<<<< HEAD
-=======
select ARCH_NO_SWAP
->>>>>>> linux-next/akpm-base
select ARCH_HAS_SYNC_DMA_FOR_CPU
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
select DMA_NONCOHERENT_OPS
diff -puN arch/openrisc/Kconfig~linux-next-git-rejects arch/openrisc/Kconfig
--- a/arch/openrisc/Kconfig~linux-next-git-rejects
+++ a/arch/openrisc/Kconfig
@@ -71,13 +71,6 @@ config STACKTRACE_SUPPORT
config LOCKDEP_SUPPORT
def_bool y
-<<<<<<< HEAD
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
-
-=======
->>>>>>> linux-next/akpm-base
menu "Processor type and features"
choice
diff -puN arch/s390/kvm/priv.c~linux-next-git-rejects arch/s390/kvm/priv.c
--- a/arch/s390/kvm/priv.c~linux-next-git-rejects
+++ a/arch/s390/kvm/priv.c
@@ -985,11 +985,7 @@ static int handle_pfmf(struct kvm_vcpu *
return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
if (vcpu->run->s.regs.gprs[reg1] & PFMF_CF) {
-<<<<<<< HEAD
- if (clear_user((void __user *)vmaddr, PAGE_SIZE))
-=======
if (kvm_clear_guest(vcpu->kvm, start, PAGE_SIZE))
->>>>>>> linux-next/akpm-base
return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
}
diff -puN arch/x86/include/asm/cpufeatures.h~linux-next-git-rejects arch/x86/include/asm/cpufeatures.h
--- a/arch/x86/include/asm/cpufeatures.h~linux-next-git-rejects
+++ a/arch/x86/include/asm/cpufeatures.h
@@ -219,12 +219,7 @@
#define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */
#define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */
#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */
-<<<<<<< HEAD
-#define X86_FEATURE_L1TF_PTEINV ( 7*32+29) /* "" L1TF workaround PTE inversion */
-#define X86_FEATURE_IBRS_ENHANCED ( 7*32+30) /* Enhanced IBRS */
-=======
#define X86_FEATURE_IBRS_ENHANCED ( 7*32+29) /* Enhanced IBRS */
->>>>>>> linux-next/akpm-base
/* Virtualization flags: Linux defined, word 8 */
#define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */
diff -puN arch/x86/include/asm/kvm_host.h~linux-next-git-rejects arch/x86/include/asm/kvm_host.h
--- a/arch/x86/include/asm/kvm_host.h~linux-next-git-rejects
+++ a/arch/x86/include/asm/kvm_host.h
@@ -1462,14 +1462,10 @@ int kvm_cpu_get_interrupt(struct kvm_vcp
void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event);
void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu);
-<<<<<<< HEAD
-u64 kvm_get_arch_capabilities(void);
-=======
int kvm_pv_send_ipi(struct kvm *kvm, unsigned long ipi_bitmap_low,
unsigned long ipi_bitmap_high, int min,
unsigned long icr, int op_64_bit);
->>>>>>> linux-next/akpm-base
void kvm_define_shared_msr(unsigned index, u32 msr);
int kvm_set_shared_msr(unsigned index, u64 val, u64 mask);
diff -puN arch/x86/include/asm/trace/hyperv.h~linux-next-git-rejects arch/x86/include/asm/trace/hyperv.h
--- a/arch/x86/include/asm/trace/hyperv.h~linux-next-git-rejects
+++ a/arch/x86/include/asm/trace/hyperv.h
@@ -43,8 +43,6 @@ TRACE_EVENT(hyperv_send_ipi_mask,
__entry->ncpus, __entry->vector)
);
-<<<<<<< HEAD
-=======
TRACE_EVENT(hyperv_nested_flush_guest_mapping,
TP_PROTO(u64 as, int ret),
TP_ARGS(as, ret),
@@ -59,7 +57,6 @@ TRACE_EVENT(hyperv_nested_flush_guest_ma
TP_printk("address space %llx ret %d", __entry->as, __entry->ret)
);
->>>>>>> linux-next/akpm-base
#endif /* CONFIG_HYPERV */
#undef TRACE_INCLUDE_PATH
diff -puN arch/x86/kernel/cpu/intel_rdt_rdtgroup.c~linux-next-git-rejects arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c~linux-next-git-rejects
+++ a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -1839,20 +1839,8 @@ static int rdt_get_tree(struct fs_contex
}
ret = rdt_pseudo_lock_init();
-<<<<<<< HEAD
- if (ret) {
- dentry = ERR_PTR(ret);
- goto out_mondata;
- }
-
- dentry = kernfs_mount(fs_type, flags, rdt_root,
- RDTGROUP_SUPER_MAGIC, NULL);
- if (IS_ERR(dentry))
- goto out_psl;
-=======
if (ret)
goto out_mondata;
->>>>>>> linux-next/akpm-base
ret = kernfs_get_tree(fc);
if (ret < 0)
diff -puN arch/x86/kernel/kvmclock.c~linux-next-git-rejects arch/x86/kernel/kvmclock.c
--- a/arch/x86/kernel/kvmclock.c~linux-next-git-rejects
+++ a/arch/x86/kernel/kvmclock.c
@@ -27,10 +27,6 @@
#include <linux/sched.h>
#include <linux/sched/clock.h>
#include <linux/mm.h>
-<<<<<<< HEAD
-#include <linux/slab.h>
-=======
->>>>>>> linux-next/akpm-base
#include <asm/hypervisor.h>
#include <asm/mem_encrypt.h>
diff -puN arch/x86/kvm/vmx.c~linux-next-git-rejects arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/vmx.c~linux-next-git-rejects
+++ a/arch/x86/kvm/vmx.c
@@ -189,157 +189,11 @@ module_param(ple_window_max, uint, 0444)
extern const ulong vmx_return;
-<<<<<<< HEAD
-static DEFINE_STATIC_KEY_FALSE(vmx_l1d_should_flush);
-static DEFINE_STATIC_KEY_FALSE(vmx_l1d_flush_cond);
-static DEFINE_MUTEX(vmx_l1d_flush_mutex);
-
-/* Storage for pre module init parameter parsing */
-static enum vmx_l1d_flush_state __read_mostly vmentry_l1d_flush_param = VMENTER_L1D_FLUSH_AUTO;
-
-static const struct {
- const char *option;
- enum vmx_l1d_flush_state cmd;
-} vmentry_l1d_param[] = {
- {"auto", VMENTER_L1D_FLUSH_AUTO},
- {"never", VMENTER_L1D_FLUSH_NEVER},
- {"cond", VMENTER_L1D_FLUSH_COND},
- {"always", VMENTER_L1D_FLUSH_ALWAYS},
-};
-
-#define L1D_CACHE_ORDER 4
-static void *vmx_l1d_flush_pages;
-
-static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state l1tf)
-{
- struct page *page;
- unsigned int i;
-
- if (!enable_ept) {
- l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_EPT_DISABLED;
- return 0;
- }
-
- if (boot_cpu_has(X86_FEATURE_ARCH_CAPABILITIES)) {
- u64 msr;
-
- rdmsrl(MSR_IA32_ARCH_CAPABILITIES, msr);
- if (msr & ARCH_CAP_SKIP_VMENTRY_L1DFLUSH) {
- l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
- return 0;
- }
- }
-
- /* If set to auto use the default l1tf mitigation method */
- if (l1tf == VMENTER_L1D_FLUSH_AUTO) {
- switch (l1tf_mitigation) {
- case L1TF_MITIGATION_OFF:
- l1tf = VMENTER_L1D_FLUSH_NEVER;
- break;
- case L1TF_MITIGATION_FLUSH_NOWARN:
- case L1TF_MITIGATION_FLUSH:
- case L1TF_MITIGATION_FLUSH_NOSMT:
- l1tf = VMENTER_L1D_FLUSH_COND;
- break;
- case L1TF_MITIGATION_FULL:
- case L1TF_MITIGATION_FULL_FORCE:
- l1tf = VMENTER_L1D_FLUSH_ALWAYS;
- break;
- }
- } else if (l1tf_mitigation == L1TF_MITIGATION_FULL_FORCE) {
- l1tf = VMENTER_L1D_FLUSH_ALWAYS;
- }
-
- if (l1tf != VMENTER_L1D_FLUSH_NEVER && !vmx_l1d_flush_pages &&
- !boot_cpu_has(X86_FEATURE_FLUSH_L1D)) {
- page = alloc_pages(GFP_KERNEL, L1D_CACHE_ORDER);
- if (!page)
- return -ENOMEM;
- vmx_l1d_flush_pages = page_address(page);
-
- /*
- * Initialize each page with a different pattern in
- * order to protect against KSM in the nested
- * virtualization case.
- */
- for (i = 0; i < 1u << L1D_CACHE_ORDER; ++i) {
- memset(vmx_l1d_flush_pages + i * PAGE_SIZE, i + 1,
- PAGE_SIZE);
- }
- }
-
- l1tf_vmx_mitigation = l1tf;
-
- if (l1tf != VMENTER_L1D_FLUSH_NEVER)
- static_branch_enable(&vmx_l1d_should_flush);
- else
- static_branch_disable(&vmx_l1d_should_flush);
-
- if (l1tf == VMENTER_L1D_FLUSH_COND)
- static_branch_enable(&vmx_l1d_flush_cond);
- else
- static_branch_disable(&vmx_l1d_flush_cond);
- return 0;
-}
-
-static int vmentry_l1d_flush_parse(const char *s)
-{
- unsigned int i;
-
- if (s) {
- for (i = 0; i < ARRAY_SIZE(vmentry_l1d_param); i++) {
- if (sysfs_streq(s, vmentry_l1d_param[i].option))
- return vmentry_l1d_param[i].cmd;
- }
- }
- return -EINVAL;
-}
-
-static int vmentry_l1d_flush_set(const char *s, const struct kernel_param *kp)
-{
- int l1tf, ret;
-
- if (!boot_cpu_has(X86_BUG_L1TF))
- return 0;
-
- l1tf = vmentry_l1d_flush_parse(s);
- if (l1tf < 0)
- return l1tf;
-
- /*
- * Has vmx_init() run already? If not then this is the pre init
- * parameter parsing. In that case just store the value and let
- * vmx_init() do the proper setup after enable_ept has been
- * established.
- */
- if (l1tf_vmx_mitigation == VMENTER_L1D_FLUSH_AUTO) {
- vmentry_l1d_flush_param = l1tf;
- return 0;
- }
-
- mutex_lock(&vmx_l1d_flush_mutex);
- ret = vmx_setup_l1d_flush(l1tf);
- mutex_unlock(&vmx_l1d_flush_mutex);
- return ret;
-}
-
-static int vmentry_l1d_flush_get(char *s, const struct kernel_param *kp)
-{
- return sprintf(s, "%s\n", vmentry_l1d_param[l1tf_vmx_mitigation].option);
-}
-
-static const struct kernel_param_ops vmentry_l1d_flush_ops = {
- .set = vmentry_l1d_flush_set,
- .get = vmentry_l1d_flush_get,
-};
-module_param_cb(vmentry_l1d_flush, &vmentry_l1d_flush_ops, NULL, 0644);
-=======
enum ept_pointers_status {
EPT_POINTERS_CHECK = 0,
EPT_POINTERS_MATCH = 1,
EPT_POINTERS_MISMATCH = 2
};
->>>>>>> linux-next/akpm-base
struct kvm_vmx {
struct kvm kvm;
diff -puN Documentation/admin-guide/kernel-parameters.txt~linux-next-git-rejects Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/kernel-parameters.txt~linux-next-git-rejects
+++ a/Documentation/admin-guide/kernel-parameters.txt
@@ -2790,15 +2790,9 @@
nosmt [KNL,S390] Disable symmetric multithreading (SMT).
Equivalent to smt=1.
-<<<<<<< HEAD
- [KNL,x86] Disable symmetric multithreading (SMT).
- nosmt=force: Force disable SMT, cannot be undone
- via the sysfs control file.
-=======
nospectre_v1 [PPC] Disable mitigations for Spectre Variant 1 (bounds
check bypass). With this option data leaks are possible
in the system.
->>>>>>> linux-next/akpm-base
nospectre_v2 [X86] Disable all mitigations for the Spectre variant 2
(indirect branch prediction) vulnerability. System may
diff -puN /dev/null /dev/null
diff -puN Documentation/index.rst~linux-next-git-rejects Documentation/index.rst
--- a/Documentation/index.rst~linux-next-git-rejects
+++ a/Documentation/index.rst
@@ -107,25 +107,6 @@ implementation.
Filesystem Documentation
------------------------
-<<<<<<< HEAD
-
-The documentation in this section are provided by specific filesystem
-subprojects.
-
-.. toctree::
- :maxdepth: 2
-
- filesystems/ext4/index
-
-Korean translations
--------------------
-
-.. toctree::
- :maxdepth: 1
-
- translations/ko_KR/index
-=======
->>>>>>> linux-next/akpm-base
The documentation in this section are provided by specific filesystem
subprojects.
diff -puN drivers/infiniband/core/rdma_core.c~linux-next-git-rejects drivers/infiniband/core/rdma_core.c
--- a/drivers/infiniband/core/rdma_core.c~linux-next-git-rejects
+++ a/drivers/infiniband/core/rdma_core.c
@@ -122,12 +122,8 @@ static int uverbs_try_lock_object(struct
* concurrently, setting the counter to zero is enough for releasing
* this lock.
*/
-<<<<<<< HEAD
- if (!exclusive)
-=======
switch (mode) {
case UVERBS_LOOKUP_READ:
->>>>>>> linux-next/akpm-base
return atomic_fetch_add_unless(&uobj->usecnt, 1, -1) == -1 ?
-EBUSY : 0;
case UVERBS_LOOKUP_WRITE:
diff -puN drivers/md/bcache/bcache.h~linux-next-git-rejects drivers/md/bcache/bcache.h
--- a/drivers/md/bcache/bcache.h~linux-next-git-rejects
+++ a/drivers/md/bcache/bcache.h
@@ -519,11 +519,7 @@ struct cache_set {
int caches_loaded;
struct bcache_device **devices;
-<<<<<<< HEAD
- unsigned devices_max_used;
-=======
unsigned int devices_max_used;
->>>>>>> linux-next/akpm-base
atomic_t attached_dev_nr;
struct list_head cached_devs;
uint64_t cached_dev_sectors;
diff -puN drivers/md/bcache/bset.c~linux-next-git-rejects drivers/md/bcache/bset.c
--- a/drivers/md/bcache/bset.c~linux-next-git-rejects
+++ a/drivers/md/bcache/bset.c
@@ -372,11 +372,7 @@ EXPORT_SYMBOL(bch_btree_keys_init);
* return array index next to j when does in-order traverse
* of a binary tree which is stored in a linear array
*/
-<<<<<<< HEAD
-static unsigned inorder_next(unsigned j, unsigned size)
-=======
static unsigned int inorder_next(unsigned int j, unsigned int size)
->>>>>>> linux-next/akpm-base
{
if (j * 2 + 1 < size) {
j = j * 2 + 1;
@@ -393,11 +389,7 @@ static unsigned int inorder_next(unsigne
* return array index previous to j when does in-order traverse
* of a binary tree which is stored in a linear array
*/
-<<<<<<< HEAD
-static unsigned inorder_prev(unsigned j, unsigned size)
-=======
static unsigned int inorder_prev(unsigned int j, unsigned int size)
->>>>>>> linux-next/akpm-base
{
if (j * 2 < size) {
j = j * 2;
@@ -446,11 +438,7 @@ static unsigned int __to_inorder(unsigne
* Return the cacheline index in bset_tree->data, where j is index
* from a linear array which stores the auxiliar binary tree
*/
-<<<<<<< HEAD
-static unsigned to_inorder(unsigned j, struct bset_tree *t)
-=======
static unsigned int to_inorder(unsigned int j, struct bset_tree *t)
->>>>>>> linux-next/akpm-base
{
return __to_inorder(j, t->size, t->extra);
}
@@ -476,11 +464,7 @@ static unsigned int __inorder_to_tree(un
* Return an index from a linear array which stores the auxiliar binary
* tree, j is the cacheline index of t->data.
*/
-<<<<<<< HEAD
-static unsigned inorder_to_tree(unsigned j, struct bset_tree *t)
-=======
static unsigned int inorder_to_tree(unsigned int j, struct bset_tree *t)
->>>>>>> linux-next/akpm-base
{
return __inorder_to_tree(j, t->size, t->extra);
}
@@ -601,11 +585,7 @@ static inline uint64_t shrd128(uint64_t
* See make_bfloat() to check when most significant bit of f->exponent
* is set or not.
*/
-<<<<<<< HEAD
-static inline unsigned bfloat_mantissa(const struct bkey *k,
-=======
static inline unsigned int bfloat_mantissa(const struct bkey *k,
->>>>>>> linux-next/akpm-base
struct bkey_float *f)
{
const uint64_t *p = &k->low - (f->exponent >> 6);
@@ -991,12 +971,8 @@ static struct bset_search_iter bset_sear
* p = 0;
* but a branch instruction is avoided.
*/
-<<<<<<< HEAD
- unsigned p = n << 4;
-=======
unsigned int p = n << 4;
->>>>>>> linux-next/akpm-base
p &= ((int) (p - t->size)) >> 31;
prefetch(&t->tree[p]);
diff -puN drivers/md/bcache/sysfs.c~linux-next-git-rejects drivers/md/bcache/sysfs.c
--- a/drivers/md/bcache/sysfs.c~linux-next-git-rejects
+++ a/drivers/md/bcache/sysfs.c
@@ -150,11 +150,7 @@ SHOW(__bch_cached_dev)
{
struct cached_dev *dc = container_of(kobj, struct cached_dev,
disk.kobj);
-<<<<<<< HEAD
- const char *states[] = { "no cache", "clean", "dirty", "inconsistent" };
-=======
char const *states[] = { "no cache", "clean", "dirty", "inconsistent" };
->>>>>>> linux-next/akpm-base
int wb = dc->writeback_running;
#define var(stat) (dc->stat)
diff -puN drivers/md/bcache/writeback.c~linux-next-git-rejects drivers/md/bcache/writeback.c
--- a/drivers/md/bcache/writeback.c~linux-next-git-rejects
+++ a/drivers/md/bcache/writeback.c
@@ -718,11 +718,7 @@ static int bch_writeback_thread(void *ar
struct sectors_dirty_init {
struct btree_op op;
-<<<<<<< HEAD
- unsigned inode;
-=======
unsigned int inode;
->>>>>>> linux-next/akpm-base
size_t count;
struct bkey start;
};
diff -puN drivers/md/bcache/writeback.h~linux-next-git-rejects drivers/md/bcache/writeback.h
--- a/drivers/md/bcache/writeback.h~linux-next-git-rejects
+++ a/drivers/md/bcache/writeback.h
@@ -28,11 +28,7 @@ static inline uint64_t bcache_dev_sector
return ret;
}
-<<<<<<< HEAD
-static inline unsigned offset_to_stripe(struct bcache_device *d,
-=======
static inline unsigned int offset_to_stripe(struct bcache_device *d,
->>>>>>> linux-next/akpm-base
uint64_t offset)
{
do_div(offset, d->stripe_size);
diff -puN drivers/nvme/host/rdma.c~linux-next-git-rejects drivers/nvme/host/rdma.c
--- a/drivers/nvme/host/rdma.c~linux-next-git-rejects
+++ a/drivers/nvme/host/rdma.c
@@ -378,11 +378,7 @@ nvme_rdma_find_get_device(struct rdma_cm
}
ndev->num_inline_segments = min(NVME_RDMA_MAX_INLINE_SEGMENTS,
-<<<<<<< HEAD
- ndev->dev->attrs.max_sge - 1);
-=======
ndev->dev->attrs.max_send_sge - 1);
->>>>>>> linux-next/akpm-base
list_add(&ndev->entry, &device_list);
out_unlock:
mutex_unlock(&device_list_mutex);
diff -puN drivers/nvme/target/rdma.c~linux-next-git-rejects drivers/nvme/target/rdma.c
--- a/drivers/nvme/target/rdma.c~linux-next-git-rejects
+++ a/drivers/nvme/target/rdma.c
@@ -435,10 +435,6 @@ static void nvmet_rdma_free_rsps(struct
static int nvmet_rdma_post_recv(struct nvmet_rdma_device *ndev,
struct nvmet_rdma_cmd *cmd)
{
-<<<<<<< HEAD
- struct ib_recv_wr *bad_wr;
-=======
->>>>>>> linux-next/akpm-base
int ret;
ib_dma_sync_single_for_device(ndev->device,
@@ -446,15 +442,9 @@ static int nvmet_rdma_post_recv(struct n
DMA_FROM_DEVICE);
if (ndev->srq)
-<<<<<<< HEAD
- ret = ib_post_srq_recv(ndev->srq, &cmd->wr, &bad_wr);
- else
- ret = ib_post_recv(cmd->queue->cm_id->qp, &cmd->wr, &bad_wr);
-=======
ret = ib_post_srq_recv(ndev->srq, &cmd->wr, NULL);
else
ret = ib_post_recv(cmd->queue->cm_id->qp, &cmd->wr, NULL);
->>>>>>> linux-next/akpm-base
if (unlikely(ret))
pr_err("post_recv cmd failed\n");
@@ -562,11 +552,7 @@ static void nvmet_rdma_queue_response(st
rsp->send_sge.addr, rsp->send_sge.length,
DMA_TO_DEVICE);
-<<<<<<< HEAD
- if (unlikely(ib_post_send(cm_id->qp, first_wr, &bad_wr))) {
-=======
if (unlikely(ib_post_send(cm_id->qp, first_wr, NULL))) {
->>>>>>> linux-next/akpm-base
pr_err("sending cmd response failed\n");
nvmet_rdma_release_rsp(rsp);
}
@@ -905,11 +891,7 @@ nvmet_rdma_find_get_device(struct rdma_c
inline_page_count = num_pages(port->inline_data_size);
inline_sge_count = max(cm_id->device->attrs.max_sge_rd,
-<<<<<<< HEAD
- cm_id->device->attrs.max_sge) - 1;
-=======
cm_id->device->attrs.max_recv_sge) - 1;
->>>>>>> linux-next/akpm-base
if (inline_page_count > inline_sge_count) {
pr_warn("inline_data_size %d cannot be supported by device %s. Reducing to %lu.\n",
port->inline_data_size, cm_id->device->name,
diff -puN fs/btrfs/ctree.h~linux-next-git-rejects fs/btrfs/ctree.h
--- a/fs/btrfs/ctree.h~linux-next-git-rejects
+++ a/fs/btrfs/ctree.h
@@ -2784,14 +2784,10 @@ u64 btrfs_account_ro_block_groups_free_s
int btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info,
u64 start, u64 end);
int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,
-<<<<<<< HEAD
- u64 num_bytes, u64 *actual_bytes);
-=======
u64 num_bytes, u64 *actual_bytes,
enum btrfs_clear_op_type clear);
int btrfs_clear_free_space(struct btrfs_root *root,
struct btrfs_ioctl_clear_free_args *args);
->>>>>>> linux-next/akpm-base
int btrfs_force_chunk_alloc(struct btrfs_trans_handle *trans, u64 type);
int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range);
diff -puN fs/dax.c~linux-next-git-rejects fs/dax.c
--- a/fs/dax.c~linux-next-git-rejects
+++ a/fs/dax.c
@@ -566,43 +566,6 @@ struct page *dax_layout_busy_page(struct
*/
unmap_mapping_range(mapping, 0, 0, 1);
-<<<<<<< HEAD
- while (index < end && pagevec_lookup_entries(&pvec, mapping, index,
- min(end - index, (pgoff_t)PAGEVEC_SIZE),
- indices)) {
- for (i = 0; i < pagevec_count(&pvec); i++) {
- struct page *pvec_ent = pvec.pages[i];
- void *entry;
-
- index = indices[i];
- if (index >= end)
- break;
-
- if (WARN_ON_ONCE(
- !radix_tree_exceptional_entry(pvec_ent)))
- continue;
-
- xa_lock_irq(&mapping->i_pages);
- entry = get_unlocked_mapping_entry(mapping, index, NULL);
- if (entry)
- page = dax_busy_page(entry);
- put_unlocked_mapping_entry(mapping, index, entry);
- xa_unlock_irq(&mapping->i_pages);
- if (page)
- break;
- }
-
- /*
- * We don't expect normal struct page entries to exist in our
- * tree, but we keep these pagevec calls so that this code is
- * consistent with the common pattern for handling pagevecs
- * throughout the kernel.
- */
- pagevec_remove_exceptionals(&pvec);
- pagevec_release(&pvec);
- index++;
-
-=======
xas_lock_irq(&xas);
xas_for_each(&xas, entry, ULONG_MAX) {
if (WARN_ON_ONCE(!xa_is_value(entry)))
@@ -612,7 +575,6 @@ struct page *dax_layout_busy_page(struct
if (entry)
page = dax_busy_page(entry);
put_unlocked_entry(&xas, entry);
->>>>>>> linux-next/akpm-base
if (page)
break;
if (++scanned % XA_CHECK_SCHED)
diff -puN fs/file_table.c~linux-next-git-rejects fs/file_table.c
--- a/fs/file_table.c~linux-next-git-rejects
+++ a/fs/file_table.c
@@ -52,12 +52,8 @@ static void file_free_rcu(struct rcu_hea
static inline void file_free(struct file *f)
{
security_file_free(f);
-<<<<<<< HEAD
- percpu_counter_dec(&nr_files);
-=======
if (!(f->f_mode & FMODE_NOACCOUNT))
percpu_counter_dec(&nr_files);
->>>>>>> linux-next/akpm-base
call_rcu(&f->f_u.fu_rcuhead, file_free_rcu);
}
@@ -151,33 +147,10 @@ struct file *alloc_empty_file(int flags,
goto over;
}
-<<<<<<< HEAD
- f = kmem_cache_zalloc(filp_cachep, GFP_KERNEL);
- if (unlikely(!f))
- return ERR_PTR(-ENOMEM);
-
- f->f_cred = get_cred(cred);
- error = security_file_alloc(f);
- if (unlikely(error)) {
- file_free_rcu(&f->f_u.fu_rcuhead);
- return ERR_PTR(error);
- }
-
- atomic_long_set(&f->f_count, 1);
- rwlock_init(&f->f_owner.lock);
- spin_lock_init(&f->f_lock);
- mutex_init(&f->f_pos_lock);
- eventpoll_init_file(f);
- f->f_flags = flags;
- f->f_mode = OPEN_FMODE(flags);
- /* f->f_version: 0 */
- percpu_counter_inc(&nr_files);
-=======
f = __alloc_file(flags, cred);
if (!IS_ERR(f))
percpu_counter_inc(&nr_files);
->>>>>>> linux-next/akpm-base
return f;
over:
@@ -319,11 +292,8 @@ static void __fput(struct file *file)
put_write_access(inode);
__mnt_drop_write(mnt);
}
-<<<<<<< HEAD
-=======
if (unlikely(mode & FMODE_NEED_UNMOUNT))
dissolve_on_fput(mnt);
->>>>>>> linux-next/akpm-base
dput(dentry);
mntput(mnt);
out:
diff -puN fs/internal.h~linux-next-git-rejects fs/internal.h
--- a/fs/internal.h~linux-next-git-rejects
+++ a/fs/internal.h
@@ -102,10 +102,7 @@ extern void chroot_fs_refs(const struct
* file_table.c
*/
extern struct file *alloc_empty_file(int, const struct cred *);
-<<<<<<< HEAD
-=======
extern struct file *alloc_empty_file_noaccount(int, const struct cred *);
->>>>>>> linux-next/akpm-base
/*
* super.c
diff -puN fs/open.c~linux-next-git-rejects fs/open.c
--- a/fs/open.c~linux-next-git-rejects
+++ a/fs/open.c
@@ -877,11 +877,7 @@ EXPORT_SYMBOL(file_path);
int vfs_open(const struct path *path, struct file *file)
{
file->f_path = *path;
-<<<<<<< HEAD
- return do_dentry_open(file, d_backing_inode(dentry), NULL);
-=======
return do_dentry_open(file, d_backing_inode(path->dentry), NULL);
->>>>>>> linux-next/akpm-base
}
struct file *dentry_open(const struct path *path, int flags,
diff -puN include/linux/device.h~linux-next-git-rejects include/linux/device.h
--- a/include/linux/device.h~linux-next-git-rejects
+++ a/include/linux/device.h
@@ -1330,13 +1330,10 @@ struct device_link *device_link_add(stru
struct device *supplier, u32 flags);
void device_link_del(struct device_link *link);
void device_link_remove(void *consumer, struct device *supplier);
-<<<<<<< HEAD
-=======
#ifndef dev_fmt
#define dev_fmt(fmt) fmt
#endif
->>>>>>> linux-next/akpm-base
#ifdef CONFIG_PRINTK
diff -puN include/linux/fs.h~linux-next-git-rejects include/linux/fs.h
--- a/include/linux/fs.h~linux-next-git-rejects
+++ a/include/linux/fs.h
@@ -2483,11 +2483,8 @@ extern struct file *filp_open(const char
extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int, umode_t);
extern struct file * dentry_open(const struct path *, int, const struct cred *);
-<<<<<<< HEAD
-=======
extern struct file * open_with_fake_path(const struct path *, int,
struct inode*, const struct cred *);
->>>>>>> linux-next/akpm-base
static inline struct file *file_clone_open(struct file *file)
{
return dentry_open(&file->f_path, file->f_flags, file->f_cred);
diff -puN include/uapi/linux/kvm.h~linux-next-git-rejects include/uapi/linux/kvm.h
--- a/include/uapi/linux/kvm.h~linux-next-git-rejects
+++ a/include/uapi/linux/kvm.h
@@ -950,11 +950,8 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_HYPERV_EVENTFD 154
#define KVM_CAP_HYPERV_TLBFLUSH 155
#define KVM_CAP_S390_HPAGE_1M 156
-<<<<<<< HEAD
-=======
#define KVM_CAP_NESTED_STATE 157
#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
->>>>>>> linux-next/akpm-base
#ifdef KVM_CAP_IRQ_ROUTING
diff -puN security/integrity/ima/ima_main.c~linux-next-git-rejects security/integrity/ima/ima_main.c
--- a/security/integrity/ima/ima_main.c~linux-next-git-rejects
+++ a/security/integrity/ima/ima_main.c
@@ -491,8 +491,6 @@ int ima_post_read_file(struct file *file
security_task_getsecid(current, &secid);
return process_measurement(file, current_cred(), secid, buf, size,
MAY_READ, func);
-<<<<<<< HEAD
-=======
}
/**
@@ -536,7 +534,6 @@ int ima_load_data(enum kernel_load_data_
break;
}
return 0;
->>>>>>> linux-next/akpm-base
}
static int __init init_ima(void)
diff -puN Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt~linux-next-git-rejects Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
--- a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
@@ -37,11 +37,6 @@ Required properties:
Optional properties:
- reset: : Reference to the reset controller
-<<<<<<< HEAD
- - interrupt-parent: phandle of the interrupt parent to which the external
- GPIO interrupts are forwarded to.
-=======
->>>>>>> linux-next/akpm-base
- st,syscfg: Should be phandle/offset/mask.
-The phandle to the syscon node which includes IRQ mux selection register.
-The offset of the IRQ mux selection register
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-return-erofs-when-filesystem-becomes-read-only-checkpatch-fixes.patch
mm.patch
tools-modifying-page-types-to-include-shared-map-counts-checkpatch-fixes.patch
tools-modifying-page-types-to-include-shared-map-counts-fix-checkpatch-fixes.patch
tools-adding-support-for-idle-page-tracking-to-tool-fix.patch
mpage-add-argument-structure-for-do_mpage_readpage-checkpatch-fixes.patch
mm-drop-vm_bug_on-from-__get_free_pages-fix.patch
mm-list_lruc-fold-__list_lru_count_one-into-its-caller.patch
mm-fadvise-fix-signed-overflow-ubsan-complaint-fix.patch
mm-sparsemem-defer-the-ms-section_mem_map-clearing-fix.patch
mm-sparse-optimize-memmap-allocation-during-sparse_init-checkpatch-fixes.patch
mm-sparse-abstract-sparse-buffer-allocations-fix.patch
mm-sparse-abstract-sparse-buffer-allocations-fix-fix.patch
mm-soft-offline-close-the-race-against-page-allocation-fix.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-checkpatch-fixes.patch
mm-oom-distinguish-blockable-mode-for-mmu-notifiers-fix.patch
mm-zero-out-the-vma-in-vma_init.patch
mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
proc-kcore-hold-lock-during-read-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
fs-epoll-robustify-irq-safety-with-lockdep_assert_irqs_enabled-fix.patch
checkpatch-check-for-if-0-if-1-fix.patch
checkpatch-warn-when-a-patch-doesnt-have-a-description-fix.patch
fs-epoll-simply-config_net_rx_busy_poll-ifdefery-fix.patch
linux-next-rejects.patch
mm-change-return-type-int-to-vm_fault_t-for-fault-handlers-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
