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. 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 -- Tim Gardner tim.gard...@canonical.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/