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/devicetree/bindings/spi/spi-uniphier.txt | 6 ------
1 file changed, 6 deletions(-)
--- a/Documentation/devicetree/bindings/spi/spi-uniphier.txt~linux-next-git-rejects
+++ a/Documentation/devicetree/bindings/spi/spi-uniphier.txt
@@ -5,11 +5,8 @@ UniPhier SoCs have SCSSI which supports
Required properties:
- compatible: should be "socionext,uniphier-scssi"
- reg: address and length of the spi master registers
-<<<<<<< HEAD
-=======
- #address-cells: must be <1>, see spi-bus.txt
- #size-cells: must be <0>, see spi-bus.txt
->>>>>>> linux-next/akpm-base
- interrupts: a single interrupt specifier
- pinctrl-names: should be "default"
- pinctrl-0: pin control state for the default mode
@@ -21,11 +18,8 @@ Example:
spi0: spi@54006000 {
compatible = "socionext,uniphier-scssi";
reg = <0x54006000 0x100>;
-<<<<<<< HEAD
-=======
#address-cells = <1>;
#size-cells = <0>;
->>>>>>> linux-next/akpm-base
interrupts = <0 39 4>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_spi0>;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-cleancache-fix-corruption-on-missed-inode-invalidation-fix.patch
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-slub-improve-performance-by-skipping-checked-node-in-get_any_partial-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-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
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
initramfs-clean-old-path-before-creating-a-hardlink-fix.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
