netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Tim Gardner <tim.gardner@canonical.com>
Cc: David Miller <davem@davemloft.net>,
	<linux-kernel@vger.kernel.org>, <ben@decadent.org.uk>,
	<JBottomley@parallels.com>, <dan.j.williams@intel.com>,
	<divy@chelsio.com>, <netdev@vger.kernel.org>
Subject: Re: [PATCH] firmware: Remove obsolete Chelsio cxgb3 firmware
Date: Thu, 2 Aug 2012 16:40:57 -0400	[thread overview]
Message-ID: <501AE5D9.7000805@windriver.com> (raw)
In-Reply-To: <501A728A.2070905@canonical.com>

On 12-08-02 08:28 AM, Tim Gardner wrote:
> On 08/02/2012 01:20 AM, David Miller wrote:
>>
>> "git am" refuses to apply this to current 'net':
>>
>> Applying: firmware: Remove obsolete Chelsio cxgb3 firmware
>> error: removal patch leaves file contents
>> error: firmware/cxgb3/t3fw-7.10.0.bin.ihex: patch does not apply
>>
> 
> Paul Gortmaker suggested I use 'git format-patch --irreversible-delete'
> to produce shorter patches, but then even I can't reapply it.

The git folks originally designed it that way on purpose, (i.e. used
for review only) but it doesn't really need to be limited like that,
so I've proposed a fix and we'll see what the git folks have to say.

   http://marc.info/?l=git&m=134394003916648&w=2

Paul.
--

> 
> How about a pull request against net-next instead ?
> 
> The following changes since commit 1a9b4993b70fb1884716902774dc9025b457760d:
> 
>   Merge branch 'upstream' of
> git://git.linux-mips.org/pub/scm/ralf/upstream-linus (2012-08-01
> 16:47:15 -0700)
> 
> are available in the git repository at:
> 
> 
>   git://kernel.ubuntu.com/rtg/net-next.git master
> 
> for you to fetch changes up to 044b722f36a17bc5f7f472cc3246cb15a430bb0e:
> 
>   firmware: Remove obsolete Chelsio cxgb3 firmware (2012-08-02 06:23:25
> -0600)
> 
> ----------------------------------------------------------------
> Tim Gardner (1):
>       firmware: Remove obsolete Chelsio cxgb3 firmware
> 
>  firmware/Makefile                   |    1 -
>  firmware/cxgb3/t3fw-7.10.0.bin.ihex | 1935
> -----------------------------------
>  2 files changed, 1936 deletions(-)
>  delete mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
> 

  reply	other threads:[~2012-08-02 20:40 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-01 19:17 [PATCH] firmware: Remove obsolete Chelsio cxgb3 firmware Tim Gardner
2012-08-02  7:20 ` David Miller
2012-08-02 12:28   ` Tim Gardner
2012-08-02 20:40     ` Paul Gortmaker [this message]
2012-08-04  3:41     ` David Miller

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=501AE5D9.7000805@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=JBottomley@parallels.com \
    --cc=ben@decadent.org.uk \
    --cc=dan.j.williams@intel.com \
    --cc=davem@davemloft.net \
    --cc=divy@chelsio.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=tim.gardner@canonical.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).