Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e83a46bb authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-linus' of ../linux-2.6-block into block-for-2.6.39/core 



This merge creates two set of conflicts.  One is simple context
conflicts caused by removal of throtl_scheduled_delayed_work() in
for-linus and removal of throtl_shutdown_timer_wq() in
for-2.6.39/core.

The other is caused by commit 255bb490 (block: blk-flush shouldn't
call directly into q->request_fn() __blk_run_queue()) in for-linus
crashing with FLUSH reimplementation in for-2.6.39/core.  The conflict
isn't trivial but the resolution is straight-forward.

* __blk_run_queue() calls in flush_end_io() and flush_data_end_io()
  should be called with @force_kblockd set to %true.

* elv_insert() in blk_kick_flush() should use
  %ELEVATOR_INSERT_REQUEUE.

Both changes are to avoid invoking ->request_fn() directly from
request completion path and closely match the changes in the commit
255bb490.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents da527770 fd51469f

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.xz

*.lzo

*.patch

*.gcno

MAINTAINERS

+9 −2
Original line number Diff line number Diff line
@@ -1692,6 +1692,13 @@ M: Andy Whitcroft <apw@canonical.com> 
S:	Supported

F:	scripts/checkpatch.pl



CHINESE DOCUMENTATION

M:	Harry Wei <harryxiyou@gmail.com>

L:	xiyoulinuxkernelgroup@googlegroups.com

L:	linux-kernel@zh-kernel.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/zh_CN/



CISCO VIC ETHERNET NIC DRIVER

M:	Vasanthy Kolluri <vkolluri@cisco.com>

M:	Roopa Prabhu <roprabhu@cisco.com>
@@ -5266,7 +5273,7 @@ S: Maintained 
F:	drivers/net/wireless/rtl818x/rtl8180/



RTL8187 WIRELESS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>

M:	Herton Ronaldo Krzesinski <herton@canonical.com>

M:	Hin-Tak Leung <htl10@users.sourceforge.net>

M:	Larry Finger <Larry.Finger@lwfinger.net>

L:	linux-wireless@vger.kernel.org
@@ -6104,7 +6111,7 @@ S: Maintained 
F:	security/tomoyo/



TOPSTAR LAPTOP EXTRAS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>

M:	Herton Ronaldo Krzesinski <herton@canonical.com>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

F:	drivers/platform/x86/topstar-laptop.c

arch/arm/mach-omap2/clkt_dpll.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int _dpll_test_fint(struct clk *clk, u8 n) 
	dd = clk->dpll_data;



	/* DPLL divider must result in a valid jitter correction val */

	fint = clk->parent->rate / (n + 1);

	fint = clk->parent->rate / n;

	if (fint < DPLL_FINT_BAND1_MIN) {



		pr_debug("rejecting n=%d due to Fint failure, "

arch/arm/mach-omap2/mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static struct omap_mbox mbox_iva_info = { 
	.priv	= &omap2_mbox_iva_priv,

};



struct omap_mbox *omap2_mboxes[] = { &mbox_iva_info, &mbox_dsp_info, NULL };

struct omap_mbox *omap2_mboxes[] = { &mbox_dsp_info, &mbox_iva_info, NULL };

#endif



#if defined(CONFIG_ARCH_OMAP4)

arch/arm/mach-omap2/mux.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static void __init omap_mux_dbg_create_entry( 
	list_for_each_entry(e, &partition->muxmodes, node) {

		struct omap_mux *m = &e->mux;



		(void)debugfs_create_file(m->muxnames[0], S_IWUGO, mux_dbg_dir,

		(void)debugfs_create_file(m->muxnames[0], S_IWUSR, mux_dbg_dir,

					  m, &omap_mux_dbg_signal_fops);

	}

}