Re: linux-next: manual merge of the block tree with Linus' tree

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Jens Axboe

Subject: Re: linux-next: manual merge of the block tree with Linus' tree

Date: Thursday, April 29, 2010 - 12:33 am

On Thu, Apr 29 2010, Stephen Rothwell wrote:
quoted text> Hi Jens,
> 
> Today's linux-next merge of the block tree got a conflict in
> fs/block_dev.c between commit b8af67e2681c693a21f3933e3bdfce4cf66596d3
> ("fs/block_dev.c: fix performance regression in O_DIRECT|O_SYNC writes to
> block devices") from Linus' tree and commit
> fbd9b09a177a481eda256447c881f014f29034fe ("blkdev: generalize flags for
> blkdev_issue_fn functions") from the block tree.
> 
> I fixed it up (see below) and can carry the fix for a while.

I'll merge -linus in to resolve this one so you don't have to carry this
fix.

-- 
Jens Axboe

--
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

linux-next: manual merge of the block tree with Linus' tree, Stephen Rothwell, (Wed Apr 28, 8:52 pm)

Re: linux-next: manual merge of the block tree with Linus' ..., Jens Axboe, (Thu Apr 29, 12:33 am)


linux-kernel:
Greg Kroah-Hartman	[PATCH 041/196] kobject: add kobject_init_and_add function
Lukas Hejtmanek	Re: Another libata error related to OCZ SSD
Greg Kroah-Hartman	[PATCH 023/196] MCP_UCB1200: Convert from class_device to device
Florian Fainelli	Re: System clock runs too fast after 2.6.27 -> 2.6.28.1 upgrade
Christoph Lameter	[patch 1/4] mmu_notifier: Core code
git:
Johannes Schindelin	Re: [PATCH 1/2] Add strbuf_initf()
John Bito	[EGIT] Push to GitHub caused corruption
Jakub Narebski	Re: [PATCH 0/2] gitweb: patch view
Junio C Hamano	Re: [PATCH] When a remote is added but not fetched, tell the user.
Andy Parkins	Re: [RFC] Submodules in GIT
git-commits-head:
Linux Kernel Mailing List	ahci: Workaround HW bug for SB600/700 SATA controller PMP support
Linux Kernel Mailing List	V4L/DVB (11086): au0828: rename macro for currently non-function VBI support
Linux Kernel Mailing List	ceph: client types
Linux Kernel Mailing List	ceph: on-wire types
Linux Kernel Mailing List	crypto: chainiv - Use kcrypto_wq instead of keventd_wq
linux-netdev:
Andrew Morton	Re: [Bugme-new] [Bug 14969] New: b44: WOL does not work in suspended state
Giuseppe CAVALLARO	Re: [PATCH 03/13] stmmac: add the new Header file for stmmac platform data
Taku Izumi	[PATCH 3/3] ixgbe: add registers etc. printout code just before resetting adapters
Eric Dumazet	rps: some comments
Thomas Gleixner	Re: [RFC PATCH 02/12] On Tue, 23 Sep 2008, David Miller wrote:
openbsd-misc:
Stephan Andreas	problems with login after xlock in OpenBSD release 4.7
pmc	Make A Change. Alcoholism and Drug Addiction Treatment
ropers	Re: what exactly is enc0?
Fuad NAHDI	Re: What does your environment look like?
Matthew Szudzik	Typo on OpenBSD 4.4 CD Set