@@ -1,6 +1,6 @@

 Summary:	Linux API header files

 Name:		linux-api-headers

-Version:	4.9.124

+Version:	4.9.130

 Release:	1%{?dist}

 License:	GPLv2

 URL:		http://www.kernel.org/

@@ -8,7 +8,7 @@ Group:		System Environment/Kernel

 Vendor:		VMware, Inc.

 Distribution: Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=8ec9a8969df8d37c6e716c264a23c818eed98780

+%define sha1 linux=59621537cc8891aa3d0d77b2892db7828a0098f9

 BuildArch:	noarch

 Patch0:         Implement-the-f-xattrat-family-of-functions.patch

 %description

@@ -27,6 +27,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de

 %defattr(-,root,root)

 %{_includedir}/*

 %changelog

+*   Mon Oct 01 2018 srinidhira0 <srinidhir@vmware.com> 4.9.130-1

+-   Update to version 4.9.130

 *   Thu Aug 30 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.124-1

 -   Update to version 4.9.124

 *   Fri Aug 17 2018 Bo Gan <ganb@vmware.com> 4.9.120-1

@@ -24,7 +24,7 @@ CR: https://cr.amazon.com/r/7367683/

  1 file changed, 92 insertions(+), 1 deletion(-)

 diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c

-index 8d498a9..7e5233e 100644

+index 3c1adb3..c199adc 100644

 --- a/drivers/net/xen-netfront.c

 +++ b/drivers/net/xen-netfront.c

 @@ -43,6 +43,7 @@

@@ -48,7 +48,7 @@ index 8d498a9..7e5233e 100644

  /* Module parameters */

  static unsigned int xennet_max_queues;

  module_param_named(max_queues, xennet_max_queues, uint, 0644);

-@@ -157,6 +164,10 @@ struct netfront_info {

+@@ -159,6 +166,10 @@ struct netfront_info {

  	struct netfront_stats __percpu *tx_stats;

  	atomic_t rx_gso_checksum_fixup;

@@ -59,7 +59,7 @@ index 8d498a9..7e5233e 100644

  };

  struct netfront_rx_info {

-@@ -717,6 +728,21 @@ static int xennet_close(struct net_device *dev)

+@@ -722,6 +733,21 @@ static int xennet_close(struct net_device *dev)

  	return 0;

  }

@@ -81,7 +81,7 @@ index 8d498a9..7e5233e 100644

  static void xennet_move_rx_slot(struct netfront_queue *queue, struct sk_buff *skb,

  				grant_ref_t ref)

  {

-@@ -1312,6 +1338,8 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)

+@@ -1323,6 +1349,8 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)

  	np->queues = NULL;

@@ -90,7 +90,7 @@ index 8d498a9..7e5233e 100644

  	err = -ENOMEM;

  	np->rx_stats = netdev_alloc_pcpu_stats(struct netfront_stats);

  	if (np->rx_stats == NULL)

-@@ -1814,6 +1842,51 @@ static int xennet_create_queues(struct netfront_info *info,

+@@ -1815,6 +1843,51 @@ static int xennet_create_queues(struct netfront_info *info,

  	return 0;

  }

@@ -142,7 +142,7 @@ index 8d498a9..7e5233e 100644

  /* Common code used when first setting up, and when resuming. */

  static int talk_to_netback(struct xenbus_device *dev,

  			   struct netfront_info *info)

-@@ -2016,6 +2089,8 @@ static int xennet_connect(struct net_device *dev)

+@@ -2030,6 +2103,8 @@ static int xennet_connect(struct net_device *dev)

  		spin_unlock_bh(&queue->rx_lock);

  	}

@@ -151,10 +151,10 @@ index 8d498a9..7e5233e 100644

  	return 0;

  }

