From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Woodhouse <dwmw2@infradead•org>
Cc: linux-next@vger•kernel.org, Alan Cox <alan@lxorguk•ukuu.org.uk>,
Greg KH <greg@kroah•com>,
Jaswinder Singh <jaswinder@infradead•org>
Subject: linux-next: manual merge of the firmware tree
Date: Fri, 11 Jul 2008 16:02:45 +1000 [thread overview]
Message-ID: <20080711160245.3ea0c85e.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 575 bytes --]
Hi David,
Today's linux-next merge of the firmware tree got conflicts in
drivers/usb/serial/io_ti.c and drivers/usb/serial/io_fw_down3.h between
commit 933485161580b837dd84d46fb1fca7ea775f30c1 ("USB: io_ti: FIrst cut
at a big clean up") from the usb tree and commit
19aeeb5b95d53d0865ae811fc4dcc66639d661cf ("edgeport-ti: use
request_firmware()") from the firmware tree.
I just reverted the firmware tree commit for now as the fixup is quite
extensive.
--
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-07-11 6:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-11 6:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-28 5:03 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray
2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse
2008-11-25 7:21 Stephen Rothwell
2008-10-15 7:58 Stephen Rothwell
2008-09-01 6:19 Stephen Rothwell
2008-08-28 5:38 Stephen Rothwell
2008-08-28 13:51 ` Takashi Iwai
2008-07-29 4:27 Stephen Rothwell
2008-07-07 16:02 Stephen Rothwell
2008-06-30 9:17 Stephen Rothwell
2008-06-30 9:14 Stephen Rothwell
2008-06-30 9:09 Stephen Rothwell
2008-06-30 9:24 ` David Woodhouse
2008-06-30 9:33 ` Stephen Rothwell
2008-06-26 13:38 Stephen Rothwell
2008-06-26 13:51 ` Takashi Iwai
2008-06-26 15:42 ` Stephen Rothwell
2008-06-26 15:47 ` David Woodhouse
2008-06-30 9:23 ` Stephen Rothwell
2008-06-30 9:27 ` David Woodhouse
2008-06-30 9:32 ` Stephen Rothwell
2008-06-24 6:55 Stephen Rothwell
2008-06-24 7:57 ` Stephen Rothwell
2008-06-24 8:04 ` David Woodhouse
2008-06-24 11: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=20080711160245.3ea0c85e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alan@lxorguk$(echo .)ukuu.org.uk \
--cc=dwmw2@infradead$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=jaswinder@infradead$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/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