summaryrefslogtreecommitdiff
path: root/include/net/smc.h
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-02-02 22:33:13 +0100
committerKalle Valo <kvalo@codeaurora.org>2017-02-08 17:23:38 +0200
commit9587a01a7ead9efc5032c16e0d9668de58be1186 (patch)
treee0254eeedd0c2896f0373af47476724e7d36f396 /include/net/smc.h
parent6773386f977ce5af339f9678fa2918909a946c6b (diff)
brcmfmac: merge two brcmf_err macros into one
This allows simplifying the code by adding a simple IS_ENABLED check for CONFIG_BRCMDB symbol. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'include/net/smc.h')
0 files changed, 0 insertions, 0 deletions
529&id2=c14024dbb156c8392908aaa822097d27c6af8ec8'>diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes for this series. This contains: - Set of fixes for the nvme target code - A revert of patch from this merge window, causing a regression with WRITE_SAME on iSCSI targets at least. - A fix for a use-after-free in the new O_DIRECT bdev code. - Two fixes for the xen-blkfront driver" * 'for-linus' of git://git.kernel.dk/linux-block: Revert "sd: remove __data_len hack for WRITE SAME" nvme-fc: use blk_rq_nr_phys_segments nvmet-rdma: Fix missing dma sync to nvme data structures nvmet: Call fatal_error from keep-alive timout expiration nvmet: cancel fatal error and flush async work before free controller nvmet: delete controllers deletion upon subsystem release nvmet_fc: correct logic in disconnect queue LS handling block: fix use after free in __blkdev_direct_IO xen-blkfront: correct maximum segment accounting xen-blkfront: feature flags handling adjustments
Diffstat (limited to 'net/bridge/br_private.h')