version 4.3.3-7

As usual - updated config and patches for new version.

patches.rpmify/makefile-after_link.patch

@@ -64,10 +64,10 @@ index 2a8ddfd..452ca53 100644
  quiet_cmd_vdso64as = VDSO64A $@
        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
  
-diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
+diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
 index fd14be1..1f3eb19 100644
---- a/arch/x86/vdso/Makefile
+--- a/arch/x86/entry/vdso/Makefile
-+++ b/arch/x86/vdso/Makefile
++++ b/arch/x86/entry/vdso/Makefile
 @@ -178,8 +178,9 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
  quiet_cmd_vdso = VDSO    $@
        cmd_vdso = $(CC) -nostdlib -o $@ \
@@ -78,8 +78,24 @@ index fd14be1..1f3eb19 100644
 +		$(if $(AFTER_LINK),; $(AFTER_LINK)) && \
 +		sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
- VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
+ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \
  	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
+diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile
+index fd14be1..1f3eb19 100644
+--- a/arch/x86/um/vdso/Makefile
++++ b/arch/x86/um/vdso/Makefile
+@@ -71,8 +71,9 @@ $(obj)/vdso32-syms.lds: $(vdso32.so-y:%=$(obj)/vdso32-%-syms.lds) FORCE
+ quiet_cmd_vdso = VDSO    $@
+       cmd_vdso = $(CC) -nostdlib -o $@ \
+ 		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
+-		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
+-		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
++		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) \
++		$(if $(AFTER_LINK),; $(AFTER_LINK)) && \
++		sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
+ 
+ VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+ GCOV_PROFILE := n
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
 index cd9c6c6..3edf048 100644
 --- a/scripts/link-vmlinux.sh

patches.xen/pvops-blkfront-removable-flag.patch

@@ -2,18 +2,17 @@ diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
 index 4e86393..34493d7 100644
 --- a/drivers/block/xen-blkfront.c
 +++ b/drivers/block/xen-blkfront.c
-@@ -1188,7 +1188,7 @@ static void blkfront_connect(struct blkfront_info *info)
+@@ -1188,6 +1188,7 @@ static void blkfront_connect(struct blkfront_info *info)
  	unsigned int physical_sector_size;
  	unsigned int binfo;
  	int err;
--	int barrier, flush, discard, persistent;
++	int removable;
-+	int barrier, flush, discard, persistent, removable;
  
  	switch (info->connected) {
  	case BLKIF_STATE_CONNECTED:
 @@ -1266,6 +1266,12 @@ static void blkfront_connect(struct blkfront_info *info)
- 	if (!err && discard)
+ 		return;
- 		blkfront_setup_discard(info);
+ 	}
  
 +	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
 +			    "removable", "%d", &removable,
@@ -21,6 +20,6 @@ index 4e86393..34493d7 100644
 +	if (!err && removable)
 +		binfo |= VDISK_REMOVABLE;
 +
- 	err = xenbus_gather(XBT_NIL, info->xbdev->otherend,
+ 	err = xlvbd_alloc_gendisk(sectors, info, binfo, sector_size,
-			    "feature-persistent", "%u", &persistent,
+				  physical_sector_size);
- 			    NULL);
+ 	if (err) {

patches.xen/xsa155-linux312-0012-xen-blkfront-make-local-copy-of-response-before-usin.patch

@@ -48,7 +48,7 @@ index 2fee2ee..5d7eb04 100644
  		 * never have given to it (we stamp it up to BLK_RING_SIZE -
 @@ -1325,29 +1325,29 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
  		 */
- 		if (id >= BLK_RING_SIZE) {
+ 		if (id >= BLK_RING_SIZE(info)) {
  			WARN(1, "%s: response to %s has incorrect id (%ld)\n",
 -			     info->gd->disk_name, op_name(bret->operation), id);
 +			     info->gd->disk_name, op_name(bret.operation), id);
@@ -114,7 +114,7 @@ index 2fee2ee..5d7eb04 100644
 -					"request: %x\n", bret->status);
 +					"request: %x\n", bret.status);
  
- 			__blk_end_request_all(req, error);
+ 			blk_mq_complete_request(req, error);
  			break;
 -- 
 2.1.0

patches.xen/xsa155-linux318-0009-xen-netfront-copy-response-out-of-shared-buffer-befo.patch

@@ -111,7 +111,7 @@ index d6abf19..2af5100 100644
 +		if (unlikely(rx.status < 0 ||
 +			     rx.offset + rx.status > PAGE_SIZE)) {
  			if (net_ratelimit())
- 				dev_warn(dev, "rx->offset: %x, size: %u\n",
+ 				dev_warn(dev, "rx->offset: %u, size: %d\n",
 -					 rx->offset, rx->status);
 +					 rx.offset, rx.status);
  			xennet_move_rx_slot(queue, skb, ref);

version

@@ -1 +1 @@
-4.1.20
+4.3.3