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>
---
Makefile | 4 ---
arch/x86/mm/pageattr.c | 42 ----------------------------------
drivers/gpio/gpiolib-acpi.c | 13 ----------
fs/ubifs/Kconfig | 14 -----------
4 files changed, 73 deletions(-)
--- a/arch/x86/mm/pageattr.c~linux-next-git-rejects
+++ a/arch/x86/mm/pageattr.c
@@ -307,18 +307,6 @@ static void cpa_flush_all(unsigned long
on_each_cpu(__cpa_flush_all, (void *) cache, 1);
}
-<<<<<<< HEAD
-static bool __inv_flush_all(int cache)
-{
- BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
-
- if (cache && !static_cpu_has(X86_FEATURE_CLFLUSH)) {
- cpa_flush_all(cache);
- return true;
- }
-
- return false;
-=======
void __cpa_flush_tlb(void *data)
{
struct cpa_data *cpa = data;
@@ -326,7 +314,6 @@ void __cpa_flush_tlb(void *data)
for (i = 0; i < cpa->numpages; i++)
__flush_tlb_one_kernel(__cpa_addr(cpa, i));
->>>>>>> linux-next/akpm-base
}
static void cpa_flush(struct cpa_data *data, int cache)
@@ -334,28 +321,7 @@ static void cpa_flush(struct cpa_data *d
struct cpa_data *cpa = data;
unsigned int i;
-<<<<<<< HEAD
- WARN_ON(PAGE_ALIGN(start) != start);
-
- if (__inv_flush_all(cache))
- return;
-
- flush_tlb_kernel_range(start, start + PAGE_SIZE * numpages);
-
- if (!cache)
- return;
-
- /*
- * We only need to flush on one CPU,
- * clflush is a MESI-coherent instruction that
- * will cause all other CPUs to flush the same
- * cachelines:
- */
- for (i = 0, addr = start; i < numpages; i++, addr += PAGE_SIZE) {
- pte_t *pte = lookup_address(addr, &level);
-=======
BUG_ON(irqs_disabled() && !early_boot_irqs_disabled);
->>>>>>> linux-next/akpm-base
if (cache && !static_cpu_has(X86_FEATURE_CLFLUSH)) {
cpa_flush_all(cache);
@@ -367,14 +333,6 @@ static void cpa_flush(struct cpa_data *d
else
flush_tlb_all();
-<<<<<<< HEAD
- if (__inv_flush_all(cache))
- return;
-
- flush_tlb_all();
-
-=======
->>>>>>> linux-next/akpm-base
if (!cache)
return;
--- a/drivers/gpio/gpiolib-acpi.c~linux-next-git-rejects
+++ a/drivers/gpio/gpiolib-acpi.c
@@ -361,22 +361,9 @@ void acpi_gpiochip_free_interrupts(struc
if (event->irq_is_wake)
disable_irq_wake(event->irq);
-<<<<<<< HEAD
- if (event->irq_requested) {
- if (event->irq_is_wake)
- disable_irq_wake(event->irq);
-
- free_irq(event->irq, event);
- }
-
- desc = event->desc;
- if (WARN_ON(IS_ERR(desc)))
- continue;
-=======
free_irq(event->irq, event);
}
->>>>>>> linux-next/akpm-base
gpiochip_unlock_as_irq(chip, event->pin);
gpiochip_free_own_desc(event->desc);
list_del(&event->node);
--- a/fs/ubifs/Kconfig~linux-next-git-rejects
+++ a/fs/ubifs/Kconfig
@@ -62,20 +62,6 @@ config UBIFS_FS_XATTR
If unsure, say Y.
-<<<<<<< HEAD
-config UBIFS_FS_ENCRYPTION
- bool "UBIFS Encryption"
- depends on UBIFS_FS_XATTR && BLOCK
- select FS_ENCRYPTION
- default n
- help
- Enable encryption of UBIFS files and directories. This
- feature is similar to ecryptfs, but it is more memory
- efficient since it avoids caching the encrypted and
- decrypted pages in the page cache.
-
-=======
->>>>>>> linux-next/akpm-base
config UBIFS_FS_SECURITY
bool "UBIFS Security Labels"
depends on UBIFS_FS_XATTR
--- a/Makefile~linux-next-git-rejects
+++ a/Makefile
@@ -1104,11 +1104,7 @@ prepare2: prepare3 outputmakefile asm-ge
prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h
$(cmd_crmodverdir)
-<<<<<<< HEAD
-archprepare: archheaders archscripts prepare1 scripts_basic
-=======
archprepare: archheaders archscripts prepare1 scripts
->>>>>>> linux-next/akpm-base
prepare0: archprepare
$(Q)$(MAKE) $(build)=scripts/mod
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slab-remove-unnecessary-unlikely-fix.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch
mm-lower-the-printk-loglevel-for-__dump_page-messages-fix-fix.patch
mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch
mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch
mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch
mm-page_alloc-free-order-0-pages-through-pcp-in-page_frag_free-fix.patch
mm-dont-break-integrity-writeback-on-writepage-error-fix.patch
mm-use-common-iterator-for-deferred_init_pages-and-deferred_free_pages-fix.patch
mm-kmemleak-little-optimization-while-scanning-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-callback-fix-fix.patch
mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-v2-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
mm-memory_hotplug-deobfuscate-migration-part-of-offlining-fix.patch
mm-page_alloc-enable-pcpu_drain-with-zone-capability-fix.patch
mm-migrate-provide-buffer_migrate_page_norefs-fix.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
fs-epoll-deal-with-wait_queue-only-once-fix.patch
autofs-improve-ioctl-sbi-checks-fix.patch
exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-treewide-remove-unused-address-argument-from-pte_alloc-functions-v2-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
fs-remove-caller-signal_pending-branch-predictions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
