summaryrefslogtreecommitdiff
path: root/mausezahn/.gitignore
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-03-18 12:08:19 +0100
committerTobias Klauser <tklauser@distanz.ch>2014-03-18 12:08:19 +0100
commit7130cc471492e5c5cd1fccbb782bee65a8096d9d (patch)
tree12bd525072f086ec505c7d56090e96c6d1c369d4 /mausezahn/.gitignore
parentac562a7d33794860fc9e5991bf1371e5f71d9f56 (diff)
astraceroute.zsh: Remove duplicate entry
The entry for -q/--num-probes is duplicated in the zsh completion file and the description of the first entry doesn't match the option's real purpose, thus remove it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'mausezahn/.gitignore')
0 files changed, 0 insertions, 0 deletions
e374489448361213e9c3b749d14900'>1db175428ee374489448361213e9c3b749d14900 (diff)
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull DAX updates from Dan Williams: "The completion of Jan's DAX work for 4.10. As I mentioned in the libnvdimm-for-4.10 pull request, these are some final fixes for the DAX dirty-cacheline-tracking invalidation work that was merged through the -mm, ext4, and xfs trees in -rc1. These patches were prepared prior to the merge window, but we waited for 4.10-rc1 to have a stable merge base after all the prerequisites were merged. Quoting Jan on the overall changes in these patches: "So I'd like all these 6 patches to go for rc2. The first three patches fix invalidation of exceptional DAX entries (a bug which is there for a long time) - without these patches data loss can occur on power failure even though user called fsync(2). The other three patches change locking of DAX faults so that ->iomap_begin() is called in a more relaxed locking context and we are safe to start a transaction there for ext4" These have received a build success notification from the kbuild robot, and pass the latest libnvdimm unit tests. There have not been any -next releases since -rc1, so they have not appeared there" * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: ext4: Simplify DAX fault path dax: Call ->iomap_begin without entry lock during dax fault dax: Finish fault completely when loading holes dax: Avoid page invalidation races and unnecessary radix tree traversals mm: Invalidate DAX radix tree entries only if appropriate ext2: Return BH_New buffers for zeroed blocks
Diffstat (limited to 'drivers/usb/host/ohci-ps3.c')