-@@ -2054,11 +2129,25 @@ static void netback_changed(struct xenbus_device *dev,

+@@ -2067,10 +2142,23 @@ static void netback_changed(struct xenbus_device *dev,

+ 		break;

  	case XenbusStateClosed:

- 		wake_up_all(&module_unload_q);

 -		if (dev->state == XenbusStateClosed)

 +		if (dev->state == XenbusStateClosed) {

 +			/* dpm context is waiting for the backend */

@@ -164,21 +164,19 @@ index 8d498a9..7e5233e 100644

 +		}

  		/* Missed the backend's CLOSING state -- fallthrough */

  	case XenbusStateClosing:

- 		wake_up_all(&module_unload_q);

 +

 +		/* We may see unexpected Closed or Closing from the backend.

 +		 * Just ignore it not to prevent the frontend from being

 +		 * re-connected in the case of PM suspend or hibernation.

 +		 */

 +		if (np->freeze_state == NETIF_FREEZE_STATE_FROZEN &&

-+		    dev->state == XenbusStateInitialising) {

++			dev->state == XenbusStateInitialising) {

 +			break;

 +		}

-+

  		xenbus_frontend_closed(dev);

  		break;

  	}

-@@ -2181,6 +2269,9 @@ static struct xenbus_driver netfront_driver = {

+@@ -2217,6 +2305,9 @@ static struct xenbus_driver netfront_driver = {

  	.probe = netfront_probe,

  	.remove = xennet_remove,

  	.resume = netfront_resume,

@@ -188,6 +186,3 @@ index 8d498a9..7e5233e 100644

  	.otherend_changed = netback_changed,

  };

-2.7.5

-

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-aws

-Version:        4.9.124

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.130

+Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution: 	Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=8ec9a8969df8d37c6e716c264a23c818eed98780

+%define sha1 linux=59621537cc8891aa3d0d77b2892db7828a0098f9

 Source1:	config-aws

 Source2:	initramfs.trigger

 # common

@@ -443,6 +443,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Mon Oct 01 2018 srinidhira0 <srinidhir@vmware.com> 4.9.130-1

+-   Update to version 4.9.130

 *   Mon Sep 10 2018 Srinidhi Rao <srinidhir@vmware.com> 4.9.124-2

 -   Fix for CVE-2018-13053

 *   Fri Aug 24 2018 Bo Gan <ganb@vmware.com> 4.9.124-1

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-esx

-Version:        4.9.124

-Release:        2%{?dist}

+Version:        4.9.130

+Release:        1%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=8ec9a8969df8d37c6e716c264a23c818eed98780

+%define sha1 linux=59621537cc8891aa3d0d77b2892db7828a0098f9

 Source1:        config-esx

 Source2:        initramfs.trigger

 # common

@@ -35,7 +35,6 @@ Patch17:        04-quiet-boot.patch

 Patch18:        05-pv-ops-clocksource.patch

 Patch19:        06-pv-ops-boot_clock.patch

 Patch20:        07-vmware-only.patch

-Patch21:        vmware-balloon-late-initcall.patch

 Patch22:        add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch

 # Fix CVE-2017-1000252

 Patch24:        kvm-dont-accept-wrong-gsi-values.patch

@@ -123,7 +122,6 @@ The Linux package contains the Linux kernel doc files

 %patch18 -p1

 %patch19 -p1

 %patch20 -p1

-%patch21 -p1

 %patch22 -p1

 %patch24 -p1

 %patch25 -p1

@@ -146,8 +144,6 @@ The Linux package contains the Linux kernel doc files

 %build

-# patch vmw_balloon driver

-sed -i 's/module_init/late_initcall/' drivers/misc/vmw_balloon.c

 make mrproper

 cp %{SOURCE1} .config

@@ -240,6 +236,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Mon Oct 01 2018 srinidhira0 <srinidhir@vmware.com> 4.9.130-1

+-   Update to version 4.9.130

 *   Mon Sep 10 2018 Srinidhi Rao <srinidhir@vmware.com> 4.9.124-2

 -   Fix for CVE-2018-13053

 *   Fri Aug 24 2018 Bo Gan <ganb@vmware.com> 4.9.124-1

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux-secure

-Version:        4.9.124

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.130

+Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=8ec9a8969df8d37c6e716c264a23c818eed98780

+%define sha1 linux=59621537cc8891aa3d0d77b2892db7828a0098f9

 Source1:        config-secure

 Source2:        aufs4.9.tar.gz

 %define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906

@@ -219,8 +219,6 @@ popd

 %endif

 %build

-# patch vmw_balloon driver

-sed -i 's/module_init/late_initcall/' drivers/misc/vmw_balloon.c

 make mrproper

 cp %{SOURCE1} .config

@@ -336,6 +334,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Mon Oct 01 2018 srinidhira0 <srinidhir@vmware.com> 4.9.130-1

+-   Update to version 4.9.130

 *   Mon Sep 10 2018 Srinidhi Rao <srinidhir@vmware.com> 4.9.124-2

 -   Fix for CVE-2018-13053

 *   Fri Aug 24 2018 Bo Gan <ganb@vmware.com> 4.9.124-1

@@ -1,15 +1,15 @@

 %global security_hardening none

 Summary:        Kernel

 Name:           linux

-Version:        4.9.124

-Release:        2%{?kat_build:.%kat_build}%{?dist}

+Version:        4.9.130

+Release:        1%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

 Vendor:         VMware, Inc.

 Distribution: 	Photon

 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz

-%define sha1 linux=8ec9a8969df8d37c6e716c264a23c818eed98780

+%define sha1 linux=59621537cc8891aa3d0d77b2892db7828a0098f9

 Source1:	config

 Source2:	initramfs.trigger

 %define ena_version 1.1.3

@@ -366,6 +366,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Mon Oct 01 2018 srinidhira0 <srinidhir@vmware.com> 4.9.130-1

+-   Update to version 4.9.130

 *   Mon Sep 10 2018 Srinidhi Rao <srinidhir@vmware.com> 4.9.124-2

 -   Fix for CVE-2018-13053

 *   Fri Aug 24 2018 Bo Gan <ganb@vmware.com> 4.9.124-1

deleted file mode 100644

@@ -1,26 +0,0 @@

-From 79e9fe45e1c96e04a02a0fcf6f4d11623d1e810b Mon Sep 17 00:00:00 2001

-From: Alexey Makhalov <amakhalov@vmware.com>

-Date: Wed, 10 May 2017 15:24:33 -0700

-Subject: [PATCH] vmware balloon late initcall

-

-Initialize balloon driver later (after vmci)

- drivers/misc/vmw_balloon.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

-diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c

-index 1e688bfec567..6944c55b9ee4 100644

-+++ b/drivers/misc/vmw_balloon.c

-@@ -1298,7 +1298,7 @@ static int __init vmballoon_init(void)

- 

- 	return 0;

- }

--module_init(vmballoon_init);

-+late_initcall(vmballoon_init);

- 

- static void __exit vmballoon_exit(void)

- {

-2.11.0

-