mptcp.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Geliang Tang <geliangtang@gmail.com>
To: mptcp@lists.linux.dev
Subject: Re: [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other"
Date: Tue, 13 Jul 2021 15:30:51 +0800	[thread overview]
Message-ID: <CA+WQbwsAbBmWYAbaWfHiM=q_OkU5jrFa=40wueKn6=GQ+WOppQ@mail.gmail.com> (raw)
In-Reply-To: <756dcceaa255c54b7bd195c719ede1f7ae791eb3.1626158100.git.geliangtang@gmail.com>

This squash-to patch will conflict with "mptcp: build
ADD_ADDR/echo-ADD_ADDR option according pm.add_signal":

Auto-merging net/mptcp/pm.c
CONFLICT (content): Merge conflict in net/mptcp/pm.c
error: could not apply 205974fb3505... mptcp: build
ADD_ADDR/echo-ADD_ADDR option according pm.add_signal

Please fix it like this:

 <<<<<<< HEAD
         *saddr = msk->pm.local;
         if (*echo)
                 add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO);
 =======
         if ((msk->pm.addr_signal & BIT(MPTCP_ADD_ADDR_ECHO)))
                 WRITE_ONCE(msk->pm.addr_signal, msk->pm.addr_signal &
~BIT(MPTCP_ADD_ADDR_ECHO));
 >>>>>>> 205974fb3505 (mptcp: build ADD_ADDR/echo-ADD_ADDR option
according pm.add_signal)
         else
                 add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_SIGNAL);

->

         *saddr = msk->pm.local;
         if (*echo)
                 add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO);
         else
                 add_addr = msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_SIGNAL);

      parent reply	other threads:[~2021-07-13  7:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-13  6:44 [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other" Geliang Tang
2021-07-13  6:44 ` [MPTCP][PATCH v2 mptcp-next] Squash to "mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal" Geliang Tang
2021-07-13  7:32   ` Geliang Tang
2021-07-13 20:39     ` Mat Martineau
2021-07-15  3:17       ` Geliang Tang
2021-07-13 10:30   ` Yonglong Li
2021-07-13  6:44 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT" Geliang Tang
2021-07-13 10:30   ` Yonglong Li
2021-07-14  3:10     ` Geliang Tang
2021-07-14  9:49       ` Yonglong Li
2021-07-15  3:45         ` Geliang Tang
2021-07-15  6:13           ` Yonglong Li
2021-07-13  7:30 ` Geliang Tang [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CA+WQbwsAbBmWYAbaWfHiM=q_OkU5jrFa=40wueKn6=GQ+WOppQ@mail.gmail.com' \
    --to=geliangtang@gmail.com \
    --cc=mptcp@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).