All of lore.kernel.org
 help / color / mirror / Atom feed
From: danielroschka@phoenitydawn.de (Daniel Roschka)
Subject: [GIT PULL] nvme patches for 4.11
Date: Wed, 22 Feb 2017 23:10:33 +0100	[thread overview]
Message-ID: <12639552.D9MSj1FbeR@buzzard> (raw)
In-Reply-To: <d6ec5d30-84d6-706b-cfc9-1927619b585e@kernel.dk>

On Wednesday, 22. February 2017, 20:41:11 CET you wrote:
> A few issues with this:
> 
> - It throws a merge conflict. No big deal, that was easy enough
>   to fix up.
> 
> - What is this based on? Looks like some version of my for-next,
>   but ends up duplicating 4 patches from me. I don't remember
>   if I rebased my for-next this time around, but I often do. It's
>   not a stable branch like the for-4.xx/topic branches.
> 
> - Out of 22 patches, one commit reverts another commit. That should
>   just have been squashed.
> 
> I ended up simply fixing all of that up, and generating the patches
> and applying. Otherwise the whole history would have been a mess.

Urgs, I don't know what went wrong with the pull request from Sagi, but at 
least the change in there I authored is fundamently different from what I 
submitted!

Looking at git://git.infradead.org/nvme.git nvme-4.11, instead of my original 
patch adding a device ID for another NVMe controller for MacBooks, this branch 
replaces the original entry! That'd be a regression for all MacBook8,1 out 
there!

See http://git.kernel.dk/cgit/linux-block/commit/?h=for-linus&id=4f6cc1c29b0b5d3a964d5ad0cbe7c48e6c44686f
vs. http://lists.infradead.org/pipermail/linux-nvme/2017-February/008323.html

How do we get that fixed?

Best,
Daniel

  reply	other threads:[~2017-02-22 22:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-22 19:31 [GIT PULL] nvme patches for 4.11 Sagi Grimberg
2017-02-22 20:28 ` Jens Axboe
2017-02-22 20:41   ` Jens Axboe
2017-02-22 22:10     ` Daniel Roschka [this message]
2017-02-22 22:16       ` Jens Axboe
2017-02-22 22:18         ` Jens Axboe
2017-02-23 10:16         ` Sagi Grimberg
2017-02-23 10:10     ` Sagi Grimberg
2017-02-23 10:06   ` Sagi Grimberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=12639552.D9MSj1FbeR@buzzard \
    --to=danielroschka@phoenitydawn.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.