From: David S. Miller Date: Wed, 10 Sep 2014 21:02:37 +0000 (-0700) Subject: Merge branch 'cxgb4-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=17fa1f983649580772e95ee95e2c096baa650219;p=linux-beck.git Merge branch 'cxgb4-next' Hariprasad Shenai says: ==================== cxgb4: Allow FW size upto 1MB, support for S25FL032P flash and misc. fixes This patch series adds support to allow FW size upto 1MB, support for S25FL032P flash. Fix t4_flash_erase_sectors to throw an error, when erase sector aren't in the flash and also warning message when adapters have flashes less than 2Mb. Adds device id of new adapter and removes device id of debug adapter. The patches series is created against 'net-next' tree. And includes patches on cxgb4 driver and cxgb4vf driver. We have included all the maintainers of respective drivers. Kindly review the change and let us know in case of any review comments. ==================== Signed-off-by: David S. Miller --- 17fa1f983649580772e95ee95e2c096baa650219