From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kent Overstreet <kent.overstreet@gmail•com>,
Xin Long <lucien.xin@gmail•com>
Subject: linux-next: manual merge of the akpm-current tree with the net tree
Date: Tue, 5 Feb 2019 16:25:12 +1100 [thread overview]
Message-ID: <20190205162512.696c2c3b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 790 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/sctp/stream.c
between commit:
cfe4bd7a257f ("sctp: check and update stream->out_curr when allocating stream_out")
from the net tree and commit:
2bd3fbb3ff23 ("sctp: convert to genradix")
from the akpm-current tree.
I fixed it up (the latter removed the code modified by the former, so I
did that) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-02-05 5:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-05 5:25 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-28 8:09 linux-next: manual merge of the akpm-current tree with the net tree Stephen Rothwell
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=20190205162512.696c2c3b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=kent.overstreet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucien.xin@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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