From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: dwmw2@infradead•org, linux-next@vger•kernel.org, ben@decadent•org.uk
Subject: Re: linux-next: manual merge of the firmware tree with the tree
Date: Sun, 01 Mar 2009 20:29:49 -0800 (PST) [thread overview]
Message-ID: <20090301.202949.176544427.davem@davemloft.net> (raw)
In-Reply-To: <20090302141103.d1c369d0.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 2 Mar 2009 14:11:03 +1100
> Today's linux-next merge of the firmware tree got conflicts in
> firmware/WHENCE between commits 06e1f9ffa023c030bc87491e75f625f5da4e7d97
> ("tehuti: Use request_firmware()") and
> b775a750c3afacbfac884537d466d34d50b1023b ("typhoon: Use request_firmware
> ()") 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 as necessary.
Yeah, I think you'll need to carry this one.
next prev parent reply other threads:[~2009-03-02 4:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-02 3:11 linux-next: manual merge of the firmware tree with the tree Stephen Rothwell
2009-03-02 4:29 ` David Miller [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-02 3:11 Stephen Rothwell
2009-03-02 7:31 ` Takashi Iwai
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=20090301.202949.176544427.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=ben@decadent$(echo .)org.uk \
--cc=dwmw2@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