From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: dwmw2@infradead•org, linux-next@vger•kernel.org, jaswinder@infradead•org
Subject: Re: linux-next: sparc/firmware build failure
Date: Mon, 01 Sep 2008 02:46:52 -0700 (PDT) [thread overview]
Message-ID: <20080901.024652.155907138.davem@davemloft.net> (raw)
In-Reply-To: <20080901191019.5df57434.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Sep 2008 19:10:19 +1000
> I have applied the following patch. I will carry this patch unless a
> better solution comes along.
That patch is the proper way to resolve this merge conflict, please
carry it :-)
next prev parent reply other threads:[~2008-09-01 9:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 9:10 linux-next: sparc/firmware build failure Stephen Rothwell
2008-09-01 9:46 ` David Miller [this message]
2008-10-28 10:45 ` Stephen Rothwell
2008-10-28 11:42 ` David Woodhouse
2008-10-28 12:07 ` Stephen Rothwell
2008-11-03 3:55 ` Stephen Rothwell
2008-11-05 6:02 ` Stephen Rothwell
2008-11-06 2:44 ` Stephen Rothwell
2008-11-13 3:35 ` Stephen Rothwell
2008-11-13 6:57 ` David Miller
2008-11-18 15:37 ` David Woodhouse
2008-11-18 20:09 ` 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=20080901.024652.155907138.davem@davemloft.net \
--to=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