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>
---
kernel/bpf/verifier.c | 9 -------
net/ipv4/tcp.c | 4 ---
sound/soc/generic/simple-card.c | 35 ------------------------------
sound/soc/samsung/i2s.c | 12 ----------
4 files changed, 60 deletions(-)
--- a/kernel/bpf/verifier.c~linux-next-git-rejects
+++ a/kernel/bpf/verifier.c
@@ -1653,10 +1653,7 @@ static int check_sock_access(struct bpf_
struct bpf_reg_state *regs = cur_regs(env);
struct bpf_reg_state *reg = ®s[regno];
struct bpf_insn_access_aux info = {};
-<<<<<<< HEAD
-=======
bool valid;
->>>>>>> linux-next/akpm-base
if (reg->smin_value < 0) {
verbose(env, "R%d min value is negative, either use unsigned index or do a if (index >=0) check.\n",
@@ -1678,11 +1675,6 @@ static int check_sock_access(struct bpf_
valid = false;
}
-<<<<<<< HEAD
- env->insn_aux_data[insn_idx].ctx_field_size = info.ctx_field_size;
-
- return 0;
-=======
if (valid) {
env->insn_aux_data[insn_idx].ctx_field_size =
@@ -1694,7 +1686,6 @@ static int check_sock_access(struct bpf_
regno, reg_type_str[reg->type], off, size);
return -EACCES;
->>>>>>> linux-next/akpm-base
}
static bool __is_pointer_value(bool allow_ptr_leaks,
--- a/net/ipv4/tcp.c~linux-next-git-rejects
+++ a/net/ipv4/tcp.c
@@ -2596,10 +2596,6 @@ int tcp_disconnect(struct sock *sk, int
tp->write_seq += tp->max_window + 2;
if (tp->write_seq == 0)
tp->write_seq = 1;
-<<<<<<< HEAD
- tp->snd_cwnd = 2;
-=======
->>>>>>> linux-next/akpm-base
icsk->icsk_probes_out = 0;
icsk->icsk_rto = TCP_TIMEOUT_INIT;
tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
--- a/sound/soc/generic/simple-card.c~linux-next-git-rejects
+++ a/sound/soc/generic/simple-card.c
@@ -545,40 +545,6 @@ static int simple_parse_of(struct simple
return ret;
/* Single/Muti DAI link(s) & New style of DT node */
-<<<<<<< HEAD
- loop = 1;
- link_idx = 0;
- dai_idx = 0;
- conf_idx = 0;
- node = of_get_child_by_name(top, PREFIX "dai-link");
- if (!node) {
- node = of_node_get(top);
- loop = 0;
- }
-
- do {
- /* DPCM */
- if (of_get_child_count(node) > 2) {
- for_each_child_of_node(node, np) {
- codec = of_get_child_by_name(node,
- loop ? "codec" :
- PREFIX "codec");
- if (!codec)
- return -ENODEV;
-
- is_fe = (np != codec);
-
- ret = asoc_simple_card_dai_link_of_dpcm(
- top, node, np, codec, priv,
- &dai_idx, link_idx++, &conf_idx,
- is_fe, !loop);
- }
- } else {
- ret = asoc_simple_card_dai_link_of(
- top, node, priv,
- &dai_idx, link_idx++, !loop);
- }
-=======
memset(&li, 0, sizeof(li));
for (li.cpu = 1; li.cpu >= 0; li.cpu--) {
/*
@@ -596,7 +562,6 @@ static int simple_parse_of(struct simple
ret = simple_for_each_link(priv, &li,
simple_dai_link_of,
simple_dai_link_of_dpcm);
->>>>>>> linux-next/akpm-base
if (ret < 0)
return ret;
}
--- a/sound/soc/samsung/i2s.c~linux-next-git-rejects
+++ a/sound/soc/samsung/i2s.c
@@ -688,12 +688,7 @@ static int i2s_set_fmt(struct snd_soc_da
* CLK_I2S_RCLK_SRC clock is not exposed so we ensure any
* clock configuration assigned in DT is not overwritten.
*/
-<<<<<<< HEAD
- if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL &&
- other->clk_data.clks == NULL)
-=======
if (priv->rclk_srcrate == 0 && priv->clk_data.clks == NULL)
->>>>>>> linux-next/akpm-base
i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0,
0, SND_SOC_CLOCK_IN);
break;
@@ -817,14 +812,7 @@ static int i2s_hw_params(struct snd_pcm_
i2s->frmclk = params_rate(params);
-<<<<<<< HEAD
- rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];
- if (!rclksrc || IS_ERR(rclksrc))
- rclksrc = other->clk_table[CLK_I2S_RCLK_SRC];
-
-=======
rclksrc = priv->clk_table[CLK_I2S_RCLK_SRC];
->>>>>>> linux-next/akpm-base
if (rclksrc && !IS_ERR(rclksrc))
priv->rclk_srcrate = clk_get_rate(rclksrc);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
revert-initramfs-cleanup-incomplete-rootfs.patch
mm-handle-lru_add_drain_all-for-up-properly-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slub-introduce-slab_warn_on_error-fix.patch
mm-page_allocc-memory_hotplug-free-pages-as-higher-order-v11-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
mm-reuse-only-pte-mapped-ksm-page-in-do_wp_page-fix.patch
mm-swap-check-if-swap-backing-device-is-congested-or-not-fix.patch
psi-introduce-psi-monitor-fix.patch
psi-introduce-psi-monitor-fix-fix.patch
psi-introduce-psi-monitor-fix-3.patch
mm-proportional-memorylowmin-reclaim-checkpatch-fixes.patch
mm-oom-remove-prefer-children-over-parent-heuristic-checkpatch-fixes.patch
mm-hmm-improve-driver-api-to-work-and-wait-over-a-range-fix-fix.patch
mm-add-probe_user_read-fix.patch
mm-memcontrol-expose-thp-events-on-a-per-memcg-basis-fix.patch
mm-maintain-randomization-of-page-free-lists-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
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-refactor-readahead-defines-in-mmh-fix.patch
treewide-add-checks-for-the-return-value-of-memblock_alloc-fix-3-fix.patch
memblock-update-comments-and-kernel-doc-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.patch
