Commit 56f29d7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block 

* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block: (67 commits)
  [PATCH] blk_queue_start_tag() shared map race fix
  [PATCH] Update axboe@suse.de email address
  [PATCH] fix creating zero sized bio mempools in low memory system
  [PATCH] CONFIG_BLOCK: blk_congestion_wait() fix
  [PATCH] CONFIG_BLOCK internal.h cleanups
  [PATCH] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]
  [PATCH] BLOCK: Make it possible to disable the block layer [try #6]
  [PATCH] BLOCK: Remove no-longer necessary linux/buffer_head.h inclusions [try #6]
  [PATCH] BLOCK: Remove no-longer necessary linux/mpage.h inclusions [try #6]
  [PATCH] BLOCK: Move the msdos device ioctl compat stuff to the msdos driver [try #6]
  [PATCH] BLOCK: Move the Ext3 device ioctl compat stuff to the Ext3 driver [try #6]
  [PATCH] BLOCK: Move the Ext2 device ioctl compat stuff to the Ext2 driver [try #6]
  [PATCH] BLOCK: Move the ReiserFS device ioctl compat stuff to the ReiserFS driver [try #6]
  [PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6]
  [PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]
  [PATCH] BLOCK: Move __invalidate_device() to block_dev.c [try #6]
  [PATCH] BLOCK: Dissociate generic_writepages() from mpage stuff [try #6]
  [PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6]
  [PATCH] BLOCK: Move extern declarations out of fs/*.c into header files [try #6]
  [PATCH] BLOCK: Don't call block_sync_page() from AFS [try #6]
  ...
parents e823aff2 059af497

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ S: Maintained 


BLOCK LAYER

P:	Jens Axboe

M:	axboe@suse.de

M:	axboe@kernel.dk

L:	linux-kernel@vger.kernel.org

T:	git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git

S:	Maintained
@@ -1380,7 +1380,7 @@ S: Maintained 


IDE/ATAPI CDROM DRIVER

P:	Jens Axboe

M:	axboe@suse.de

M:	axboe@kernel.dk

L:	linux-kernel@vger.kernel.org

W:	http://www.kernel.dk

S:	Maintained
@@ -2531,7 +2531,7 @@ S: Maintained 


SCSI CDROM DRIVER

P:	Jens Axboe

M:	axboe@suse.de

M:	axboe@kernel.dk

L:	linux-scsi@vger.kernel.org

W:	http://www.kernel.dk

S:	Maintained
@@ -2976,7 +2976,7 @@ S: Maintained 


UNIFORM CDROM DRIVER

P:	Jens Axboe

M:	axboe@suse.de

M:	axboe@kernel.dk

L:	linux-kernel@vger.kernel.org

W:	http://www.kernel.dk

S:	Maintained

arch/mips/kernel/signal_n32.c

+2 −2
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 


#include "signal-common.h"



extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);



/*

 * Including <asm/unistd.h> would give use the 64-bit syscall numbers ...

 */
@@ -81,8 +83,6 @@ struct rt_sigframe_n32 { 
#endif

};



extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);



save_static_function(sysn32_rt_sigsuspend);

__attribute_used__ noinline static int

_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)

arch/um/drivers/ubd_kern.c

+0 −2
Original line number Diff line number Diff line
@@ -981,8 +981,6 @@ static int prepare_request(struct request *req, struct io_thread_req *io_req) 
	__u64 offset;

	int len;



	if(req->rq_status == RQ_INACTIVE) return(1);



	/* This should be impossible now */

	if((rq_data_dir(req) == WRITE) && !dev->openflags.w){

		printk("Write attempted on readonly ubd device %s\n",

block/Kconfig

+20 −0
Original line number Diff line number Diff line 
#

# Block layer core configuration

#

config BLOCK

       bool "Enable the block layer"

       default y

       help

	 This permits the block layer to be removed from the kernel if it's not

	 needed (on some embedded devices for example).  If this option is

	 disabled, then blockdev files will become unusable and some

	 filesystems (such as ext3) will become unavailable.



	 This option will also disable SCSI character devices and USB storage

	 since they make use of various block layer definitions and

	 facilities.



	 Say Y here unless you know you really don't want to mount disks and

	 suchlike.



if BLOCK



#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64

#for instance.

config LBD
@@ -33,4 +51,6 @@ config LSF 


	  If unsure, say Y.



endif



source block/Kconfig.iosched

block/Kconfig.iosched

+3 −0
Original line number Diff line number Diff line 
if BLOCK



menu "IO Schedulers"
@@ -67,3 +68,5 @@ config DEFAULT_IOSCHED 
	default "noop" if DEFAULT_NOOP



endmenu



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE