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

On 4/14/19 9:06 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > include/linux/bvec.h > > between commit: > > 1200e07f3ad4 ("block: don't use for-inside-for in bio_for_each_segment_all") > > from Linus' tree and commit: > > 52d5

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

On 11/15/18 7:19 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > block/blk.h > > between commit: > > 1adfc5e4136f ("block: make sure discard bio is aligned with logical block > size") > > from Linus' tree (precedes v4.20-rc2) and

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

On 06/22/2017 09:33 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 22 Jun 2017 21:27:04 -0600 Jens Axboe wrote: >> >> On 06/22/2017 09:24 PM, Stephen Rothwell wrote: >>> Hi Jens, >>> >>> On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe wrote: I'll cherry pick that commit into the 4.

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

Hi Jens, On Thu, 22 Jun 2017 21:27:04 -0600 Jens Axboe wrote: > > On 06/22/2017 09:24 PM, Stephen Rothwell wrote: > > Hi Jens, > > > > On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe wrote: > >> > >> I'll cherry pick that commit into the 4.13 branch to get this resolved. > > > > Merging comm

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

On 06/22/2017 09:24 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe wrote: >> >> I'll cherry pick that commit into the 4.13 branch to get this resolved. > > Merging commit 8e8320c9315c might give a better result ... To be clear, what I meant (and did) wa

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

On 06/22/2017 09:24 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe wrote: >> >> I'll cherry pick that commit into the 4.13 branch to get this resolved. > > Merging commit 8e8320c9315c might give a better result ... I don't want to pull the whole thing i

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

Hi Jens, On Thu, 22 Jun 2017 21:09:22 -0600 Jens Axboe wrote: > > I'll cherry pick that commit into the 4.13 branch to get this resolved. Merging commit 8e8320c9315c might give a better result ... -- Cheers, Stephen Rothwell

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

On 06/22/2017 09:06 PM, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in: > > block/blk-mq-sched.c > > between commit: > > 8e8320c9315c ("blk-mq: fix performance regression with shared tags") > > from Linus' tree and commits: > > d2c0d3

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

On Fri, Jul 08, 2016 at 02:14:29PM +1000, Stephen Rothwell wrote: > Hi all, > > On Fri, 8 Jul 2016 13:07:50 +1000 Stephen Rothwell > wrote: > > > > + * Get the bios in the request so we can re-queue them. > > + */ > > - if (shadow[j].reques

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

Hi all, On Fri, 8 Jul 2016 13:07:50 +1000 Stephen Rothwell wrote: > > + * Get the bios in the request so we can re-queue them. > + */ > - if (shadow[j].request->cmd_flags & > - (REQ_FLUSH | REQ_FUA

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

On 05/02/2016 10:25 PM, Stephen Rothwell wrote: Hi Jens, Today's linux-next merge of the block tree got a conflict in: drivers/nvme/host/pci.c between commit: 9bf2b972afea ("NVMe: Fix reset/remove race") from Linus' tree and commit: bb8d261e0888 ("nvme: introduce a controller state

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

On 01/21/2016 03:46 PM, Stephen Rothwell wrote: Hi Jens, On Thu, 31 Dec 2015 14:34:57 +1100 Stephen Rothwell wrote: Today's linux-next merge of the block tree got a conflict in: drivers/nvme/host/pci.c between commit: b5875222de2f ("NVMe: IO ending fixes on surprise removal") from

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

Hi Jens, On Thu, 31 Dec 2015 14:34:57 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the block tree got a conflict in: > > drivers/nvme/host/pci.c > > between commit: > > b5875222de2f ("NVMe: IO ending fixes on surprise removal") > > from Linus' tree and commit: > > 5ba

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

On Mon, Jun 01 2015 at 12:56am -0400, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > drivers/md/dm.c between commits 3a1407559a59 ("dm: fix NULL pointer > when clone_and_map_rq returns !DM_MAPIO_REMAPPED") and e5d8de32cc02 > ("dm: fix false

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

On Wed, Oct 31, 2012 at 01:55:14PM +, Ben Hutchings wrote: > On Wed, 2012-10-31 at 13:04 +1100, Stephen Rothwell wrote: > > Hi Jens, > > > > Today's linux-next merge of the block tree got a conflict in > > drivers/block/floppy.c between a set of common patches from Linus' tree > > and commit b

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

On 2012-10-31 14:55, Ben Hutchings wrote: > On Wed, 2012-10-31 at 13:04 +1100, Stephen Rothwell wrote: >> Hi Jens, >> >> Today's linux-next merge of the block tree got a conflict in >> drivers/block/floppy.c between a set of common patches from Linus' tree >> and commit b33d002f4b6b ("genhd: Make p

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

On Wed, 2012-10-31 at 13:04 +1100, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > drivers/block/floppy.c between a set of common patches from Linus' tree > and commit b33d002f4b6b ("genhd: Make put_disk() safe for disks that have > not been re