On 12-08-02 08:28 AM, Tim Gardner wrote:
On 08/02/2012 01:20 AM, David Miller wrote:
quoted
"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