diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-19 21:56:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-19 21:56:23 +0100 |
commit | 3872f516aab34e3adeb7eda43b29c1ecd852cee1 (patch) | |
tree | e0f22af92953ea54d4195eca2062d8a39cdf1b6e /drivers/block | |
parent | Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff) | |
parent | xen: Kconfig: remove X86_64 depends from XEN_512GB (diff) | |
download | linux-3872f516aab34e3adeb7eda43b29c1ecd852cee1.tar.xz linux-3872f516aab34e3adeb7eda43b29c1ecd852cee1.zip |
Merge tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull more xen updates from Juergen Gross:
"Some minor cleanup patches and a small series disentangling some Xen
related Kconfig options"
* tag 'for-linus-5.11-rc1b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: Kconfig: remove X86_64 depends from XEN_512GB
xen/manage: Fix fall-through warnings for Clang
xen-blkfront: Fix fall-through warnings for Clang
xen: remove trailing semicolon in macro definition
xen: Kconfig: nest Xen guest options
xen: Remove Xen PVH/PVHVM dependency on PCI
x86/xen: Convert to DEFINE_SHOW_ATTRIBUTE
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/xen-blkfront.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 188e0b47534b..5265975b3fba 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -2462,6 +2462,7 @@ static void blkback_changed(struct xenbus_device *dev, break; if (talk_to_blkback(dev, info)) break; + break; case XenbusStateInitialising: case XenbusStateInitialised: case XenbusStateReconfiguring: |