Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

8e775167

Commit 8e775167 authored 14 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "block: fix accounting bug on cross partition merges"

parents 4b37ba90 f253b86b

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

block/blk-core.c 8 additions, 16 deletions

block/blk-core.c
block/blk-merge.c 1 addition, 1 deletion

block/blk-merge.c
block/blk.h 4 additions, 0 deletions

block/blk.h
block/genhd.c 0 additions, 14 deletions

block/genhd.c
fs/partitions/check.c 0 additions, 12 deletions

fs/partitions/check.c
include/linux/blkdev.h 0 additions, 1 deletion

include/linux/blkdev.h
include/linux/elevator.h 0 additions, 2 deletions

include/linux/elevator.h
include/linux/genhd.h 0 additions, 1 deletion

include/linux/genhd.h

with 13 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment