The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
sound/firewire/amdtp-am824.c | 4 ----
1 file changed, 4 deletions(-)
--- a/sound/firewire/amdtp-am824.c~linux-next-git-rejects
+++ a/sound/firewire/amdtp-am824.c
@@ -320,11 +320,7 @@ static void read_midi_messages(struct am
u8 *b;
for (f = 0; f < frames; f++) {
-<<<<<<< HEAD
- port = (8 - s->tx_first_dbc + s->data_block_counter + f) % 8;
-=======
port = (8 - s->ctx_data.tx.first_dbc + s->data_block_counter + f) % 8;
->>>>>>> linux-next/akpm-base
b = (u8 *)&buffer[p->midi_position];
len = b[0] - 0x80;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch
ocfs2-add-locking-filter-debugfs-file-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
mm-gup-speed-up-check_and_migrate_cma_pages-on-huge-page-fix.patch
mm-vmscanc-add-checks-for-incorrect-handling-of-current-reclaim_state.patch
proc-use-down_read_killable-mmap_sem-for-proc-pid-map_files-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
mm-thp-make-transhuge_vma_suitable-available-for-anonymous-thp-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
rbtree-avoid-generating-code-twice-for-the-cached-versions-checkpatch-fixes.patch
coda-add-hinting-support-for-partial-file-caching-fix.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
resource-fix-locking-in-find_next_iomem_res-fix.patch
linux-next-rejects.patch
diff-sucks.patch
mm-section-numbers-use-the-type-unsigned-long-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-2-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix-4.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
