From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org, Greg KH <greg@kroah•com>
Subject: linux-next: manual merge of the boot-params tree
Date: Tue, 30 Dec 2008 01:10:55 +1100 [thread overview]
Message-ID: <20081230011055.d2f6ced2.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
Hi Rusty,
Today's linux-next merge of the boot-params tree got a conflict in
drivers/usb/core/usb.c between commit
6e7b5429a08fe4f71c336710bd45acdce6cd3df7 ("USB: don't use
__module_param_call") from the usb tree and commit
9634765245cd7aba71328c71813ca882d008632d ("USB: Don't use
__module_param_call; use core_param") from the boot-params tree.
Two different versions of the same change? I fixed it up (used the
boot-params tree version) and can carry the fix as necessary. It sounds
like Greg should drop the patch from the usb tree (or pick up the version
from the boot-params tree).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-12-29 14:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 14:10 Stephen Rothwell [this message]
2008-12-29 21:22 ` linux-next: manual merge of the boot-params tree Rusty Russell
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 14:22 Stephen Rothwell
2008-12-29 14:01 Stephen Rothwell
2008-12-18 9:35 Stephen Rothwell
2008-12-15 13:21 Stephen Rothwell
2008-12-15 13:21 Stephen Rothwell
2008-12-15 13:20 Stephen Rothwell
2008-12-15 13:20 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=20081230011055.d2f6ced2.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
/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