From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Weber <weber@corscience•de>
Subject: linux-next: manual merge of the trivial tree with the net tree
Date: Fri, 24 Sep 2010 12:19:24 +1000 [thread overview]
Message-ID: <20100924121924.8fb5dfb5.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 610 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/bnx2x/bnx2x_link.c between commit
62b29a5dd0930e0c956b6740f32d5b3bbaf20136 ("bnx2x: Adjust alignment of
split PHY functions") from the net tree and commit
0b1974de66f9ed44f1423449628f4926bf95b854 ("Fix typo: configuation =>
configuration") from the trivial tree.
The former removes the text updated by the latter, so I used the former.
Jiri, you might like to drop that hunk from the patch in your tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-09-24 2:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 2:19 Stephen Rothwell [this message]
2010-09-24 12:09 ` linux-next: manual merge of the trivial tree with the net tree Jiri Kosina
-- 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-10-12 0:53 Stephen Rothwell
2010-02-24 5:21 Stephen Rothwell
2010-02-16 3:50 Stephen Rothwell
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-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
2009-11-30 2:53 Stephen Rothwell
2009-11-30 12:36 ` Jiri Kosina
2009-11-30 19:55 ` Stephen Rothwell
2009-11-24 6:14 Stephen Rothwell
2009-11-24 9:13 ` Jiri Kosina
2009-11-30 1:13 ` 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=20100924121924.8fb5dfb5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jkosina@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=weber@corscience$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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