]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa801bc 1c15b5f)
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 13 Nov 2015 19:29:22 +0000 (11:29 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 13 Nov 2015 19:29:22 +0000 (11:29 -0800)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  mm: do not ignore mapping_gfp_mask in page cache allocation paths
  PCI: Set SR-IOV NumVFs to zero after enumeration
  virtio-net: drop NETIF_F_FRAGLIST
  blk-mq: avoid excessive boot delays with large lun counts

1  2 
block/blk-mq.c patch | diff1 | diff2 | blob | history
drivers/net/virtio_net.c patch | diff1 | diff2 | blob | history

diff --cc block/blk-mq.c
Simple merge
diff --cc drivers/net/virtio_net.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.