From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, netdev@vger.kernel.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
Date: Wed, 29 Feb 2012 03:21:42 +0000 [thread overview]
Message-ID: <1330485702.2512.22.camel@bwh-desktop> (raw)
In-Reply-To: <20120226.230523.1906949835561978402.davem@davemloft.net>
On Sun, 2012-02-26 at 23:05 -0500, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Feb 2012 12:11:25 +1100
>
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
> > assignment of ip_summed for pre-allocated skbs") from Linus' tree and
> > commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
> > booleans with a flags field") from the net-next tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
>
> I just merged net into net-next and resolved this conflict.
Thank you both. I should have flagged this when sending the change for
the net tree.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
WARNING: multiple messages have this Message-ID (diff)
From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: <sfr@canb.auug.org.au>, <netdev@vger.kernel.org>,
<linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
Date: Wed, 29 Feb 2012 03:21:42 +0000 [thread overview]
Message-ID: <1330485702.2512.22.camel@bwh-desktop> (raw)
In-Reply-To: <20120226.230523.1906949835561978402.davem@davemloft.net>
On Sun, 2012-02-26 at 23:05 -0500, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 27 Feb 2012 12:11:25 +1100
>
> > Today's linux-next merge of the net-next tree got a conflict in
> > drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix
> > assignment of ip_summed for pre-allocated skbs") from Linus' tree and
> > commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other
> > booleans with a flags field") from the net-next tree.
> >
> > Just context changes. I fixed it up (see below) and can carry the fix as
> > necessary.
>
> I just merged net into net-next and resolved this conflict.
Thank you both. I should have flagged this when sending the change for
the net tree.
Ben.
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2012-02-29 3:21 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-27 1:11 linux-next: manual merge of the net-next tree with Linus' tree Stephen Rothwell
2012-02-27 1:11 ` Stephen Rothwell
2012-02-27 4:05 ` David Miller
2012-02-29 3:21 ` Ben Hutchings [this message]
2012-02-29 3:21 ` Ben Hutchings
-- strict thread matches above, loose matches on Subject: below --
2012-07-19 1:15 Stephen Rothwell
2012-07-19 1:15 ` Stephen Rothwell
2012-07-19 1:18 ` Jeff Kirsher
2012-09-26 1:46 Stephen Rothwell
2012-09-26 1:46 ` Stephen Rothwell
2012-10-02 1:51 Stephen Rothwell
2012-10-02 1:51 ` Stephen Rothwell
2012-11-08 23:53 Stephen Rothwell
2012-11-08 23:53 ` Stephen Rothwell
2012-11-10 23:34 ` David Miller
2013-03-12 0:33 Stephen Rothwell
2013-03-12 0:33 ` Stephen Rothwell
2013-03-12 10:49 ` David Miller
2013-03-27 0:57 Stephen Rothwell
2013-03-27 0:57 ` Stephen Rothwell
2013-03-27 4:54 ` David Miller
2013-04-22 2:43 Stephen Rothwell
2013-04-22 2:43 ` Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-04-22 2:48 Stephen Rothwell
2013-04-22 2:48 ` Stephen Rothwell
2013-04-22 3:03 Stephen Rothwell
2013-04-22 3:03 ` Stephen Rothwell
2013-04-23 0:41 ` David Miller
2013-04-22 3:09 Stephen Rothwell
2013-04-22 3:09 ` Stephen Rothwell
2013-04-23 0:42 ` David Miller
2013-06-17 2:38 Stephen Rothwell
2013-06-17 2:38 ` Stephen Rothwell
2013-06-17 2:44 Stephen Rothwell
2013-06-17 2:44 ` Stephen Rothwell
2013-09-02 3:12 Stephen Rothwell
2013-09-02 3:12 ` Stephen Rothwell
2013-09-05 5:19 Stephen Rothwell
2013-09-05 5:19 ` Stephen Rothwell
2013-09-05 7:33 ` Daniel Borkmann
2013-09-05 5:23 Stephen Rothwell
2013-09-05 5:23 ` Stephen Rothwell
2013-12-18 1:46 Stephen Rothwell
2013-12-18 1:46 ` Stephen Rothwell
2013-12-18 1:56 ` Jeff Kirsher
2013-12-18 2:19 ` Stephen Rothwell
2014-06-05 3:13 Stephen Rothwell
2014-06-05 3:13 ` Stephen Rothwell
2014-06-05 3:26 ` KY Srinivasan
2014-06-12 2:01 Stephen Rothwell
2014-06-12 2:01 ` Stephen Rothwell
2015-02-12 1:05 Stephen Rothwell
2015-02-12 1:05 ` Stephen Rothwell
2015-05-28 4:17 Stephen Rothwell
2015-05-28 4:17 ` Stephen Rothwell
2015-05-28 13:34 ` Tom Lendacky
2015-05-28 13:34 ` Tom Lendacky
2015-07-14 1:46 Stephen Rothwell
2015-07-14 1:46 ` Stephen Rothwell
2015-07-14 8:23 ` Nikolay Aleksandrov
2016-03-15 0:07 Stephen Rothwell
2016-03-15 0:07 ` Stephen Rothwell
2016-03-15 8:53 ` Gregory CLEMENT
2016-03-15 8:53 ` Gregory CLEMENT
2016-05-03 3:15 Stephen Rothwell
2016-05-03 3:15 ` Stephen Rothwell
2016-06-30 1:01 Stephen Rothwell
2016-06-30 1:01 ` Stephen Rothwell
2016-10-02 22:32 Stephen Rothwell
2016-10-02 22:37 Stephen Rothwell
2017-02-02 1:49 Stephen Rothwell
2017-02-02 8:40 ` Yotam Gigi
2017-03-24 0:05 Stephen Rothwell
2017-03-24 0:10 ` David Miller
2017-03-24 1:24 ` Alexei Starovoitov
2017-03-24 1:24 ` Alexei Starovoitov
2017-05-03 1:07 Stephen Rothwell
2017-05-03 4:08 ` David Miller
2017-06-30 0:57 Stephen Rothwell
2017-10-30 17:02 Mark Brown
2017-10-30 17:43 ` Jakub Kicinski
2017-10-30 18:10 ` Mark Brown
2017-10-30 17:08 Mark Brown
2017-10-30 17:24 Mark Brown
2017-11-09 23:31 Stephen Rothwell
2017-11-10 4:37 ` Cong Wang
2017-11-10 4:39 ` David Miller
2017-12-04 22:59 Stephen Rothwell
2018-06-06 4:37 Stephen Rothwell
2018-07-20 1:49 Stephen Rothwell
2019-04-02 22:56 Stephen Rothwell
2019-06-04 0:29 Stephen Rothwell
2019-06-04 0:30 Stephen Rothwell
2019-06-17 1:44 Stephen Rothwell
2019-09-15 20:24 Mark Brown
2019-09-15 20:31 Mark Brown
2019-10-21 0:07 Stephen Rothwell
2021-01-29 0:43 Stephen Rothwell
2021-01-29 0:48 Stephen Rothwell
2021-01-29 0:59 Stephen Rothwell
2021-07-23 2:32 Stephen Rothwell
2022-07-15 1:48 Stephen Rothwell
2022-07-15 2:01 Stephen Rothwell
2022-09-21 1:00 Stephen Rothwell
2022-09-21 4:40 ` Colin Foster
2022-10-27 23:28 Stephen Rothwell
2022-10-28 6:53 ` Marc Kleine-Budde
2023-02-16 23:18 Stephen Rothwell
2023-02-16 23:40 Stephen Rothwell
2023-12-14 23:52 Stephen Rothwell
2024-10-18 1:00 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=1330485702.2512.22.camel@bwh-desktop \
--to=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.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.