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>
---
arch/arm64/crypto/ghash-ce-core.S | 57 ----------------------------
net/rxrpc/conn_event.c | 4 -
net/rxrpc/rxkad.c | 8 ---
3 files changed, 69 deletions(-)
diff -puN arch/arm64/crypto/ghash-ce-core.S~linux-next-git-rejects arch/arm64/crypto/ghash-ce-core.S
--- a/arch/arm64/crypto/ghash-ce-core.S~linux-next-git-rejects
+++ a/arch/arm64/crypto/ghash-ce-core.S
@@ -398,16 +398,6 @@ ENDPROC(pmull_ghash_update_p8)
.endm
.macro pmull_gcm_do_crypt, enc
-<<<<<<< HEAD
- ld1 {SHASH.2d}, [x4]
- ld1 {XL.2d}, [x1]
- ldr x8, [x5, #8] // load lower counter
-
- load_round_keys w7, x6
-
- movi MASK.16b, #0xe1
- ext SHASH2.16b, SHASH.16b, SHASH.16b, #8
-=======
ld1 {SHASH.2d}, [x4], #16
ld1 {HH.2d}, [x4]
ld1 {XL.2d}, [x1]
@@ -416,28 +406,12 @@ ENDPROC(pmull_ghash_update_p8)
movi MASK.16b, #0xe1
trn1 SHASH2.2d, SHASH.2d, HH.2d
trn2 T1.2d, SHASH.2d, HH.2d
->>>>>>> linux-next/akpm-base
CPU_LE( rev x8, x8 )
shl MASK.2d, MASK.2d, #57
eor SHASH2.16b, SHASH2.16b, T1.16b
.if \enc == 1
ldr x10, [sp]
-<<<<<<< HEAD
- ld1 {KS.16b}, [x10]
- .endif
-
-0: ld1 {CTR.8b}, [x5] // load upper counter
- ld1 {INP.16b}, [x3], #16
- rev x9, x8
- add x8, x8, #1
- sub w0, w0, #1
- ins CTR.d[1], x9 // set lower counter
-
- .if \enc == 1
- eor INP.16b, INP.16b, KS.16b // encrypt input
- st1 {INP.16b}, [x2], #16
-=======
ld1 {KS0.16b-KS1.16b}, [x10]
.endif
@@ -452,7 +426,6 @@ CPU_LE( rev x8, x8 )
.if \enc == 1
eor INP0.16b, INP0.16b, KS0.16b // encrypt input
eor INP1.16b, INP1.16b, KS1.16b
->>>>>>> linux-next/akpm-base
.endif
ld1 {KS0.8b}, [x5] // load upper counter
@@ -462,17 +435,10 @@ CPU_LE( rev x8, x8 )
ins KS0.d[1], x9 // set lower counter
ins KS1.d[1], x11
-<<<<<<< HEAD
- cmp w7, #12
- b.ge 2f // AES-192/256?
-
-1: enc_round CTR, v21
-=======
rev64 T1.16b, INP1.16b
cmp w7, #12
b.ge 2f // AES-192/256?
->>>>>>> linux-next/akpm-base
1: enc_round KS0, v21
ext IN1.16b, T1.16b, T1.16b, #8
@@ -548,20 +514,6 @@ CPU_LE( rev x8, x8 )
eor XL.16b, XL.16b, T2.16b
.if \enc == 0
-<<<<<<< HEAD
- eor INP.16b, INP.16b, KS.16b
- st1 {INP.16b}, [x2], #16
- .endif
-
- cbnz w0, 0b
-
-CPU_LE( rev x8, x8 )
- st1 {XL.2d}, [x1]
- str x8, [x5, #8] // store lower counter
-
- .if \enc == 1
- st1 {KS.16b}, [x10]
-=======
eor INP0.16b, INP0.16b, KS0.16b
eor INP1.16b, INP1.16b, KS1.16b
.endif
@@ -576,19 +528,11 @@ CPU_LE( rev x8, x8 )
.if \enc == 1
st1 {KS0.16b-KS1.16b}, [x10]
->>>>>>> linux-next/akpm-base
.endif
ret
2: b.eq 3f // AES-192?
-<<<<<<< HEAD
- enc_round CTR, v17
- enc_round CTR, v18
-3: enc_round CTR, v19
- enc_round CTR, v20
- b 1b
-=======
enc_round KS0, v17
enc_round KS1, v17
enc_round KS0, v18
@@ -601,7 +545,6 @@ CPU_LE( rev x8, x8 )
4: load_round_keys w7, x6
b 0b
->>>>>>> linux-next/akpm-base
.endm
/*
diff -puN net/rxrpc/conn_event.c~linux-next-git-rejects net/rxrpc/conn_event.c
--- a/net/rxrpc/conn_event.c~linux-next-git-rejects
+++ a/net/rxrpc/conn_event.c
@@ -250,13 +250,9 @@ static int rxrpc_abort_connection(struct
return -EAGAIN;
}
-<<<<<<< HEAD
- conn->params.peer->last_tx_at = ktime_get_seconds();
-=======
trace_rxrpc_tx_packet(conn->debug_id, &whdr, rxrpc_tx_point_conn_abort);
conn->params.peer->last_tx_at = ktime_get_real();
->>>>>>> linux-next/akpm-base
_leave(" = 0");
return 0;
diff -puN net/rxrpc/rxkad.c~linux-next-git-rejects net/rxrpc/rxkad.c
--- a/net/rxrpc/rxkad.c~linux-next-git-rejects
+++ a/net/rxrpc/rxkad.c
@@ -670,13 +670,9 @@ static int rxkad_issue_challenge(struct
return -EAGAIN;
}
-<<<<<<< HEAD
- conn->params.peer->last_tx_at = ktime_get_seconds();
-=======
conn->params.peer->last_tx_at = ktime_get_real();
trace_rxrpc_tx_packet(conn->debug_id, &whdr,
rxrpc_tx_point_rxkad_challenge);
->>>>>>> linux-next/akpm-base
_leave(" = 0");
return 0;
}
@@ -732,12 +728,8 @@ static int rxkad_send_response(struct rx
return -EAGAIN;
}
-<<<<<<< HEAD
- conn->params.peer->last_tx_at = ktime_get_seconds();
-=======
conn->params.peer->last_tx_at = ktime_get_real();
trace_rxrpc_tx_packet(0, &whdr, rxrpc_tx_point_rxkad_response);
->>>>>>> linux-next/akpm-base
_leave(" = 0");
return 0;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
zram-remove-bd_cap_synchronous_io-with-writeback-feature-v2-checkpatch-fixes.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
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
linux-next-git-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
