kernel: 5.15: update Aquantia PHY driver to v6.1 code

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 020-v6.3-20-mm-support-POSIX_FADV_NOREUSE.patch

diff --git a/target/linux/generic/backport-5.15/020-v6.3-20-mm-support-POSIX_FADV_NOREUSE.patch b/target/linux/generic/backport-5.15/020-v6.3-20-mm-support-POSIX_FADV_NOREUSE.patch
index 75f74114c67de3e7c901f72de36cf09496c4747b..3bb075bf367a916dd0784f2a2e057da8d620cf10 100644 (file)
--- a/target/linux/generic/backport-5.15/020-v6.3-20-mm-support-POSIX_FADV_NOREUSE.patch
+++ b/target/linux/generic/backport-5.15/020-v6.3-20-mm-support-POSIX_FADV_NOREUSE.patch
@@ -79,11 +79,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  mm/fadvise.c              | 5 ++++-
  3 files changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 23ecfecdc450..601e52991f4a 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -167,6 +167,8 @@ typedef int (dio_iodone_t)(struct kiocb *iocb, loff_t offset,
+@@ -167,6 +167,8 @@ typedef int (dio_iodone_t)(struct kiocb
  /* File is stream-like */
  #define FMODE_STREAM          ((__force fmode_t)0x200000)
  
@@ -92,11 +90,9 @@ index 23ecfecdc450..601e52991f4a 100644
  /* File was opened by fanotify and shouldn't generate fanotify events */
  #define FMODE_NONOTIFY                ((__force fmode_t)0x4000000)
  
-diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
-index e8c723053a52..8a6a2a23f9b6 100644
 --- a/include/linux/mm_inline.h
 +++ b/include/linux/mm_inline.h
-@@ -339,6 +339,9 @@ static inline bool vma_has_recency(struct vm_area_struct *vma)
+@@ -339,6 +339,9 @@ static inline bool vma_has_recency(struc
        if (vma->vm_flags & (VM_SEQ_READ | VM_RAND_READ))
                return false;
  
@@ -106,11 +102,9 @@ index e8c723053a52..8a6a2a23f9b6 100644
        return true;
  }
  
-diff --git a/mm/fadvise.c b/mm/fadvise.c
-index d6baa4f451c5..e8023c69f219 100644
 --- a/mm/fadvise.c
 +++ b/mm/fadvise.c
-@@ -80,7 +80,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
+@@ -80,7 +80,7 @@ int generic_fadvise(struct file *file, l
        case POSIX_FADV_NORMAL:
                file->f_ra.ra_pages = bdi->ra_pages;
                spin_lock(&file->f_lock);
@@ -119,7 +113,7 @@ index d6baa4f451c5..e8023c69f219 100644
                spin_unlock(&file->f_lock);
                break;
        case POSIX_FADV_RANDOM:
-@@ -107,6 +107,9 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
+@@ -107,6 +107,9 @@ int generic_fadvise(struct file *file, l
                force_page_cache_readahead(mapping, file, start_index, nrpages);
                break;
        case POSIX_FADV_NOREUSE:
@@ -129,6 +123,3 @@ index d6baa4f451c5..e8023c69f219 100644
                break;
        case POSIX_FADV_DONTNEED:
                if (!inode_write_congested(mapping->host))
--- 
-2.40.0
-