---- linux-5.1/net/sunrpc/Kconfig~ 2019-05-06 02:42:58.000000000 +0200
-+++ linux-5.1/net/sunrpc/Kconfig 2019-05-10 12:54:36.566903892 +0200
-@@ -34,7 +34,7 @@ config RPCSEC_GSS_KRB5
+; https://lkml.org/lkml/2019/7/10/244
+diff -ur linux-5.3/drivers/scsi/aacraid.org/aacraid.h linux-5.3/drivers/scsi/aacraid/aacraid.h
+--- linux-5.3/drivers/scsi/aacraid.org/aacraid.h 2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/aacraid.h 2019-11-04 09:29:51.321486211 +0100
+@@ -2740,17 +2740,6 @@
+ int aac_rx_deliver_producer(struct fib * fib);
+ void aac_reinit_aif(struct aac_dev *aac, unsigned int index);
- If unsure, say Y.
+-static inline int aac_is_src(struct aac_dev *dev)
+-{
+- u16 device = dev->pdev->device;
+-
+- if (device == PMC_DEVICE_S6 ||
+- device == PMC_DEVICE_S7 ||
+- device == PMC_DEVICE_S8)
+- return 1;
+- return 0;
+-}
+-
+ static inline int aac_supports_2T(struct aac_dev *dev)
+ {
+ return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
+diff -ur linux-5.3/drivers/scsi/aacraid.org/comminit.c linux-5.3/drivers/scsi/aacraid/comminit.c
+--- linux-5.3/drivers/scsi/aacraid.org/comminit.c 2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/comminit.c 2019-11-04 09:29:51.321486211 +0100
+@@ -41,8 +41,11 @@
+ {
+ u32 status = 0;
--config CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES
-+config SUNRPC_DISABLE_INSECURE_ENCTYPES
- bool "Secure RPC: Disable insecure Kerberos encryption types"
- depends on RPCSEC_GSS_KRB5
- default n
-Move setting up operation and write hint to xfs_alloc_ioend, and\r
-then just copy over all needed information from the previous bio\r
-in xfs_chain_bio and stop passing various parameters to it.\r
-\r
-Signed-off-by: Christoph Hellwig <hch@lst.de>\r
----\r
- fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------\r
- 1 file changed, 17 insertions(+), 18 deletions(-)\r
-\r
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c\r
-index a6f0f4761a37..9cceb90e77c5 100644\r
---- a/fs/xfs/xfs_aops.c\r
-+++ b/fs/xfs/xfs_aops.c\r
-@@ -665,7 +665,6 @@ xfs_submit_ioend(\r
- \r
- ioend->io_bio->bi_private = ioend;\r
- ioend->io_bio->bi_end_io = xfs_end_bio;\r
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
- \r
- /*\r
- * If we are failing the IO now, just mark the ioend with an\r
-@@ -679,7 +678,6 @@ xfs_submit_ioend(\r
- return status;\r
- }\r
- \r
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;\r
- submit_bio(ioend->io_bio);\r
- return 0;\r
- }\r
-@@ -691,7 +689,8 @@ xfs_alloc_ioend(\r
- xfs_exntst_t state,\r
- xfs_off_t offset,\r
- struct block_device *bdev,\r
-- sector_t sector)\r
-+ sector_t sector,\r
-+ struct writeback_control *wbc)\r
- {\r
- struct xfs_ioend *ioend;\r
- struct bio *bio;\r
-@@ -699,6 +698,8 @@ xfs_alloc_ioend(\r
- bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);\r
- bio_set_dev(bio, bdev);\r
- bio->bi_iter.bi_sector = sector;\r
-+ bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
-+ bio->bi_write_hint = inode->i_write_hint;\r
- \r
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);\r
- INIT_LIST_HEAD(&ioend->io_list);\r
-@@ -719,24 +720,22 @@ xfs_alloc_ioend(\r
- * so that the bi_private linkage is set up in the right direction for the\r
- * traversal in xfs_destroy_ioend().\r
- */\r
--static void\r
-+static struct bio *\r
- xfs_chain_bio(\r
-- struct xfs_ioend *ioend,\r
-- struct writeback_control *wbc,\r
-- struct block_device *bdev,\r
-- sector_t sector)\r
-+ struct bio *prev)\r
- {\r
- struct bio *new;\r
- \r
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);\r
-- bio_set_dev(new, bdev);\r
-- new->bi_iter.bi_sector = sector;\r
-- bio_chain(ioend->io_bio, new);\r
-- bio_get(ioend->io_bio); /* for xfs_destroy_ioend */\r
-- ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
-- ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;\r
-- submit_bio(ioend->io_bio);\r
-- ioend->io_bio = new;\r
-+ bio_copy_dev(new, prev);\r
-+ new->bi_iter.bi_sector = bio_end_sector(prev);\r
-+ new->bi_opf = prev->bi_opf;\r
-+ new->bi_write_hint = prev->bi_write_hint;\r
-+\r
-+ bio_chain(prev, new);\r
-+ bio_get(prev); /* for xfs_destroy_ioend */\r
-+ submit_bio(prev);\r
-+ return new;\r
- }\r
- \r
- /*\r
-@@ -771,14 +770,14 @@ xfs_add_to_ioend(\r
- if (wpc->ioend)\r
- list_add(&wpc->ioend->io_list, iolist);\r
- wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,\r
-- wpc->imap.br_state, offset, bdev, sector);\r
-+ wpc->imap.br_state, offset, bdev, sector, wbc);\r
- }\r
- \r
- if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) {\r
- if (iop)\r
- atomic_inc(&iop->write_count);\r
- if (bio_full(wpc->ioend->io_bio))\r
-- xfs_chain_bio(wpc->ioend, wbc, bdev, sector);\r
-+ wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);\r
- bio_add_page(wpc->ioend->io_bio, page, len, poff);\r
- }\r
- \r
--- \r
-2.20.1\r
-\r
-\r
-Link every newly allocated writeback bio to cgroup pointed to by the\r
-writeback control structure, and charge every byte written back to it.\r
-\r
-Tested-by: Stefan Priebe - Profihost AG <s.priebe@profihost.ag>\r
-Signed-off-by: Christoph Hellwig <hch@lst.de>\r
----\r
- fs/xfs/xfs_aops.c | 4 +++-\r
- fs/xfs/xfs_super.c | 2 ++\r
- 2 files changed, 5 insertions(+), 1 deletion(-)\r
-\r
-diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c\r
-index 9cceb90e77c5..73c291aeae17 100644\r
---- a/fs/xfs/xfs_aops.c\r
-+++ b/fs/xfs/xfs_aops.c\r
-@@ -700,6 +700,7 @@ xfs_alloc_ioend(\r
- bio->bi_iter.bi_sector = sector;\r
- bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);\r
- bio->bi_write_hint = inode->i_write_hint;\r
-+ wbc_init_bio(wbc, bio);\r
- \r
- ioend = container_of(bio, struct xfs_ioend, io_inline_bio);\r
- INIT_LIST_HEAD(&ioend->io_list);\r
-@@ -727,7 +728,7 @@ xfs_chain_bio(\r
- struct bio *new;\r
- \r
- new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);\r
-- bio_copy_dev(new, prev);\r
-+ bio_copy_dev(new, prev);/* also copies over blkcg information */\r
- new->bi_iter.bi_sector = bio_end_sector(prev);\r
- new->bi_opf = prev->bi_opf;\r
- new->bi_write_hint = prev->bi_write_hint;\r
-@@ -782,6 +783,7 @@ xfs_add_to_ioend(\r
- }\r
- \r
- wpc->ioend->io_size += len;\r
-+ wbc_account_io(wbc, page, len);\r
- }\r
- \r
- STATIC void\r
-diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c\r
-index 594c119824cc..ee0df8f611ff 100644\r
---- a/fs/xfs/xfs_super.c\r
-+++ b/fs/xfs/xfs_super.c\r
-@@ -1685,6 +1685,8 @@ xfs_fs_fill_super(\r
- sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits);\r
- sb->s_max_links = XFS_MAXLINK;\r
- sb->s_time_gran = 1;\r
-+ sb->s_iflags |= SB_I_CGROUPWB;\r
-+\r
- set_posix_acl_flag(sb);\r
- \r
- /* version 5 superblocks support inode version counters. */\r
--- \r
-2.20.1\r
-\r
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ status = src_readl(dev, MUnit.OMR);
++ }
+ return (status & AAC_INT_MODE_MSIX);
+ }
+
+@@ -349,7 +352,8 @@
+ /* FIB should be freed only after getting the response from the F/W */
+ if (status != -ERESTARTSYS)
+ aac_fib_free(fibctx);
+- if (aac_is_src(dev) &&
++ if ((dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) &&
+ dev->msi_enabled)
+ aac_set_intx_mode(dev);
+ return status;
+@@ -610,7 +614,8 @@
+ dev->max_fib_size = status[1] & 0xFFE0;
+ host->sg_tablesize = status[2] >> 16;
+ dev->sg_tablesize = status[2] & 0xFFFF;
+- if (aac_is_src(dev)) {
++ if (dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ if (host->can_queue > (status[3] >> 16) -
+ AAC_NUM_MGT_FIB)
+ host->can_queue = (status[3] >> 16) -
+@@ -629,7 +634,9 @@
+ pr_warn("numacb=%d ignored\n", numacb);
+ }
+
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8)
+ aac_define_int_mode(dev);
+ /*
+ * Ok now init the communication subsystem
+diff -ur linux-5.3/drivers/scsi/aacraid.org/commsup.c linux-5.3/drivers/scsi/aacraid/commsup.c
+--- linux-5.3/drivers/scsi/aacraid.org/commsup.c 2019-11-01 22:42:37.014803249 +0100
++++ linux-5.3/drivers/scsi/aacraid/commsup.c 2019-11-04 09:29:51.321486211 +0100
+@@ -2593,7 +2593,9 @@
+ {
+ int i;
+
+- if (aac_is_src(dev)) {
++ if (dev->pdev->device == PMC_DEVICE_S6 ||
++ dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8) {
+ if (dev->max_msix > 1) {
+ for (i = 0; i < dev->max_msix; i++)
+ free_irq(pci_irq_vector(dev->pdev, i),
+diff -ur linux-5.3/drivers/scsi/aacraid.org/linit.c linux-5.3/drivers/scsi/aacraid/linit.c
+--- linux-5.3/drivers/scsi/aacraid.org/linit.c 2019-11-01 22:42:37.011469816 +0100
++++ linux-5.3/drivers/scsi/aacraid/linit.c 2019-11-04 09:29:51.321486211 +0100
+@@ -1567,8 +1567,9 @@
+ aac_send_shutdown(aac);
+
+ aac_adapter_disable_int(aac);
+-
+- if (aac_is_src(aac)) {
++ if (aac->pdev->device == PMC_DEVICE_S6 ||
++ aac->pdev->device == PMC_DEVICE_S7 ||
++ aac->pdev->device == PMC_DEVICE_S8) {
+ if (aac->max_msix > 1) {
+ for (i = 0; i < aac->max_msix; i++) {
+ free_irq(pci_irq_vector(aac->pdev, i),
+@@ -1858,7 +1859,8 @@
+ aac_adapter_enable_int(dev);
+
+
+- if (aac_is_src(dev))
++ if (dev->pdev->device == PMC_DEVICE_S7 ||
++ dev->pdev->device == PMC_DEVICE_S8)
+ aac_define_int_mode(dev);
+
+ if (dev->msi_enabled)
+
+--- linux-5.7/scripts/ld-version.sh~ 2020-06-01 01:49:15.000000000 +0200
++++ linux-5.7/scripts/ld-version.sh 2020-06-02 08:28:48.303207264 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/awk -f
++#!/bin/awk -f
+ # SPDX-License-Identifier: GPL-2.0
+ # extract linker version number from stdin and turn into single number
+ {
projects / packages / kernel.git / blobdiff