From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Mon, 7 Sep 2020 14:13:06 +0000 (+0200)
Subject: Merge tag 'v5.9-rc4' into patchwork
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d13ee586e026e8166231e03e5345718ebf625c02;p=linux.git

Merge tag 'v5.9-rc4' into patchwork

Linux 5.9-rc4

* tag 'v5.9-rc4': (1001 commits)
  Linux 5.9-rc4
  io_uring: fix linked deferred ->files cancellation
  io_uring: fix cancel of deferred reqs with ->files
  include/linux/log2.h: add missing () around n in roundup_pow_of_two()
  mm/khugepaged.c: fix khugepaged's request size in collapse_file
  mm/hugetlb: fix a race between hugetlb sysctl handlers
  mm/hugetlb: try preferred node first when alloc gigantic page from cma
  mm/migrate: preserve soft dirty in remove_migration_pte()
  mm/migrate: remove unnecessary is_zone_device_page() check
  mm/rmap: fixup copying of soft dirty and uffd ptes
  mm/migrate: fixup setting UFFD_WP flag
  mm: madvise: fix vma user-after-free
  checkpatch: fix the usage of capture group ( ... )
  fork: adjust sysctl_max_threads definition to match prototype
  ipc: adjust proc_ipc_sem_dointvec definition to match prototype
  mm: track page table modifications in __apply_to_page_range()
  MAINTAINERS: IA64: mark Status as Odd Fixes only
  MAINTAINERS: add LLVM maintainers
  MAINTAINERS: update Cavium/Marvell entries
  mm: slub: fix conversion of freelist_corrupted()
  ...
---

d13ee586e026e8166231e03e5345718ebf625c02
diff --cc drivers/staging/media/atomisp/pci/atomisp_cmd.c
index a1772bbc30424,a4e4eef55f352..9f25f13c32555
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@@ -4974,9 -4981,10 +4974,9 @@@ enum mipi_port_id __get_mipi_port(struc
  	case ATOMISP_CAMERA_PORT_SECONDARY:
  		return MIPI_PORT1_ID;
  	case ATOMISP_CAMERA_PORT_TERTIARY:
 -		if (MIPI_PORT1_ID + 1 != N_MIPI_PORT_ID) {
 +		if (MIPI_PORT1_ID + 1 != N_MIPI_PORT_ID)
  			return MIPI_PORT1_ID + 1;
- 	/* fall through */
 -		}
+ 		fallthrough;
  	default:
  		dev_err(isp->dev, "unsupported port: %d\n", port);
  		return MIPI_PORT0_ID;