From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, ordex@autistici.org,
lindner_marek@yahoo.de
Subject: Re: linux-next: manual merge of the net tree with the net-current tree
Date: Wed, 28 Sep 2011 01:36:52 -0400 (EDT) [thread overview]
Message-ID: <20110928.013652.1712671417837562954.davem@davemloft.net> (raw)
In-Reply-To: <20110928125428.70d5cf10ea59f729135d5dff@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Sep 2011 12:54:28 +1000
> Today's linux-next merge of the net tree got a conflict in
> net/batman-adv/soft-interface.c between commit 8b267b312df9 ("batman-adv:
> do_bcast has to be true for broadcast packets only") from the net-current
> tree and commit 3d393e473210 ("batman-adv: implement AP-isolation on the
> sender side") from the net tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Yep, I'll do a merge soon to fix this up for good, thanks Stephen!
next prev parent reply other threads:[~2011-09-28 5:39 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-28 2:54 linux-next: manual merge of the net tree with the net-current tree Stephen Rothwell
2011-09-28 2:54 ` Stephen Rothwell
2011-09-28 5:36 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-06-20 2:56 Stephen Rothwell
2011-06-20 2:56 ` Stephen Rothwell
2011-06-20 3:39 ` Simon Horman
2011-06-20 4:26 ` David Miller
2011-05-17 2:01 Stephen Rothwell
2011-05-17 2:01 ` Stephen Rothwell
2011-05-10 1:49 Stephen Rothwell
2011-05-10 1:49 ` Stephen Rothwell
2011-05-10 11:55 ` Sathya.Perla
2011-05-10 11:55 ` Sathya.Perla
2011-05-03 3:15 Stephen Rothwell
2011-05-03 3:15 ` Stephen Rothwell
2011-05-03 3:42 ` David Miller
2011-05-03 4:21 ` Stephen Rothwell
2011-04-19 3:16 Stephen Rothwell
2011-04-19 3:16 ` Stephen Rothwell
2011-04-19 7:41 ` David Miller
2011-04-07 1:39 Stephen Rothwell
2011-04-07 1:39 ` Stephen Rothwell
2011-04-07 20:48 ` David Miller
2011-03-08 3:09 Stephen Rothwell
2011-03-08 3:09 ` Stephen Rothwell
2011-03-08 9:44 ` Dmitry Kravkov
2011-03-09 0:11 ` Stephen Rothwell
2011-03-03 2:40 Stephen Rothwell
2011-03-03 2:40 ` Stephen Rothwell
2011-02-18 1:20 Stephen Rothwell
2011-02-18 1:20 ` Stephen Rothwell
2011-02-09 0:56 Stephen Rothwell
2011-02-09 0:56 ` Stephen Rothwell
2011-02-09 1:06 ` David Miller
2010-12-15 0:45 Stephen Rothwell
2010-12-15 0:45 ` Stephen Rothwell
2010-11-19 0:17 Stephen Rothwell
2010-11-19 0:17 ` Stephen Rothwell
2010-11-19 21:14 ` David Miller
2010-11-19 0:17 Stephen Rothwell
2010-11-19 0:17 ` Stephen Rothwell
2010-11-19 21:11 ` David Miller
2010-10-07 1:31 Stephen Rothwell
2010-10-07 1:31 ` Stephen Rothwell
2010-10-07 2:35 ` David Miller
2010-10-01 2:48 Stephen Rothwell
2010-10-01 2:48 ` Stephen Rothwell
2010-10-01 2:48 Stephen Rothwell
2010-10-01 2:48 ` Stephen Rothwell
2010-10-01 3:27 ` Jerry Chu
2010-10-05 5:47 ` David Miller
2010-09-23 2:14 Stephen Rothwell
2010-09-23 2:14 ` Stephen Rothwell
2010-08-02 1:04 Stephen Rothwell
2010-08-02 1:04 ` Stephen Rothwell
2010-08-02 1:04 ` Stephen Rothwell
2010-07-29 1:19 Stephen Rothwell
2010-07-29 1:19 ` Stephen Rothwell
2010-07-29 1:26 ` Jeff Kirsher
2010-07-29 1:26 ` Jeff Kirsher
2010-07-29 1:05 Stephen Rothwell
2010-07-29 1:05 ` Stephen Rothwell
2010-07-29 5:51 ` Jiri Pirko
2010-07-20 2:20 Stephen Rothwell
2010-07-20 2:20 ` Stephen Rothwell
2010-07-20 2:34 ` Joe Perches
2010-07-21 1:27 ` David Miller
2010-06-23 2:51 Stephen Rothwell
2010-06-23 2:51 ` Stephen Rothwell
2010-06-23 2:51 ` Stephen Rothwell
2010-06-23 4:14 ` Herbert Xu
2010-06-23 4:14 ` Herbert Xu
2010-06-25 18:22 ` David Miller
2010-06-25 18:22 ` David Miller
2010-06-15 2:00 Stephen Rothwell
2010-06-15 2:00 ` Stephen Rothwell
2009-11-24 3:11 Stephen Rothwell
2009-11-24 3:11 ` Stephen Rothwell
2009-11-30 1:12 ` David Miller
2009-11-24 3:11 Stephen Rothwell
2009-11-24 3:11 ` Stephen Rothwell
2009-11-25 7:52 ` Jeff Kirsher
2009-11-25 7:52 ` Jeff Kirsher
2009-11-30 1:11 ` David Miller
2009-11-30 2:46 ` Stephen Rothwell
2009-11-23 1:00 Stephen Rothwell
2009-11-23 1:00 ` Stephen Rothwell
2009-11-23 1:19 ` David Miller
2009-11-23 2:04 ` Stephen Rothwell
2009-11-23 2:11 ` David Miller
2009-11-23 1:00 Stephen Rothwell
2009-11-23 1:00 ` Stephen Rothwell
2009-11-23 18:09 ` Amit Salecha
2009-11-23 23:17 ` Stephen Rothwell
2009-11-17 2:16 Stephen Rothwell
2009-11-17 2:16 ` Stephen Rothwell
2009-11-17 8:00 ` Oliver Hartkopp
2009-11-17 8:16 ` Stephen Rothwell
2009-11-17 8:07 ` David Miller
2009-11-17 8:10 ` Stephen Rothwell
2009-11-09 2:03 Stephen Rothwell
2009-11-09 2:03 ` Stephen Rothwell
2009-11-09 4:59 ` David Miller
2009-11-06 0:55 Stephen Rothwell
2009-11-06 0:55 ` Stephen Rothwell
2009-11-06 1:40 ` David Miller
2009-11-06 2:32 ` Stephen Rothwell
2009-08-14 2:40 Stephen Rothwell
2009-08-14 2:50 ` David Miller
2009-08-14 4:19 ` Stephen Rothwell
2009-08-14 5:27 ` Dhananjay Phadke
2009-03-16 5:05 Stephen Rothwell
2009-03-16 6:41 ` Kirsher, Jeffrey T
2009-03-16 8:19 ` Stephen Rothwell
2009-02-12 2:46 Stephen Rothwell
2009-02-15 7:12 ` David Miller
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=20110928.013652.1712671417837562954.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=lindner_marek@yahoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ordex@autistici.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.