This is a note to let you know that I've just added the patch titled
Revert "uapi: fix linux/rds.h userspace compilation errors"
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-uapi-fix-linux-rds.h-userspace-compilation-errors.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Nov 19 12:16:40 CET 2017
From: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Date: Mon, 13 Nov 2017 18:03:32 -0500
Subject: Revert "uapi: fix linux/rds.h userspace compilation errors"
From: Sasha Levin <alexander.levin@xxxxxxxxxxx>
This reverts commit ad50561ba7a664bc581826c9d57d137fcf17bfa5.
There was a mixup with the commit message for two upstream commit
that have the same subject line.
This revert will be followed by the two commits with proper commit
messages.
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
include/uapi/linux/rds.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -35,7 +35,6 @@
#define _LINUX_RDS_H
#include <linux/types.h>
-#include <linux/socket.h> /* For __kernel_sockaddr_storage. */
#define RDS_IB_ABI_VERSION 0x301
@@ -214,7 +213,7 @@ struct rds_get_mr_args {
};
struct rds_get_mr_for_dest_args {
- struct __kernel_sockaddr_storage dest_addr;
+ struct sockaddr_storage dest_addr;
struct rds_iovec vec;
uint64_t cookie_addr;
uint64_t flags;
Patches currently in stable-queue which might be from alexander.levin@xxxxxxxxxxx are
queue-3.18/ata-sata_mv-should-depend-on-has_dma.patch
queue-3.18/ixgbe-handle-close-suspend-race-with-netif_device_detach-present.patch
queue-3.18/scsi-lpfc-correct-host-name-in-symbolic_name-field.patch
queue-3.18/alsa-vx-don-t-try-to-update-capture-stream-before-running.patch
queue-3.18/gpu-drm-mgag200-mgag200_main-handle-error-from-pci_iomap.patch
queue-3.18/staging-rtl8188eu-fix-incorrect-error-tags-from-logs.patch
queue-3.18/uapi-fix-linux-rds.h-userspace-compilation-error.patch
queue-3.18/ata-sata_highbank-should-depend-on-has_dma.patch
queue-3.18/extcon-palmas-check-the-parent-instance-to-prevent-the-null.patch
queue-3.18/scsi-lpfc-fcoe-vport-enable-disable-does-not-bring-up-the-vport.patch
queue-3.18/mips-netlogic-exclude-netlogic-xlp-pic-code-from-xlr-builds.patch
queue-3.18/drm-sti-sti_vtg-handle-return-null-error-from-devm_ioremap_nocache.patch
queue-3.18/scsi-lpfc-correct-issue-leading-to-oops-during-link-reset.patch
queue-3.18/igb-fix-hw_dbg-logging-in-igb_update_flash_i210.patch
queue-3.18/arm-dts-fix-omap3-off-mode-pull-defines.patch
queue-3.18/uapi-fix-linux-rds.h-userspace-compilation-errors.patch
queue-3.18/scsi-lpfc-add-missing-memory-barrier.patch
queue-3.18/alsa-vx-fix-possible-transfer-overflow.patch
queue-3.18/backlight-lcd-fix-race-condition-during-register.patch
queue-3.18/revert-crypto-xts-add-ecb-dependency.patch
queue-3.18/backlight-adp5520-fix-error-handling-in-adp5520_bl_probe.patch
queue-3.18/ixgbe-fix-aer-error-handling.patch
queue-3.18/revert-uapi-fix-linux-rds.h-userspace-compilation-errors.patch
queue-3.18/mips-end-asm-function-prologue-macros-with-.insn.patch
queue-3.18/ata-ata_bmdma-should-depend-on-has_dma.patch
queue-3.18/igb-close-suspend-race-in-netif_device_detach.patch
queue-3.18/igb-reset-the-phy-before-reading-the-phy-id.patch
queue-3.18/mips-init-ensure-reserved-memory-regions-are-not-added-to-bootmem.patch
queue-3.18/arm-omap2-fix-init-for-multiple-quirks-for-the-same-soc.patch