From: Divy Le Ray <divy@chelsio•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: David Woodhouse <dwmw2@infradead•org>,
linux-next@vger•kernel.org,
"David S. Miller" <davem@davemloft•net>,
Jaswinder Singh <jaswinder@infradead•org>
Subject: Re: linux-next: manual merge of the firmware tree
Date: Fri, 28 Nov 2008 16:14:46 -0800 [thread overview]
Message-ID: <49308976.7010206@chelsio.com> (raw)
In-Reply-To: <20081128160339.23fa014f.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the firmware tree got conflicts in
> firmware/Makefile and firmware/WHENCE between commit
> ad58633c8381e88b54055771877726d3d5d24734 ("cxgb3: integrate FW and
> protocol engines in the kernel") from the net tree and various commits
> from the firmware tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix.
>
> Is it time that some of these went to their respective maintainers?
> --
Hi Stephen,
I created this situation and apologize for it. I should have sent the
patch to the firmware tree maintainer.
Cheers,
Divy
next prev parent reply other threads:[~2008-11-29 0:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-28 5:03 linux-next: manual merge of the firmware tree Stephen Rothwell
2008-11-29 0:14 ` Divy Le Ray [this message]
2008-11-29 0:48 ` Stephen Rothwell
2008-11-29 10:11 ` David Woodhouse
-- strict thread matches above, loose matches on Subject: below --
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-11 6:02 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=49308976.7010206@chelsio.com \
--to=divy@chelsio$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dwmw2@infradead$(echo .)org \
--cc=jaswinder@infradead$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.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