summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/silan/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-10-18 22:29:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-10-18 22:29:36 -0400
commitd418d070057c45fd6f21567278f95452bfe690d1 (patch)
tree24a02ac68321cc119fbcba426e5914dc50c78dce /drivers/net/ethernet/silan/Makefile
parentdfdcff3215ae4ed7975b0991243d1dd8e1250bec (diff)
parentb55f0097ae1da2520108bc426275c1ec5f857b78 (diff)
downloadblackbird-op-linux-d418d070057c45fd6f21567278f95452bfe690d1.tar.gz
blackbird-op-linux-d418d070057c45fd6f21567278f95452bfe690d1.zip
Merge tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: - NVMe pull request from Keith that address deadlocks, double resets, memory leaks, and other regression. - Fixup elv_support_iosched() for bio based devices (Damien) - Fixup for the ahci PCS quirk (Dan) - Socket O_NONBLOCK handling fix for io_uring (me) - Timeout sequence io_uring fixes (yangerkun) - MD warning fix for parameter default_layout (Song) - blkcg activation fixes (Tejun) - blk-rq-qos node deletion fix (Tejun) * tag 'for-linus-2019-10-18' of git://git.kernel.dk/linux-block: nvme-pci: Set the prp2 correctly when using more than 4k page io_uring: fix logic error in io_timeout io_uring: fix up O_NONBLOCK handling for sockets md/raid0: fix warning message for parameter default_layout libata/ahci: Fix PCS quirk application blk-rq-qos: fix first node deletion of rq_qos_del() blkcg: Fix multiple bugs in blkcg_activate_policy() io_uring: consider the overflow of sequence for timeout req nvme-tcp: fix possible leakage during error flow nvmet-loop: fix possible leakage during error flow block: Fix elv_support_iosched() nvme-tcp: Initialize sk->sk_ll_usec only with NET_RX_BUSY_POLL nvme: Wait for reset state when required nvme: Prevent resets during paused controller state nvme: Restart request timers in resetting state nvme: Remove ADMIN_ONLY state nvme-pci: Free tagset if no IO queues nvme: retain split access workaround for capability reads nvme: fix possible deadlock when nvme_update_formats fails
Diffstat (limited to 'drivers/net/ethernet/silan/Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud