From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sven Eckelmann <sven@narfation.org>,
Antonio Quartulli <antonio@meshcoding.com>,
Marek Lindner <mareklindner@neomailbox.ch>,
Ken Helias <kenhelias@firemail.de>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Thu, 7 Aug 2014 16:51:36 +1000 [thread overview]
Message-ID: <20140807165136.60cbaf44@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1414 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
net/batman-adv/fragmentation.c between commit d9124268d84a
("batman-adv: Fix out-of-order fragmentation support") from Linus' tree
and commit ffe04af00b27 ("list: fix order of arguments for
hlist_add_after(_rcu)") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/batman-adv/fragmentation.c
index 022d18ab27a6,16dd40910c65..000000000000
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@@ -181,14 -180,11 +181,14 @@@ static bool batadv_frag_insert_packet(s
ret = true;
goto out;
}
+
+ /* store current entry because it could be the last in list */
+ frag_entry_last = frag_entry_curr;
}
- /* Reached the end of the list, so insert after 'frag_entry_curr'. */
- if (likely(frag_entry_curr)) {
- hlist_add_behind(&frag_entry_new->list, &frag_entry_curr->list);
+ /* Reached the end of the list, so insert after 'frag_entry_last'. */
+ if (likely(frag_entry_last)) {
- hlist_add_after(&frag_entry_last->list, &frag_entry_new->list);
++ hlist_add_behind(&frag_entry_new->list, &frag_entry_last->list);
chain->size += skb->len - hdr_size;
chain->timestamp = jiffies;
ret = true;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-08-07 6:51 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-07 6:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-11 3:35 linux-next: manual merge of the akpm-current tree with Linus' tree Stephen Rothwell
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08 9:24 Stephen Rothwell
2020-09-08 9:17 Stephen Rothwell
2020-06-03 8:07 Stephen Rothwell
2020-06-03 7:53 Stephen Rothwell
2019-02-18 6:51 Stephen Rothwell
2019-02-20 1:00 ` Stephen Rothwell
2019-01-11 2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07 2:16 Stephen Rothwell
2018-08-15 8:05 Stephen Rothwell
2018-07-23 8:00 Stephen Rothwell
2018-06-14 1:43 Stephen Rothwell
2018-06-14 1:36 Stephen Rothwell
2018-03-16 5:56 Stephen Rothwell
2017-11-02 8:10 Stephen Rothwell
2017-11-02 7:37 Stephen Rothwell
2017-05-08 3:48 Stephen Rothwell
2017-04-24 7:25 Stephen Rothwell
2017-04-24 9:11 ` Mel Gorman
2016-12-05 5:38 Stephen Rothwell
2016-12-05 5:56 ` Michal Hocko
2016-12-05 6:08 ` Stephen Rothwell
2016-01-18 3:22 Stephen Rothwell
2015-12-18 5:09 Stephen Rothwell
2015-10-06 5:46 Stephen Rothwell
2015-07-20 3:54 Stephen Rothwell
2015-05-19 6:40 Stephen Rothwell
2014-08-08 5:46 Stephen Rothwell
2014-05-29 9:08 Stephen Rothwell
2014-04-29 4:47 Stephen Rothwell
2014-04-24 5:38 Stephen Rothwell
2014-04-07 4:18 Stephen Rothwell
2014-01-29 3:46 Stephen Rothwell
2013-12-23 3:58 Stephen Rothwell
2013-12-03 1:52 Stephen Rothwell
2013-12-03 7:16 ` Richard Weinberger
2013-12-03 7:31 ` Andrew Morton
2013-12-03 7:36 ` Richard Weinberger
2013-02-02 12:55 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=20140807165136.60cbaf44@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=antonio@meshcoding.com \
--cc=kenhelias@firemail.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mareklindner@neomailbox.ch \
--cc=sven@narfation.org \
/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).