| commit | 4748997ec7572bd86dddbe36ed056aff9f3a7c1d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Sep 08 16:02:59 2014 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Sep 08 16:02:59 2014 -0700 |
| tree | 28483cec84c56b551a51d19a25d5479ea948aae5 | |
| parent | 278d436a476f69fc95d5c82bf61b6c2d02f4d44e [diff] | |
| parent | b629be5c8399d7c423b92135eb43a86c924d1cbc [diff] |
Merge branch 'oom_fixes' Florian Fainelli says: ==================== net: systemport and bcmgenet OOM fixes These two patches fix similar Out of Memory code paths in the SYSTEMPORT and GENET drivers. Under high memory pressure, we could produce an OOPS by passing a NULL pointer to dma_unmap_single(). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>