From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: David Miller <davem@davemloft.net>,
sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, lsorense@csclub.uwaterloo.ca,
netdev@vger.kernel.org, daniel@caiaq.de
Subject: Re: linux-next: manual merge of the trivial tree with the net tree
Date: Thu, 04 Feb 2010 13:50:21 +0100 [thread overview]
Message-ID: <4B6AC28D.6090204@st.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1002041052020.15395@pobox.suse.cz>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Jiri,
Jiri Kosina wrote:
> On Wed, 3 Feb 2010, David Miller wrote:
>
>>> I think the best thing is me dropping the net/ and drivers/net hunks of
>>> this patch and taking it through Davem's tree ... I have already dropped
>>> those hunks from my tree. Dave, the patch is below, please consider
>>> applying.
>> ...
>>> From: Daniel Mack <daniel@caiaq.de>
>>> Subject: [PATCH] net: fix 'lenght' typo in comments and code
>>>
>>> Some misspelled occurences of 'octet' and some comments were also fixed
>>> as I was on it.
>>>
>>> Signed-off-by: Daniel Mack <daniel@caiaq.de>
>>> Cc: Jiri Kosina <trivial@kernel.org>
>>> Cc: Joe Perches <joe@perches.com>
>>> Cc: Junio C Hamano <gitster@pobox.com>
>>> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
>> This doesn't apply to net-next-2.6 at all:
>>
>> error: patch failed: drivers/net/ppp_generic.c:1436
>> error: drivers/net/ppp_generic.c: patch does not apply
>> error: drivers/net/stmmac/gmac.c: does not exist in index
>> error: drivers/net/stmmac/mac100.c: does not exist in index
The stmmac driver included in net-next has been restructured: for this
reason both gmac.c and mac100.c files do not exist any more.
Let me know if I can help on this; I mean I'm happy to apply this latest
changes to the stmmac in net-next and send a new patch.
Peppe
> Daniel, could you please refresh the drivers/net/ and net/ bits of your
> patch and resent it to netdev/Dave?
>
> I have already dropped it from my queue.
>
> Thanks,
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAktqwo0ACgkQ2Xo3j31MSSLr+QCeM4cA87vv6uQoY1rHf4Wl7Ye8
v1wAnAtI6RWt5wNUFJZRTQ2mEOP4EuE9
=G2hJ
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2010-02-04 12:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-03 2:30 linux-next: manual merge of the trivial tree with the net tree 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 [this message]
2010-02-04 13:52 ` Giuseppe CAVALLARO
2010-02-04 17:33 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2010-02-05 2:37 Stephen Rothwell
2010-02-05 4:26 ` David Miller
2010-02-05 8:39 ` Jiri Kosina
2010-02-05 11:23 ` Jiri Kosina
2010-02-05 16:55 ` David Miller
2010-02-16 3:50 Stephen Rothwell
2010-02-24 5:21 Stephen Rothwell
2011-01-04 3:22 Stephen Rothwell
2011-01-05 14:51 ` Jiri Kosina
2011-01-05 15:22 ` Justin P. Mattock
2011-07-22 4:18 Stephen Rothwell
2011-07-22 6:42 ` Francois Romieu
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=4B6AC28D.6090204@st.com \
--to=peppe.cavallaro@st.com \
--cc=daniel@caiaq.de \
--cc=davem@davemloft.net \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lsorense@csclub.uwaterloo.ca \
--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).