From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: jkosina@suse.cz, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, adam.buchbinder@gmail.com,
netdev@vger.kernel.org, bhutchings@solarflare.com
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
Date: Thu, 04 Feb 2010 20:26:45 -0800 (PST) [thread overview]
Message-ID: <20100204.202645.18974249.davem@davemloft.net> (raw)
In-Reply-To: <20100205133747.14ca83f2.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Feb 2010 13:37:47 +1100
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/net/sfc/mcdi_pcol.h between commit
> 5297a98d5dd6de86fe1e2ffc9ea60cdf59b71443 ("sfc: Update MCDI protocol
> definitions") from the net tree and commit
> 4887b438e6880c73c4b44d868211e70c1f3deaec ("Fix misspelling of
> "successful" and variants in comments") from the trivial tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
Ugh, this is the second spelling fix that's hit a conflict
in the same exact tree.
Please, submit these things to the subsystem maintainers instead
of keeping them together in a totally seperate tree. That way
we won't have to keep fighting these things.
Thanks.
next prev parent reply other threads:[~2010-02-05 4:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 2:37 linux-next: manual merge of the trivial tree with the net tree Stephen Rothwell
2010-02-05 4:26 ` David Miller [this message]
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-07-22 4:18 Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2010-02-24 5:21 Stephen Rothwell
2010-02-16 3:50 Stephen Rothwell
2010-02-03 2:30 Stephen Rothwell
2010-02-03 10:39 ` Jiri Kosina
2010-02-04 4:04 ` David Miller
2010-02-04 9:52 ` Jiri Kosina
2010-02-04 12:50 ` Giuseppe CAVALLARO
2010-02-04 13:52 ` Giuseppe CAVALLARO
2010-02-04 17:33 ` 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=20100204.202645.18974249.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=adam.buchbinder@gmail.com \
--cc=bhutchings@solarflare.com \
--cc=jkosina@suse.cz \
--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 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).