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>
---
drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 3
drivers/net/ethernet/cavium/Kconfig | 4 -
net/ipv4/tcp_ipv4.c | 4 -
net/sched/act_csum.c | 5 -
net/sched/act_tunnel_key.c | 5 -
sound/core/rawmidi.c | 47 ---------------
6 files changed, 68 deletions(-)
diff -puN drivers/net/ethernet/aquantia/atlantic/aq_hw.h~linux-next-git-rejects drivers/net/ethernet/aquantia/atlantic/aq_hw.h
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h~linux-next-git-rejects
+++ a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -102,12 +102,9 @@ struct aq_stats_s {
#define AQ_HW_MULTICAST_ADDRESS_MAX 32U
-<<<<<<< HEAD
-=======
#define AQ_HW_TXD_MULTIPLE 8U
#define AQ_HW_RXD_MULTIPLE 8U
->>>>>>> linux-next/akpm-base
struct aq_hw_s {
atomic_t flags;
u8 rbl_enabled:1;
diff -puN drivers/net/ethernet/cavium/Kconfig~linux-next-git-rejects drivers/net/ethernet/cavium/Kconfig
--- a/drivers/net/ethernet/cavium/Kconfig~linux-next-git-rejects
+++ a/drivers/net/ethernet/cavium/Kconfig
@@ -52,12 +52,8 @@ config THUNDER_NIC_RGX
config CAVIUM_PTP
tristate "Cavium PTP coprocessor as PTP clock"
-<<<<<<< HEAD
- depends on 64BIT && PCI
-=======
depends on 64BIT
depends on PCI
->>>>>>> linux-next/akpm-base
imply PTP_1588_CLOCK
default y
---help---
diff -puN net/ipv4/tcp_ipv4.c~linux-next-git-rejects net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_ipv4.c~linux-next-git-rejects
+++ a/net/ipv4/tcp_ipv4.c
@@ -155,12 +155,8 @@ int tcp_twsk_unique(struct sock *sk, str
and use initial timestamp retrieved from peer table.
*/
if (tcptw->tw_ts_recent_stamp &&
-<<<<<<< HEAD
- (!twp || (reuse && get_seconds() - tcptw->tw_ts_recent_stamp > 1))) {
-=======
(!twp || (reuse && time_after32(ktime_get_seconds(),
tcptw->tw_ts_recent_stamp)))) {
->>>>>>> linux-next/akpm-base
/* In case of repair and re-using TIME-WAIT sockets we still
* want to be sure that it is safe as above but honor the
* sequence numbers and time stamps set as part of the repair
diff -puN net/sched/act_csum.c~linux-next-git-rejects net/sched/act_csum.c
--- a/net/sched/act_csum.c~linux-next-git-rejects
+++ a/net/sched/act_csum.c
@@ -603,13 +603,8 @@ static int tcf_csum_dump(struct sk_buff
struct tcf_csum_params *params;
struct tc_csum opt = {
.index = p->tcf_index,
-<<<<<<< HEAD
- .refcnt = p->tcf_refcnt - ref,
- .bindcnt = p->tcf_bindcnt - bind,
-=======
.refcnt = refcount_read(&p->tcf_refcnt) - ref,
.bindcnt = atomic_read(&p->tcf_bindcnt) - bind,
->>>>>>> linux-next/akpm-base
.action = p->tcf_action,
};
struct tcf_t t;
diff -puN net/sched/act_tunnel_key.c~linux-next-git-rejects net/sched/act_tunnel_key.c
--- a/net/sched/act_tunnel_key.c~linux-next-git-rejects
+++ a/net/sched/act_tunnel_key.c
@@ -477,13 +477,8 @@ static int tunnel_key_dump(struct sk_buf
struct tcf_tunnel_key_params *params;
struct tc_tunnel_key opt = {
.index = t->tcf_index,
-<<<<<<< HEAD
- .refcnt = t->tcf_refcnt - ref,
- .bindcnt = t->tcf_bindcnt - bind,
-=======
.refcnt = refcount_read(&t->tcf_refcnt) - ref,
.bindcnt = atomic_read(&t->tcf_bindcnt) - bind,
->>>>>>> linux-next/akpm-base
.action = t->tcf_action,
};
struct tcf_t tm;
diff -puN sound/core/rawmidi.c~linux-next-git-rejects sound/core/rawmidi.c
--- a/sound/core/rawmidi.c~linux-next-git-rejects
+++ a/sound/core/rawmidi.c
@@ -649,42 +649,22 @@ static int resize_runtime_buffer(struct
bool is_input)
{
char *newbuf, *oldbuf;
-<<<<<<< HEAD
- struct snd_rawmidi_runtime *runtime = substream->runtime;
-
- if (substream->append && substream->use_count > 1)
- return -EBUSY;
- snd_rawmidi_drain_output(substream);
- if (params->buffer_size < 32 || params->buffer_size > 1024L * 1024L) {
-=======
if (params->buffer_size < 32 || params->buffer_size > 1024L * 1024L)
->>>>>>> linux-next/akpm-base
return -EINVAL;
if (params->avail_min < 1 || params->avail_min > params->buffer_size)
return -EINVAL;
if (params->buffer_size != runtime->buffer_size) {
-<<<<<<< HEAD
- newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
-=======
newbuf = kvmalloc(params->buffer_size, GFP_KERNEL);
->>>>>>> linux-next/akpm-base
if (!newbuf)
return -ENOMEM;
spin_lock_irq(&runtime->lock);
oldbuf = runtime->buffer;
runtime->buffer = newbuf;
runtime->buffer_size = params->buffer_size;
-<<<<<<< HEAD
- runtime->avail = runtime->buffer_size;
- runtime->appl_ptr = runtime->hw_ptr = 0;
- spin_unlock_irq(&runtime->lock);
- kfree(oldbuf);
-=======
__reset_runtime_ptrs(runtime, is_input);
spin_unlock_irq(&runtime->lock);
kvfree(oldbuf);
->>>>>>> linux-next/akpm-base
}
runtime->avail_min = params->avail_min;
return 0;
@@ -704,35 +684,8 @@ EXPORT_SYMBOL(snd_rawmidi_output_params)
int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream,
struct snd_rawmidi_params *params)
{
-<<<<<<< HEAD
- char *newbuf, *oldbuf;
- struct snd_rawmidi_runtime *runtime = substream->runtime;
-
- snd_rawmidi_drain_input(substream);
- if (params->buffer_size < 32 || params->buffer_size > 1024L * 1024L) {
- return -EINVAL;
- }
- if (params->avail_min < 1 || params->avail_min > params->buffer_size) {
- return -EINVAL;
- }
- if (params->buffer_size != runtime->buffer_size) {
- newbuf = kmalloc(params->buffer_size, GFP_KERNEL);
- if (!newbuf)
- return -ENOMEM;
- spin_lock_irq(&runtime->lock);
- oldbuf = runtime->buffer;
- runtime->buffer = newbuf;
- runtime->buffer_size = params->buffer_size;
- runtime->appl_ptr = runtime->hw_ptr = 0;
- spin_unlock_irq(&runtime->lock);
- kfree(oldbuf);
- }
- runtime->avail_min = params->avail_min;
- return 0;
-=======
snd_rawmidi_drain_input(substream);
return resize_runtime_buffer(substream->runtime, params, true);
->>>>>>> linux-next/akpm-base
}
EXPORT_SYMBOL(snd_rawmidi_input_params);
_
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
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
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-kcore-dont-grab-lock-for-kclist_add-fix.patch
kernel-hung_taskc-allow-to-set-checking-interval-separately-from-timeout-fix.patch
lib-test_crc-add-test-cases-for-crc-calculation-fix.patch
hfs-hfsplus-follow-macos-time-behavior-checkpatch-fixes.patch
linux-next-rejects.patch
fs-fix-double-prealloc_shrinker-in-sget_fc-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
