Commit Graph

842 Commits

Author SHA1 Message Date
Michael Bestas
157dbbdf4f Merge tag 'ASB-2024-12-05_4.19-stable' of https://android.googlesource.com/kernel/common into android-msm-pixel-4.19
https://source.android.com/docs/security/bulletin/2024-12-01

* tag 'ASB-2024-12-05_4.19-stable' of https://android.googlesource.com/kernel/common: (401 commits)
  Linux 4.19.324
  9p: fix slab cache name creation for real
  net: usb: qmi_wwan: add Fibocom FG132 0x0112 composition
  fs: Fix uninitialized value issue in from_kuid and from_kgid
  powerpc/powernv: Free name on error in opal_event_init()
  sound: Make CONFIG_SND depend on INDIRECT_IOMEM instead of UML
  bpf: use kvzmalloc to allocate BPF verifier environment
  HID: multitouch: Add quirk for HONOR MagicBook Art 14 touchpad
  9p: Avoid creating multiple slab caches with the same name
  ALSA: usb-audio: Add endianness annotations
  vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
  hv_sock: Initializing vsk->trans to NULL to prevent a dangling pointer
  ALSA: usb-audio: Add quirks for Dell WD19 dock
  ALSA: usb-audio: Support jack detection on Dell dock
  ALSA: usb-audio: Add custom mixer status quirks for RME CC devices
  ALSA: pcm: Return 0 when size < start_threshold in capture
  ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove()
  irqchip/gic-v3: Force propagation of the active state with a read-back
  USB: serial: option: add Quectel RG650V
  USB: serial: option: add Fibocom FG132 0x0112 composition
  ...

 Conflicts:
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
	drivers/usb/dwc3/gadget.c
	fs/f2fs/f2fs.h
	fs/f2fs/file.c
	fs/f2fs/xattr.c
	net/qrtr/qrtr.c

Change-Id: Icc02e115a2066e9732ea14ccb5fca6ee021cc94c
2024-12-16 01:51:21 +02:00
Anders Roxell
6a130ec2f0 scripts: kconfig: merge_config: config files: add a trailing newline
[ Upstream commit 33330bcf031818e60a816db0cfd3add9eecc3b28 ]

When merging files without trailing newlines at the end of the file, two
config fragments end up at the same row if file1.config doens't have a
trailing newline at the end of the file.

file1.config "CONFIG_1=y"
file2.config "CONFIG_2=y"
./scripts/kconfig/merge_config.sh -m .config file1.config file2.config

This will generate a .config looking like this.
cat .config
...
CONFIG_1=yCONFIG_2=y"

Making sure so we add a newline at the end of every config file that is
passed into the script.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-11-08 16:19:02 +01:00
Michael Bestas
bf15dd2933 Merge tag 'ASB-2024-09-05_4.19-stable' of https://android.googlesource.com/kernel/common into android-msm-pixel-4.19
https://source.android.com/docs/security/bulletin/2024-09-01
CVE-2024-36972

* tag 'ASB-2024-09-05_4.19-stable' of https://android.googlesource.com/kernel/common: (331 commits)
  Linux 4.19.321
  drm/fb-helper: set x/yres_virtual in drm_fb_helper_check_var
  ipc: remove memcg accounting for sops objects in do_semtimedop()
  scsi: aacraid: Fix double-free on probe failure
  usb: core: sysfs: Unmerge @usb3_hardware_lpm_attr_group in remove_power_attributes()
  usb: dwc3: st: fix probed platform device ref count on probe error path
  usb: dwc3: core: Prevent USB core invalid event buffer address access
  usb: dwc3: omap: add missing depopulate in probe error path
  USB: serial: option: add MeiG Smart SRM825L
  cdc-acm: Add DISABLE_ECHO quirk for GE HealthCare UI Controller
  net: busy-poll: use ktime_get_ns() instead of local_clock()
  gtp: fix a potential NULL pointer dereference
  soundwire: stream: fix programming slave ports for non-continous port maps
  net: prevent mss overflow in skb_segment()
  ida: Fix crash in ida_free when the bitmap is empty
  net:rds: Fix possible deadlock in rds_message_put
  fbmem: Check virtual screen sizes in fb_set_var()
  fbcon: Prevent that screen size is smaller than font size
  memcg: enable accounting of ipc resources
  cgroup/cpuset: Prevent UAF in proc_cpuset_show()
  ...

 Conflicts:
	Documentation/arm64/silicon-errata.txt
	arch/arm64/include/asm/cpucaps.h
	arch/arm64/include/asm/cputype.h
	arch/arm64/kernel/cpu_errata.c
	drivers/mmc/core/mmc_test.c

Change-Id: Id6bbf5f84f4823b601b92267408ab2025b6ba9f4
2024-10-08 21:28:41 +03:00
Michael Bestas
0d750eaafc Merge tag 'ASB-2024-08-05_4.19-stable' of https://android.googlesource.com/kernel/common into android-msm-pixel-4.19
https://source.android.com/docs/security/bulletin/2024-08-01
CVE-2024-36971

* tag 'ASB-2024-08-05_4.19-stable' of https://android.googlesource.com/kernel/common: (2363 commits)
  Linux 4.19.318
  i2c: rcar: bring hardware to known state when probing
  nilfs2: fix kernel bug on rename operation of broken directory
  SUNRPC: Fix RPC client cleaned up the freed pipefs dentries
  tcp: avoid too many retransmit packets
  tcp: use signed arithmetic in tcp_rtx_probe0_timed_out()
  net: tcp: fix unexcepted socket die when snd_wnd is 0
  tcp: refactor tcp_retransmit_timer()
  libceph: fix race between delayed_work() and ceph_monc_stop()
  hpet: Support 32-bit userspace
  USB: core: Fix duplicate endpoint bug by clearing reserved bits in the descriptor
  usb: gadget: configfs: Prevent OOB read/write in usb_string_copy()
  USB: Add USB_QUIRK_NO_SET_INTF quirk for START BP-850k
  USB: serial: option: add Rolling RW350-GL variants
  USB: serial: option: add Netprisma LCUK54 series modules
  USB: serial: option: add support for Foxconn T99W651
  USB: serial: option: add Fibocom FM350-GL
  USB: serial: option: add Telit FN912 rmnet compositions
  USB: serial: option: add Telit generic core-dump composition
  ARM: davinci: Convert comma to semicolon
  ...

 Conflicts:
	Documentation/devicetree/bindings/sound/rt5645.txt
	android/abi_gki_aarch64.xml
	drivers/clk/qcom/clk-rcg2.c
	drivers/hwtracing/coresight/coresight-etm4x.c
	drivers/leds/leds-pwm.c
	drivers/mmc/core/host.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/cqhci.c
	drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c
	drivers/rpmsg/qcom_glink_native.c
	drivers/scsi/ufs/ufshcd.c
	drivers/thermal/thermal_core.c
	drivers/usb/dwc3/core.c
	drivers/usb/gadget/function/f_ncm.c
	fs/f2fs/gc.c
	fs/pstore/ram_core.c
	include/linux/fs.h
	include/linux/timer.h
	include/net/tcp.h
	init/initramfs.c
	kernel/events/core.c
	kernel/sched/idle.c
	kernel/time/timer.c
	mm/page_alloc.c
	net/wireless/scan.c
	scripts/checkpatch.pl

Change-Id: Ice08f3ba5dc64a093bc381710ef2408d963cb983
2024-09-06 02:00:44 +03:00
Masahiro Yamada
b366d89859 kconfig: remove wrong expr_trans_bool()
[ Upstream commit 77a92660d8fe8d29503fae768d9f5eb529c88b36 ]

expr_trans_bool() performs an incorrect transformation.

[Test Code]

    config MODULES
            def_bool y
            modules

    config A
            def_bool y
            select C if B != n

    config B
            def_tristate m

    config C
            tristate

[Result]

    CONFIG_MODULES=y
    CONFIG_A=y
    CONFIG_B=m
    CONFIG_C=m

This output is incorrect because CONFIG_C=y is expected.

Documentation/kbuild/kconfig-language.rst clearly explains the function
of the '!=' operator:

    If the values of both symbols are equal, it returns 'n',
    otherwise 'y'.

Therefore, the statement:

    select C if B != n

should be equivalent to:

    select C if y

Or, more simply:

    select C

Hence, the symbol C should be selected by the value of A, which is 'y'.

However, expr_trans_bool() wrongly transforms it to:

    select C if B

Therefore, the symbol C is selected by (A && B), which is 'm'.

The comment block of expr_trans_bool() correctly explains its intention:

  * bool FOO!=n => FOO
    ^^^^

If FOO is bool, FOO!=n can be simplified into FOO. This is correct.

However, the actual code performs this transformation when FOO is
tristate:

    if (e->left.sym->type == S_TRISTATE) {
                             ^^^^^^^^^^

While it can be fixed to S_BOOLEAN, there is no point in doing so
because expr_tranform() already transforms FOO!=n to FOO when FOO is
bool. (see the "case E_UNEQUAL" part)

expr_trans_bool() is wrong and unnecessary.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-07-27 10:33:41 +02:00
Masahiro Yamada
b6d6a91b58 kconfig: gconf: give a proper initial state to the Save button
[ Upstream commit 46edf4372e336ef3a61c3126e49518099d2e2e6d ]

Currently, the initial state of the "Save" button is always active.

If none of the CONFIG options are changed while loading the .config
file, the "Save" button should be greyed out.

This can be fixed by calling conf_read() after widget initialization.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-07-27 10:33:41 +02:00
Masahiro Yamada
6bfda3ef7f kconfig: fix comparison to constant symbols, 'm', 'n'
[ Upstream commit aabdc960a283ba78086b0bf66ee74326f49e218e ]

Currently, comparisons to 'm' or 'n' result in incorrect output.

[Test Code]

    config MODULES
            def_bool y
            modules

    config A
            def_tristate m

    config B
            def_bool A > n

CONFIG_B is unset, while CONFIG_B=y is expected.

The reason for the issue is because Kconfig compares the tristate values
as strings.

Currently, the .type fields in the constant symbol definitions,
symbol_{yes,mod,no} are unspecified, i.e., S_UNKNOWN.

When expr_calc_value() evaluates 'A > n', it checks the types of 'A' and
'n' to determine how to compare them.

The left-hand side, 'A', is a tristate symbol with a value of 'm', which
corresponds to a numeric value of 1. (Internally, 'y', 'm', and 'n' are
represented as 2, 1, and 0, respectively.)

The right-hand side, 'n', has an unknown type, so it is treated as the
string "n" during the comparison.

expr_calc_value() compares two values numerically only when both can
have numeric values. Otherwise, they are compared as strings.

    symbol    numeric value    ASCII code
    -------------------------------------
      y           2             0x79
      m           1             0x6d
      n           0             0x6e

'm' is greater than 'n' if compared numerically (since 1 is greater
than 0), but smaller than 'n' if compared as strings (since the ASCII
code 0x6d is smaller than 0x6e).

Specifying .type=S_TRISTATE for symbol_{yes,mod,no} fixes the above
test code.

Doing so, however, would cause a regression to the following test code.

[Test Code 2]

    config MODULES
            def_bool n
            modules

    config A
            def_tristate n

    config B
            def_bool A = m

You would get CONFIG_B=y, while CONFIG_B should not be set.

The reason is because sym_get_string_value() turns 'm' into 'n' when the
module feature is disabled. Consequently, expr_calc_value() evaluates
'A = n' instead of 'A = m'. This oddity has been hidden because the type
of 'm' was previously S_UNKNOWN instead of S_TRISTATE.

sym_get_string_value() should not tweak the string because the tristate
value has already been correctly calculated. There is no reason to
return the string "n" where its tristate value is mod.

Fixes: 31847b67be ("kconfig: allow use of relations other than (in)equality")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-06-16 13:23:37 +02:00
Masahiro Yamada
d0687545f8 kconfig: fix infinite loop when expanding a macro at the end of file
[ Upstream commit af8bbce92044dc58e4cc039ab94ee5d470a621f5 ]

A macro placed at the end of a file with no newline causes an infinite
loop.

[Test Kconfig]
  $(info,hello)
  \ No newline at end of file

I realized that flex-provided input() returns 0 instead of EOF when it
reaches the end of a file.

Fixes: 104daea149 ("kconfig: reference environment variables directly and remove 'option env='")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2024-03-26 18:22:42 -04:00
Masahiro Yamada
19f67233d1 kconfig: fix memory leak from range properties
[ Upstream commit ae1eff0349f2e908fc083630e8441ea6dc434dc0 ]

Currently, sym_validate_range() duplicates the range string using
xstrdup(), which is overwritten by a subsequent sym_calc_value() call.
It results in a memory leak.

Instead, only the pointer should be copied.

Below is a test case, with a summary from Valgrind.

[Test Kconfig]

  config FOO
          int "foo"
          range 10 20

[Test .config]

  CONFIG_FOO=0

[Before]

  LEAK SUMMARY:
     definitely lost: 3 bytes in 1 blocks
     indirectly lost: 0 bytes in 0 blocks
       possibly lost: 0 bytes in 0 blocks
     still reachable: 17,465 bytes in 21 blocks
          suppressed: 0 bytes in 0 blocks

[After]

  LEAK SUMMARY:
     definitely lost: 0 bytes in 0 blocks
     indirectly lost: 0 bytes in 0 blocks
       possibly lost: 0 bytes in 0 blocks
     still reachable: 17,462 bytes in 20 blocks
          suppressed: 0 bytes in 0 blocks

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-12-13 17:42:15 +01:00
Konstantin Meskhidze
8069aebe90 kconfig: fix possible buffer overflow
[ Upstream commit a3b7039bb2b22fcd2ad20d59c00ed4e606ce3754 ]

Buffer 'new_argv' is accessed without bound check after accessing with
bound check via 'new_argc' index.

Fixes: e298f3b49d ("kconfig: add built-in function support")
Co-developed-by: Ivanov Mikhail <ivanov.mikhail1@huawei-partners.com>
Signed-off-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-09-23 10:48:12 +02:00
Lucas Wei
b90a1cd836 Merge android-4.19-stable (4.19.234) into android-msm-pixel-4.19-lts
Merge 4.19.234 into android-4.19-stable
Linux 4.19.234
    xen/netfront: react properly to failing gnttab_end_foreign_access_ref()
  * xen/gnttab: fix gnttab_end_foreign_access() without page specified
      include/xen/grant_table.h
    xen/pvcalls: use alloc/free_pages_exact()
    xen/9p: use alloc/free_pages_exact()
  * xen: remove gnttab_query_foreign_access()
      include/xen/grant_table.h
    xen/gntalloc: don't use gnttab_query_foreign_access()
    xen/scsifront: don't use gnttab_query_foreign_access() for mapped status
    xen/netfront: don't use gnttab_query_foreign_access() for mapped status
    xen/blkfront: don't use gnttab_query_foreign_access() for mapped status
  * xen/grant-table: add gnttab_try_end_foreign_access()
      include/xen/grant_table.h
    xen/xenbus: don't let xenbus_grant_ring() remove grants in error case
    ARM: fix build warning in proc-v7-bugs.c
    ARM: Do not use NOCROSSREFS directive with ld.lld
    ARM: fix co-processor register typo
  * kbuild: add CONFIG_LD_IS_LLD
      init/Kconfig
    ARM: fix build error when BPF_SYSCALL is disabled
    ARM: include unprivileged BPF status in Spectre V2 reporting
    ARM: Spectre-BHB workaround
    ARM: use LOADADDR() to get load address of sections
    ARM: early traps initialisation
    ARM: report Spectre v2 status through sysfs
  * arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit()
      drivers/firmware/psci.c
      include/linux/arm-smccc.h
  * arm/arm64: Provide a wrapper for SMCCC 1.1 calls
      include/linux/arm-smccc.h
    x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT
    x86/speculation: Warn about Spectre v2 LFENCE mitigation
    x86/speculation: Update link to AMD speculation whitepaper
    x86/speculation: Use generic retpoline by default on AMD
  * x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting
      include/linux/bpf.h
      kernel/sysctl.c
    Documentation/hw-vuln: Update spectre doc
    x86/speculation: Add eIBRS + Retpoline options
    x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE
    x86,bugs: Unconditionally allow spectre_v2=retpoline,amd
    x86/speculation: Merge one test in spectre_v2_user_select_mitigation()
    Merge 4.19.233 into android-4.19-stable
  * FROMGIT: Revert "xfrm: state and policy should fail if XFRMA_IF_ID 0"
      net/xfrm/xfrm_user.c
  * Revert "ANDROID: incremental-fs: fix mount_fs issue"
      fs/incfs/vfs.c
Linux 4.19.233
    hamradio: fix macro redefine warning
    net: dcb: disable softirqs in dcbnl_flush_dev()
    btrfs: add missing run of delayed items after unlink during log replay
    tracing/histogram: Fix sorting on old "cpu" value
  * memfd: fix F_SEAL_WRITE after shmem huge page allocated
      mm/memfd.c
  * HID: add mapping for KEY_ALL_APPLICATIONS
      drivers/hid/hid-debug.c
      drivers/hid/hid-input.c
      include/uapi/linux/input-event-codes.h
    Input: elan_i2c - fix regulator enable count imbalance after suspend/resume
    Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
  * nl80211: Handle nla_memdup failures in handle_nan_filter
      net/wireless/nl80211.c
    net: chelsio: cxgb3: check the return value of pci_find_capability()
    soc: fsl: qe: Check of ioremap return value
    ibmvnic: free reset-work-item when flushing
    ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
    arm64: dts: rockchip: Switch RK3399-Gru DP to SPDIF output
    can: gs_usb: change active_channels's type from atomic_t to u8
    firmware: arm_scmi: Remove space in MODULE_ALIAS name
    efivars: Respect "block" flag in efivar_entry_set_safe()
    net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe()
    net: sxgbe: fix return value of __setup handler
    net: stmmac: fix return value of __setup handler
    mac80211: fix forwarded mesh frames AC & queue selection
    xen/netfront: destroy queues before real_num_tx_queues is zeroed
    PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
  * block: Fix fsync always failed if once failed
      block/blk-flush.c
    net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error cause by server
    net/smc: fix unexpected SMC_CLC_DECL_ERR_REGRMB error generated by client
    net: dcb: flush lingering app table entries for unregistered devices
    batman-adv: Don't expect inter-netns unique iflink indices
    batman-adv: Request iflink once in batadv_get_real_netdevice
    batman-adv: Request iflink once in batadv-on-batadv check
  * netfilter: nf_queue: fix possible use-after-free
      include/net/netfilter/nf_queue.h
      net/netfilter/nf_queue.c
      net/netfilter/nfnetlink_queue.c
  * netfilter: nf_queue: don't assume sk is full socket
      net/netfilter/nf_queue.c
  * xfrm: enforce validity of offload input flags
      include/uapi/linux/xfrm.h
      net/xfrm/xfrm_device.c
  * xfrm: fix the if_id check in changelink
      net/xfrm/xfrm_interface.c
  * netfilter: fix use-after-free in __nf_register_net_hook()
      net/netfilter/core.c
  * xfrm: fix MTU regression
      net/ipv6/ip6_output.c
  * ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min
      sound/soc/soc-ops.c
    ALSA: intel_hdmi: Fix reference to PCM buffer address
    ata: pata_hpt37x: fix PCI clock detection
    usb: gadget: clear related members when goto fail
    usb: gadget: don't release an existing dev->buf
    net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990
  * i2c: qup: allow COMPILE_TEST
      drivers/i2c/busses/Kconfig
  * i2c: cadence: allow COMPILE_TEST
      drivers/i2c/busses/Kconfig
    dmaengine: shdma: Fix runtime PM imbalance on error
    cifs: fix double free race when mount fails in cifs_get_root()
  * Input: clear BTN_RIGHT/MIDDLE on buttonpads
      drivers/input/input.c
    ASoC: rt5682: do not block workqueue if card is unbound
    ASoC: rt5668: do not block workqueue if card is unbound
    i2c: bcm2835: Avoid clock stretching timeouts
    mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
    mac80211_hwsim: report NOACK frames in tx_status
    UPSTREAM: mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
    Merge 4.19.232 into android-4.19-stable
Linux 4.19.232
    tty: n_gsm: fix encoding of control signal octet bit DV
  * xhci: Prevent futile URB re-submissions due to incorrect return value.
      drivers/usb/host/xhci.c
  * xhci: re-initialize the HC during resume if HCE was set
      drivers/usb/host/xhci.c
  * usb: dwc3: gadget: Let the interrupt handler disable bottom halves.
      drivers/usb/dwc3/gadget.c
    usb: dwc3: pci: Fix Bay Trail phy GPIO mappings
    USB: serial: option: add Telit LE910R1 compositions
    USB: serial: option: add support for DW5829e
  * tracefs: Set the group ownership in apply_options() not parse_options()
      fs/tracefs/inode.c
    USB: gadget: validate endpoint index for xilinx udc
  * usb: gadget: rndis: add spinlock for rndis response list
      drivers/usb/gadget/function/rndis.c
      drivers/usb/gadget/function/rndis.h
    Revert "USB: serial: ch341: add new Product ID for CH341A"
    ata: pata_hpt37x: disable primary channel on HPT371
    iio: adc: men_z188_adc: Fix a resource leak in an error handling path
  * tracing: Have traceon and traceoff trigger honor the instance
      kernel/trace/trace_events_trigger.c
  * fget: clarify and improve __fget_files() implementation
      fs/file.c
  * memblock: use kfree() to release kmalloced memblock regions
      mm/memblock.c
    Revert "drm/nouveau/pmu/gm200-: avoid touching PMU outside of DEVINIT/PREOS/ACR"
    gpio: tegra186: Fix chip_data type confusion
    tty: n_gsm: fix proper link termination after failed open
    RDMA/ib_srp: Fix a deadlock
  * configfs: fix a race in configfs_{,un}register_subsystem()
      fs/configfs/dir.c
    net/mlx5e: Fix wrong return value on ioctl EEPROM query failure
  * drm/edid: Always set RGB444
      drivers/gpu/drm/drm_edid.c
  * openvswitch: Fix setting ipv6 fields causing hw csum failure
      include/net/checksum.h
  * gso: do not skip outer ip header in case of ipip and net_failover
      net/ipv4/af_inet.c
      net/ipv6/ip6_offload.c
  * tipc: Fix end of loop tests for list_for_each_entry()
      net/tipc/name_table.c
      net/tipc/socket.c
  * net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends
      net/core/skbuff.c
  * ping: remove pr_err from ping_lookup
      net/ipv4/ping.c
  * USB: zaurus: support another broken Zaurus
      drivers/net/usb/cdc_ether.c
      drivers/net/usb/zaurus.c
    sr9700: sanity check for packet length
    parisc/unaligned: Fix ldw() and stw() unalignment handlers
    parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel
    vhost/vsock: don't check owner in vhost_vsock_stop() while releasing
  * cgroup/cpuset: Fix a race between cpuset_attach() and cpu hotplug
      kernel/cgroup/cpuset.c
    Merge 4.19.231 into android-4.19-stable
Linux 4.19.231
    net: macb: Align the dma and coherent dma masks
    net: usb: qmi_wwan: Add support for Dell DW5829e
  * tracing: Fix tp_printk option related with tp_printk_stop_on_boot
      kernel/trace/trace.c
    ata: libata-core: Disable TRIM on M88V29
  * kconfig: let 'shell' return enough output for deep path names
      scripts/kconfig/preprocess.c
    arm64: dts: meson-gx: add ATF BL32 reserved-memory region
  * netfilter: conntrack: don't refresh sctp entries in closed state
      net/netfilter/nf_conntrack_proto_sctp.c
    irqchip/sifive-plic: Add missing thead,c900-plic match string
    ARM: OMAP2+: hwmod: Add of_node_put() before break
    KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW
    Drivers: hv: vmbus: Fix memory leak in vmbus_add_channel_kobj
    Drivers: hv: vmbus: Expose monitor data only when monitor pages are used
    mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status
    mtd: rawnand: brcmnand: Refactored code to introduce helper functions
  * lib/iov_iter: initialize "flags" in new pipe_buffer
      lib/iov_iter.c
    i2c: brcmstb: fix support for DSL and CM variants
    dmaengine: sh: rcar-dmac: Check for error num after setting mask
  * net: sched: limit TC_ACT_REPEAT loops
      net/sched/act_api.c
  * EDAC: Fix calculation of returned address and next offset in edac_align_ptr()
      drivers/edac/edac_mc.c
    mtd: rawnand: qcom: Fix clock sequencing in qcom_nandc_probe()
    NFS: Do not report writeback errors in nfs_getattr()
    NFS: LOOKUP_DIRECTORY is also ok with symlinks
  * block/wbt: fix negative inflight counter when remove scsi device
      block/elevator.c
  * ext4: check for out-of-order index extents in ext4_valid_extent_entries()
      fs/ext4/extents.c
    powerpc/lib/sstep: fix 'ptesync' build error
  * ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range()
      sound/soc/soc-ops.c
  * ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw()
      sound/soc/soc-ops.c
    ALSA: hda: Fix missing codec probe on Shenker Dock 15
    ALSA: hda: Fix regression on forced probe mask option
    libsubcmd: Fix use-after-free for realloc(..., 0)
  * bonding: fix data-races around agg_select_timer
      drivers/net/bonding/bond_3ad.c
      include/net/bond_3ad.h
    drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit
  * ping: fix the dif and sdif check in ping_lookup
      net/ipv4/ping.c
    net: ieee802154: ca8210: Fix lifs/sifs periods
    net: dsa: lan9303: fix reset on probe
    iwlwifi: pcie: gen2: fix locking when "HW not ready"
    iwlwifi: pcie: fix locking when "HW not ready"
    vsock: remove vsock from connected table when connect is interrupted by a signal
    mmc: block: fix read single on recovery logic
  * taskstats: Cleanup the use of task->exit_code
      kernel/tsacct.c
  * xfrm: Don't accidentally set RTO_ONLINK in decode_session4()
      net/ipv4/xfrm4_policy.c
    drm/radeon: Fix backlight control on iMac 12,1
    iwlwifi: fix use-after-free
  * Revert "module, async: async_synchronize_full() on module init iff async is used"
      include/linux/sched.h
      kernel/async.c
      kernel/module.c
    nvme-rdma: fix possible use-after-free in transport error_recovery work
    nvme: fix a possible use-after-free in controller reset during load
  * quota: make dquot_quota_sync return errors from ->sync_fs
      fs/quota/dquot.c
  * vfs: make freeze_super abort when sync_filesystem returns error
      fs/super.c
    ax25: improve the incomplete fix to avoid UAF and NPD bugs
    selftests/zram: Adapt the situation that /dev/zram0 is being used
    selftests/zram01.sh: Fix compression ratio calculation
    selftests/zram: Skip max_comp_streams interface on newer kernel
    net: ieee802154: at86rf230: Stop leaking skb's
    btrfs: send: in case of IO error log it
    parisc: Fix sglist access in ccio-dma.c
    parisc: Fix data TLB miss in sba_unmap_sg
    serial: parisc: GSC: fix build when IOSAPIC is not set
  * net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup
      drivers/net/usb/ax88179_178a.c
  * Makefile.extrawarn: Move -Wunaligned-access to W=1
      scripts/Makefile.extrawarn
    Merge 4.19.230 into android-4.19-stable
Linux 4.19.230
  * perf: Fix list corruption in perf_cgroup_switch()
      kernel/events/core.c
    hwmon: (dell-smm) Speed up setting of fan speed
  * seccomp: Invalidate seccomp mode to catch death failures
      kernel/seccomp.c
    USB: serial: cp210x: add CPI Bulk Coin Recycler id
    USB: serial: cp210x: add NCR Retail IO box id
    USB: serial: ch341: add support for GW Instek USB2.0-Serial devices
    USB: serial: option: add ZTE MF286D modem
    USB: serial: ftdi_sio: add support for Brainboxes US-159/235/320
  * usb: gadget: rndis: check size of RNDIS_MSG_SET command
      drivers/usb/gadget/function/rndis.c
  * USB: gadget: validate interface OS descriptor requests
      drivers/usb/gadget/composite.c
  * usb: dwc3: gadget: Prevent core from processing stale TRBs
      drivers/usb/dwc3/gadget.c
    usb: ulpi: Call of_node_put correctly
    usb: ulpi: Move of_node_put to ulpi_dev_release
  * n_tty: wake up poll(POLLRDNORM) on receiving data
      drivers/tty/n_tty.c
    vt_ioctl: add array_index_nospec to VT_ACTIVATE
    vt_ioctl: fix array_index_nospec in vt_setactivate
    net: amd-xgbe: disable interrupts during pci removal
  * tipc: rate limit warning for received illegal binding update
      net/tipc/name_distr.c
  * veth: fix races around rq->rx_notify_masked
      drivers/net/veth.c
  * net: fix a memleak when uncloning an skb dst and its metadata
      include/net/dst_metadata.h
  * net: do not keep the dst cache when uncloning an skb dst and its metadata
      include/net/dst_metadata.h
    ipmr,ip6mr: acquire RTNL before calling ip[6]mr_free_table() on failure path
  * bonding: pair enable_port with slave_arr_updates
      drivers/net/bonding/bond_3ad.c
    ixgbevf: Require large buffers for build_skb on 82599VF
  * usb: f_fs: Fix use-after-free for epfile
      drivers/usb/gadget/function/f_fs.c
    ARM: dts: imx6qdl-udoo: Properly describe the SD card detect
    staging: fbtft: Fix error path in fbtft_driver_module_init()
    ARM: dts: meson: Fix the UART compatible strings
    perf probe: Fix ppc64 'perf probe add events failed' case
  * net: bridge: fix stale eth hdr pointer in br_dev_xmit
      net/bridge/br_device.c
    ARM: dts: imx23-evk: Remove MX23_PAD_SSP1_DETECT from hog group
  * bpf: Add kconfig knob for disabling unpriv bpf by default
      init/Kconfig
      kernel/bpf/syscall.c
      kernel/sysctl.c
    net: stmmac: dwmac-sun8i: use return val of readl_poll_timeout()
    usb: dwc2: gadget: don't try to disable ep0 in dwc2_hsotg_suspend
    scsi: target: iscsi: Make sure the np under each tpg is unique
  * net: sched: Clarify error message when qdisc kind is unknown
      net/sched/sch_api.c
    NFSv4 expose nfs_parse_server_name function
    NFSv4 remove zero number of fs_locations entries error check
    NFSv4.1: Fix uninitialised variable in devicenotify
    nfs: nfs4clinet: check the return value of kstrdup()
    NFSv4 only print the label when its queried
    NFSD: Fix offset type in I/O trace points
    NFSD: Clamp WRITE offsets
    NFS: Fix initialisation of nfs_client cl_flags field
    net: phy: marvell: Fix MDI-x polarity setting in 88e1118-compatible PHYs
    mmc: sdhci-of-esdhc: Check for error num after setting mask
    ima: Allow template selection with ima_template[_fmt]= after ima_hash=
    ima: Remove ima_policy file before directory
  * integrity: check the return value of audit_log_start()
      security/integrity/integrity_audit.c
  * FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file
      fs/f2fs/data.c
      fs/f2fs/file.c
  * Revert "tracefs: Have tracefs directories not set OTH permission bits by default"
      fs/tracefs/inode.c
    ANDROID: GKI: Enable CONFIG_SERIAL_8250_RUNTIME_UARTS=0
    Merge 4.19.229 into android-4.19-stable
Linux 4.19.229
  * tipc: improve size validations for received domain records
      net/tipc/link.c
      net/tipc/monitor.c
    moxart: fix potential use-after-free on remove path
  * cgroup-v1: Require capabilities to set release_agent
      kernel/cgroup/cgroup-v1.c
    Merge 4.19.228 into android-4.19-stable
Linux 4.19.228
  * ext4: fix error handling in ext4_restore_inline_data()
      fs/ext4/inline.c
    EDAC/xgene: Fix deferred probing
    EDAC/altera: Fix deferred probing
    rtc: cmos: Evaluate century appropriate
    selftests: futex: Use variable MAKE instead of make
    nfsd: nfsd4_setclientid_confirm mistakenly expires confirmed client.
    scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe
    ASoC: max9759: fix underflow in speaker_gain_control_put()
    ASoC: cpcap: Check for NULL pointer after calling of_get_child_by_name
    ASoC: fsl: Add missing error handling in pcm030_fabric_probe
    drm/i915/overlay: Prevent divide by zero bugs in scaling
    net: stmmac: ensure PTP time register reads are consistent
    net: macsec: Verify that send_sci is on when setting Tx sci explicitly
    net: ieee802154: Return meaningful error codes from the netlink helpers
    net: ieee802154: ca8210: Stop leaking skb's
    net: ieee802154: mcr20a: Fix lifs/sifs periods
    net: ieee802154: hwsim: Ensure proper channel selection at probe time
    spi: meson-spicc: add IRQ check in meson_spicc_probe
    spi: mediatek: Avoid NULL pointer crash in interrupt
    spi: bcm-qspi: check for valid cs before applying chip select
    iommu/amd: Fix loop timeout issue in iommu_ga_log_enable()
    iommu/vt-d: Fix potential memory leak in intel_setup_irq_remapping()
    RDMA/mlx4: Don't continue event handler after memory allocation failure
    Revert "ASoC: mediatek: Check for error clk pointer"
    block: bio-integrity: Advance seed correctly for larger interval sizes
    drm/nouveau: fix off by one in BIOS boundary checking
    ALSA: hda/realtek: Fix silent output on Gigabyte X570 Aorus Xtreme after reboot from Windows
    ALSA: hda/realtek: Fix silent output on Gigabyte X570S Aorus Master (newer chipset)
    ALSA: hda/realtek: Add missing fixup-model entry for Gigabyte X570 ALC1220 quirks
  * ASoC: ops: Reject out of bounds values in snd_soc_put_xr_sx()
      sound/soc/soc-ops.c
  * ASoC: ops: Reject out of bounds values in snd_soc_put_volsw_sx()
      sound/soc/soc-ops.c
  * ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()
      sound/soc/soc-ops.c
  * audit: improve audit queue handling when "audit=1" on cmdline
      kernel/audit.c
  * af_packet: fix data-race in packet_setsockopt / packet_setsockopt
      net/packet/af_packet.c
  * rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
      net/core/rtnetlink.c
    net: amd-xgbe: Fix skb data length underflow
    net: amd-xgbe: ensure to reset the tx_timer_active flag
    ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
  * tcp: fix possible socket leaks in internal pacing mode
      net/ipv4/tcp_output.c
  * netfilter: nat: limit port clash resolution attempts
      net/netfilter/nf_nat_proto_common.c
  * netfilter: nat: remove l4 protocol port rovers
      include/net/netfilter/nf_nat_l4proto.h
      net/netfilter/nf_nat_proto_common.c
      net/netfilter/nf_nat_proto_dccp.c
      net/netfilter/nf_nat_proto_sctp.c
      net/netfilter/nf_nat_proto_tcp.c
      net/netfilter/nf_nat_proto_udp.c
  * ipv4: tcp: send zero IPID in SYNACK messages
      net/ipv4/ip_output.c
  * ipv4: raw: lock the socket in raw_bind()
      net/ipv4/raw.c
    yam: fix a memory leak in yam_siocdevprivate()
    ibmvnic: don't spin in tasklet
    ibmvnic: init ->running_cap_crqs early
  * phylib: fix potential use-after-free
      drivers/net/phy/phy_device.c
    NFS: Ensure the server has an up to date ctime before renaming
    NFS: Ensure the server has an up to date ctime before hardlinking
  * ipv6: annotate accesses to fn->fn_sernum
      include/net/ip6_fib.h
      net/ipv6/ip6_fib.c
      net/ipv6/route.c
    drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable
    drm/msm: Fix wrong size calculation
  * net-procfs: show net devices bound packet types
      net/core/net-procfs.c
    NFSv4: nfs_atomic_open() can race when looking up a non-regular file
    NFSv4: Handle case where the lookup of a directory fails
    hwmon: (lm90) Reduce maximum conversion rate for G781
  * ipv4: avoid using shared IP generator for connected sockets
      include/net/ip.h
  * ping: fix the sk_bound_dev_if match in ping_lookup
      net/ipv4/ping.c
  * net: fix information leakage in /proc/net/ptype
      include/linux/netdevice.h
      net/core/net-procfs.c
      net/packet/af_packet.c
  * ipv6_tunnel: Rate limit warning messages
      net/ipv6/ip6_tunnel.c
    scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put()
  * rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev
      drivers/rpmsg/rpmsg_char.c
  * rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev
      drivers/rpmsg/rpmsg_char.c
    i40e: fix unsigned stat widths
    i40e: Fix queues reservation for XDP
    i40e: Fix issue when maximum queues is exceeded
    i40e: Increase delay to 1 s after global EMP reset
    powerpc/32: Fix boot failure with GCC latent entropy plugin
    net: sfp: ignore disabled SFP node
    usb: typec: tcpm: Do not disconnect while receiving VBUS off
  * USB: core: Fix hang in usb_kill_urb by adding memory barriers
      drivers/usb/core/hcd.c
      drivers/usb/core/urb.c
    usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS
    usb: common: ulpi: Fix crash in ulpi_match()
  * usb-storage: Add unusual-devs entry for VL817 USB-SATA bridge
      drivers/usb/storage/unusual_devs.h
    tty: Add support for Brainboxes UC cards.
    tty: n_gsm: fix SW flow control encoding/handling
    serial: stm32: fix software flow control transfer
    serial: 8250: of: Fix mapped region size when using reg-offset property
    netfilter: nft_payload: do not update layer 4 checksum when mangling fragments
    drm/etnaviv: relax submit size limits
  * PM: wakeup: simplify the output logic of pm_show_wakelocks()
      kernel/power/wakelock.c
    udf: Fix NULL ptr deref when converting from inline format
    udf: Restore i_lenAlloc when inode expansion fails
    scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices
    s390/hypfs: include z/VM guests with access control group set
  * Bluetooth: refactor malicious adv data check
      net/bluetooth/hci_event.c
    ANDROID: Increase x86 cmdline size to 4k
  * ANDROID: incremental-fs: remove index and incomplete dir on umount
      fs/incfs/vfs.c

Bug: 225082527
Change-Id: Ibc8397e8e00434b782bbd270dbbe7deaced953d5
Signed-off-by: Lucas Wei <lucaswei@google.com>
2022-04-01 11:38:46 +08:00
Brenda Streiff
7d1c79a1cd kconfig: let 'shell' return enough output for deep path names
[ Upstream commit 8a4c5b2a6d8ea079fa36034e8167de87ab6f8880 ]

The 'shell' built-in only returns the first 256 bytes of the command's
output. In some cases, 'shell' is used to return a path; by bumping up
the buffer size to 4096 this lets us capture up to PATH_MAX.

The specific case where I ran into this was due to commit 1e860048c53e
("gcc-plugins: simplify GCC plugin-dev capability test"). After this
change, we now use `$(shell,$(CC) -print-file-name=plugin)` to return
a path; if the gcc path is particularly long, then the path ends up
truncated at the 256 byte mark, which makes the HAVE_GCC_PLUGINS
depends test always fail.

Signed-off-by: Brenda Streiff <brenda.streiff@ni.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2022-02-23 11:58:42 +01:00
Lucas Wei
7ec4bc1d47 Merge android-4.19-stable (4.19.191) into android-msm-pixel-4.19-lts
Merge 4.19.191 into android-4.19-stable
Linux 4.19.191
    scripts: switch explicitly to Python 3
    tweewide: Fix most Shebang lines
  * KVM: arm64: Initialize VCPU mdcr_el2 before loading it
      arch/arm64/include/asm/kvm_host.h
  * iomap: fix sub-page uptodate handling
      fs/iomap.c
      include/linux/iomap.h
  * ipv6: remove extra dev_hold() for fallback tunnels
      net/ipv6/ip6_tunnel.c
      net/ipv6/ip6_vti.c
      net/ipv6/sit.c
  * ip6_tunnel: sit: proper dev_{hold|put} in ndo_[un]init methods
      net/ipv6/ip6_tunnel.c
  * sit: proper dev_{hold|put} in ndo_[un]init methods
      net/ipv6/sit.c
    ip6_gre: proper dev_{hold|put} in ndo_[un]init methods
    net: stmmac: Do not enable RX FIFO overflow interrupts
    lib: stackdepot: turn depot_lock spinlock to raw_spinlock
  * block: reexpand iov_iter after read/write
      fs/block_dev.c
    ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP
    gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055
    scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found
    ceph: fix fscache invalidation
    riscv: Workaround mcount name prior to clang-13
    scripts/recordmcount.pl: Fix RISC-V regex for clang
    ARM: 9075/1: kernel: Fix interrupted SMC calls
    um: Mark all kernel symbols as local
    Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state
    Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices
    ACPI / hotplug / PCI: Fix reference count leak in enable_slot()
    ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend()
  * PCI: thunder: Fix compile testing
      drivers/pci/controller/pci-thunder-ecam.c
      drivers/pci/controller/pci-thunder-pem.c
      drivers/pci/pci.h
    xsk: Simplify detection of empty and full rings
    pinctrl: ingenic: Improve unreachable code generation
    isdn: capi: fix mismatched prototypes
    cxgb4: Fix the -Wmisleading-indentation warning
    usb: sl811-hcd: improve misleading indentation
    kgdb: fix gcc-11 warning on indentation
    x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes
    nvme: do not try to reconfigure APST when the controller is not live
    clk: exynos7: Mark aclk_fsys1_200 as critical
  * netfilter: conntrack: Make global sysctls readonly in non-init netns
      net/netfilter/nf_conntrack_standalone.c
  * kobject_uevent: remove warning in init_uevent_argv()
      lib/kobject_uevent.c
    thermal/core/fair share: Lock the thermal zone while looping over instances
    MIPS: Avoid handcoded DIVU in `__div64_32' altogether
    MIPS: Avoid DIVU in `__div64_32' is result would be zero
    MIPS: Reinstate platform `__div64_32' handler
  * FDDI: defxx: Make MMIO the configuration default except for EISA
      drivers/net/fddi/Kconfig
    KVM: x86: Cancel pvclock_gtod_work on module removal
    cdc-wdm: untangle a circular dependency between callback and softint
    iio: tsl2583: Fix division by a zero lux_val
    iio: gyro: mpu3050: Fix reported temperature value
  * xhci: Add reset resume quirk for AMD xhci controller.
      drivers/usb/host/xhci-pci.c
  * xhci: Do not use GFP_KERNEL in (potentially) atomic context
      drivers/usb/host/xhci.c
  * usb: dwc3: gadget: Return success always for kick transfer in ep queue
      drivers/usb/dwc3/gadget.c
  * usb: core: hub: fix race condition about TRSMRCY of resume
      drivers/usb/core/hub.c
    usb: dwc2: Fix gadget DMA unmap direction
  * usb: xhci: Increase timeout for HC halt
      drivers/usb/host/xhci-ext-caps.h
    usb: dwc3: pci: Enable usb2-gadget-lpm-disable for Intel Merrifield
    usb: dwc3: omap: improve extcon initialization
  * blk-mq: Swap two calls in blk_mq_exit_queue()
      block/blk-mq.c
    ACPI: scan: Fix a memory leak in an error handling path
    usb: fotg210-hcd: Fix an error message
    iio: proximity: pulsedlight: Fix rumtime PM imbalance on error
    drm/radeon/dpm: Disable sclk switching on Oland when two 4K 60Hz monitors are connected
  * userfaultfd: release page in error path to avoid BUG_ON
      mm/shmem.c
    squashfs: fix divide error in calculate_skip()
    hfsplus: prevent corruption in shrinking truncate
    powerpc/64s: Fix crashes when toggling entry flush barrier
    powerpc/64s: Fix crashes when toggling stf barrier
    ARC: entry: fix off-by-one error in syscall number validation
    i40e: Fix use-after-free in i40e_client_subtask()
    netfilter: nftables: avoid overflows in nft_hash_buckets()
    kernel: kexec_file: fix error return code of kexec_calculate_store_digests()
  * sched/fair: Fix unfairness caused by missing load decay
      kernel/sched/fair.c
    netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check
    smc: disallow TCP_ULP in smc_setsockopt()
  * net: fix nla_strcmp to handle more then one trailing null character
      lib/nlattr.c
    ksm: fix potential missing rmap_item for stable_node
    mm/hugeltb: handle the error case in hugetlb_fix_reserve_counts()
    khugepaged: fix wrong result value for trace_mm_collapse_huge_page_isolate()
    drm/radeon: Avoid power table parsing memory leaks
    drm/radeon: Fix off-by-one power_state index heap overwrite
  * netfilter: xt_SECMARK: add new revision to fix structure layout
      include/uapi/linux/netfilter/xt_SECMARK.h
      net/netfilter/xt_SECMARK.c
  * sctp: fix a SCTP_MIB_CURRESTAB leak in sctp_sf_do_dupcook_b
      net/sctp/sm_statefuns.c
    ethernet:enic: Fix a use after free bug in enic_hard_start_xmit
  * sctp: do asoc update earlier in sctp_sf_do_dupcook_a
      net/sctp/sm_statefuns.c
    net: hns3: disable phy loopback setting in hclge_mac_start_phy
    rtc: ds1307: Fix wday settings for rx8130
    NFSv4.2 fix handling of sr_eof in SEEK's reply
    pNFS/flexfiles: fix incorrect size check in decode_nfs_fh()
    PCI: endpoint: Fix missing destroy_workqueue()
    NFS: Deal correctly with attribute generation counter overflow
    NFSv4.2: Always flush out writes in nfs42_proc_fallocate()
  * rpmsg: qcom_glink_native: fix error return code of qcom_glink_rx_data()
      drivers/rpmsg/qcom_glink_native.c
    ARM: 9064/1: hw_breakpoint: Do not directly check the event's overflow_handler hook
  * PCI: Release OF node in pci_scan_device()'s error path
      drivers/pci/probe.c
    PCI: iproc: Fix return value of iproc_msi_irq_domain_alloc()
  * f2fs: fix a redundant call to f2fs_balance_fs if an error occurs
      fs/f2fs/inline.c
    ASoC: rt286: Make RT286_SET_GPIO_* readable and writable
    ia64: module: fix symbolizer crash on fdescr
    net: ethernet: mtk_eth_soc: fix RX VLAN offload
    powerpc/iommu: Annotate nested lock for lockdep
    wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join
    wl3501_cs: Fix out-of-bounds warnings in wl3501_send_pkt
    powerpc/pseries: Stop calling printk in rtas_stop_self()
    samples/bpf: Fix broken tracex1 due to kprobe argument change
  * ethtool: ioctl: Fix out-of-bounds warning in store_link_ksettings_for_user()
      net/core/ethtool.c
    ASoC: rt286: Generalize support for ALC3263 codec
    powerpc/smp: Set numa node before updating mask
  * sctp: Fix out-of-bounds warning in sctp_process_asconf_param()
      net/sctp/sm_make_chunk.c
    kconfig: nconf: stop endless search loops
    selftests: Set CC to clang in lib.mk if LLVM is set
    cuse: prevent clone
    pinctrl: samsung: use 'int' for register masks in Exynos
    mac80211: clear the beacon's CRC after channel switch
  * i2c: Add I2C_AQ_NO_REP_START adapter quirk
      include/linux/i2c.h
    ASoC: Intel: bytcr_rt5640: Add quirk for the Chuwi Hi8 tablet
  * ip6_vti: proper dev_{hold|put} in ndo_[un]init methods
      net/ipv6/ip6_vti.c
  * Bluetooth: check for zapped sk before connecting
      net/bluetooth/l2cap_sock.c
  * net: bridge: when suppression is enabled exclude RARP packets
      net/bridge/br_arp_nd_proxy.c
  * Bluetooth: initialize skb_queue_head at l2cap_chan_create()
      net/bluetooth/l2cap_core.c
  * Bluetooth: Set CONF_NOT_COMPLETE as l2cap_chan default
      net/bluetooth/l2cap_core.c
    ALSA: rme9652: don't disable if not enabled
    ALSA: hdspm: don't disable if not enabled
    ALSA: hdsp: don't disable if not enabled
  * i2c: bail out early when RDWR parameters are wrong
      drivers/i2c/i2c-dev.c
    net: stmmac: Set FIFO sizes for ipq806x
    ASoC: Intel: bytcr_rt5640: Enable jack-detect support on Asus T100TAF
  * tipc: convert dest node's address to network order
      net/tipc/netlink_compat.c
    fs: dlm: fix debugfs dump
    tpm: fix error return code in tpm2_get_cc_attrs_tbl()
  * Revert "fdt: Properly handle "no-map" field in the memory region"
      drivers/of/fdt.c
  * Revert "of/fdt: Make sure no-map does not remove already reserved regions"
      drivers/of/fdt.c
  * sctp: delay auto_asconf init until binding the first addr
      net/sctp/socket.c
  * Revert "net/sctp: fix race condition in sctp_destroy_sock"
      net/sctp/socket.c
  * smp: Fix smp_call_function_single_async prototype
      include/linux/smp.h
      kernel/smp.c
  * net: Only allow init netns to set default tcp cong to a restricted algo
      net/ipv4/tcp_cong.c
    mm/memory-failure: unnecessary amount of unmapping
  * mm/sparse: add the missing sparse_buffer_fini() in error branch
      mm/sparse.c
    kfifo: fix ternary sign extension bugs
    net:nfc:digital: Fix a double free in digital_tg_recv_dep_req
    RDMA/bnxt_re: Fix a double free in bnxt_qplib_alloc_res
    net:emac/emac-mac: Fix a use after free in emac_mac_tx_buf_send
    net: geneve: modify IP header check in geneve6_xmit_skb and geneve_xmit_skb
    arm64: dts: uniphier: Change phy-mode to RGMII-ID to enable delay pins for RTL8211E
    ARM: dts: uniphier: Change phy-mode to RGMII-ID to enable delay pins for RTL8211E
    bnxt_en: fix ternary sign extension bug in bnxt_show_temp()
    powerpc/52xx: Fix an invalid ASM expression ('addi' used instead of 'add')
    ath10k: Fix ath10k_wmi_tlv_op_pull_peer_stats_info() unlock without lock
    ath9k: Fix error check in ath9k_hw_read_revisions() for PCI devices
    net: davinci_emac: Fix incorrect masking of tx and rx error channel
  * ALSA: usb: midi: don't return -ENOMEM when usb_urb_ep_type_check fails
      sound/usb/midi.c
    RDMA/i40iw: Fix error unwinding when i40iw_hmc_sd_one fails
    vsock/vmci: log once the failed queue pair allocation
    mwl8k: Fix a double Free in mwl8k_probe_hw
    i2c: sh7760: fix IRQ error path
    rtlwifi: 8821ae: upgrade PHY and RF parameters
    powerpc/pseries: extract host bridge from pci_bus prior to bus removal
    MIPS: pci-legacy: stop using of_pci_range_to_resource
    drm/i915/gvt: Fix error code in intel_gvt_init_device()
    ASoC: ak5558: correct reset polarity
    i2c: sh7760: add IRQ check
    i2c: jz4780: add IRQ check
    i2c: emev2: add IRQ check
    i2c: cadence: add IRQ check
    RDMA/srpt: Fix error return code in srpt_cm_req_recv()
    net: thunderx: Fix unintentional sign extension issue
    IB/hfi1: Fix error return code in parse_platform_config()
    mt7601u: fix always true expression
    mac80211: bail out if cipher schemes are invalid
    powerpc: iommu: fix build when neither PCI or IBMVIO is set
    powerpc/perf: Fix PMU constraint check for EBB events
    powerpc/64s: Fix pte update for kernel memory on radix
    liquidio: Fix unintented sign extension of a left shift of a u16
  * ALSA: usb-audio: Add error checks for usb_driver_claim_interface() calls
      sound/usb/card.c
      sound/usb/quirks.c
      sound/usb/usbaudio.h
    net: hns3: Limiting the scope of vector_ring_chain variable
    nfc: pn533: prevent potential memory corruption
  * bug: Remove redundant condition check in report_bug
      lib/bug.c
  * ALSA: core: remove redundant spin_lock pair in snd_card_disconnect
      sound/core/init.c
    powerpc: Fix HAVE_HARDLOCKUP_DETECTOR_ARCH build configuration
    powerpc/prom: Mark identical_pvr_fixup as __init
    net: lapbether: Prevent racing when checking whether the netif is running
    perf symbols: Fix dso__fprintf_symbols_by_name() to return the number of printed chars
  * HID: plantronics: Workaround for double volume key presses
      drivers/hid/hid-ids.h
      drivers/hid/hid-plantronics.c
      include/linux/hid.h
    drivers/block/null_blk/main: Fix a double free in null_init.
  * sched/debug: Fix cgroup_path[] serialization
      kernel/sched/debug.c
    x86/events/amd/iommu: Fix sysfs type mismatch
    HSI: core: fix resource leaks in hsi_add_client_from_dt()
    mfd: stm32-timers: Avoid clearing auto reload register
    scsi: ibmvfc: Fix invalid state machine BUG_ON()
    scsi: sni_53c710: Add IRQ check
    scsi: sun3x_esp: Add IRQ check
    scsi: jazz_esp: Add IRQ check
    clk: uniphier: Fix potential infinite loop
    clk: qcom: a53-pll: Add missing MODULE_DEVICE_TABLE
    vfio/mdev: Do not allow a mdev_type to have a NULL parent pointer
    nvme: retrigger ANA log update if group descriptor isn't found
    ata: libahci_platform: fix IRQ check
    sata_mv: add IRQ checks
    pata_ipx4xx_cf: fix IRQ check
    pata_arasan_cf: fix IRQ check
    x86/kprobes: Fix to check non boostable prefixes correctly
    drm/amdkfd: fix build error with AMD_IOMMU_V2=m
    media: m88rs6000t: avoid potential out-of-bounds reads on arrays
    media: omap4iss: return error code when omap4iss_get() failed
    media: vivid: fix assignment of dev->fbuf_out_flags
    soc: aspeed: fix a ternary sign expansion bug
  * ttyprintk: Add TTY hangup callback.
      drivers/char/ttyprintk.c
    usb: dwc2: Fix hibernation between host and device modes.
    usb: dwc2: Fix host mode hibernation exit with remote wakeup flow.
    Drivers: hv: vmbus: Increase wait time for VMbus unload
    x86/platform/uv: Fix !KEXEC build failure
    platform/x86: pmc_atom: Match all Beckhoff Automation baytrail boards with critclk_systems DMI table
    usbip: vudc: fix missing unlock on error in usbip_sockfd_store()
  * firmware: qcom-scm: Fix QCOM_SCM configuration
      drivers/firmware/Kconfig
  * tty: fix return value for unsupported ioctls
      drivers/tty/tty_io.c
      include/linux/tty_driver.h
  * tty: actually undefine superseded ASYNC flags
      include/uapi/linux/tty_flags.h
    USB: cdc-acm: fix unprivileged TIOCCSERIAL
    usb: gadget: r8a66597: Add missing null check on return from platform_get_resource
    cpufreq: armada-37xx: Fix determining base CPU frequency
    cpufreq: armada-37xx: Fix driver cleanup when registration failed
    clk: mvebu: armada-37xx-periph: Fix workaround for switching from L1 to L0
    clk: mvebu: armada-37xx-periph: Fix switching CPU freq from 250 Mhz to 1 GHz
    cpufreq: armada-37xx: Fix the AVS value for load L1
    clk: mvebu: armada-37xx-periph: remove .set_parent method for CPU PM clock
    cpufreq: armada-37xx: Fix setting TBG parent for load levels
    crypto: qat - Fix a double free in adf_create_ring
    ACPI: CPPC: Replace cppc_attr with kobj_attribute
  * soc: qcom: mdt_loader: Detect truncated read of segments
      drivers/soc/qcom/mdt_loader.c
  * soc: qcom: mdt_loader: Validate that p_filesz < p_memsz
      drivers/soc/qcom/mdt_loader.c
  * spi: Fix use-after-free with devm_spi_alloc_*
      drivers/spi/spi.c
      include/linux/spi/spi.h
    staging: greybus: uart: fix unprivileged TIOCCSERIAL
    staging: rtl8192u: Fix potential infinite loop
  * irqchip/gic-v3: Fix OF_BAD_ADDR error handling
      drivers/irqchip/irq-gic-v3-mbi.c
    mtd: rawnand: gpmi: Fix a double free in gpmi_nand_init
    soundwire: stream: fix memory leak in stream config error path
    USB: gadget: udc: fix wrong pointer passed to IS_ERR() and PTR_ERR()
    usb: gadget: aspeed: fix dma map failure
    crypto: qat - fix error path in adf_isr_resource_alloc()
  * phy: marvell: ARMADA375_USBCLUSTER_PHY should not default to y, unconditionally
      drivers/phy/marvell/Kconfig
    soundwire: bus: Fix device found flag correctly
  * bus: qcom: Put child node before return
      drivers/bus/qcom-ebi2.c
    mtd: require write permissions for locking and badblock ioctls
    fotg210-udc: Complete OUT requests on short packets
    fotg210-udc: Don't DMA more than the buffer can take
    fotg210-udc: Mask GRP2 interrupts we don't handle
    fotg210-udc: Remove a dubious condition leading to fotg210_done
    fotg210-udc: Fix EP0 IN requests bigger than two packets
    fotg210-udc: Fix DMA on EP0 for length > max packet size
    crypto: qat - ADF_STATUS_PF_RUNNING should be set after adf_dev_init
    crypto: qat - don't release uninitialized resources
    usb: gadget: pch_udc: Check for DMA mapping error
    usb: gadget: pch_udc: Check if driver is present before calling ->setup()
    usb: gadget: pch_udc: Replace cpu_to_le32() by lower_32_bits()
    x86/microcode: Check for offline CPUs before requesting new microcode
    mtd: rawnand: qcom: Return actual error code instead of -ENODEV
    mtd: Handle possible -EPROBE_DEFER from parse_mtd_partitions()
    mtd: rawnand: brcmnand: fix OOB R/W with Hamming ECC
    mtd: rawnand: fsmc: Fix error code in fsmc_nand_probe()
  * regmap: set debugfs_name to NULL after it is freed
      drivers/base/regmap/regmap-debugfs.c
    usb: typec: tcpci: Check ROLE_CONTROL while interpreting CC_STATUS
    serial: stm32: fix tx_empty condition
    serial: stm32: fix incorrect characters on console
    ARM: dts: exynos: correct PMIC interrupt trigger level on Snow
    ARM: dts: exynos: correct PMIC interrupt trigger level on SMDK5250
    ARM: dts: exynos: correct PMIC interrupt trigger level on Odroid X/U3 family
    ARM: dts: exynos: correct PMIC interrupt trigger level on Midas family
    ARM: dts: exynos: correct MUIC interrupt trigger level on Midas family
    ARM: dts: exynos: correct fuel gauge interrupt trigger level on Midas family
    memory: gpmc: fix out of bounds read and dereference on gpmc_cs[]
    usb: gadget: pch_udc: Revert d3cb25a121 completely
  * ovl: fix missing revert_creds() on error path
      fs/overlayfs/copy_up.c
    KVM: s390: split kvm_s390_real_to_abs
    KVM: s390: fix guarded storage control register handling
    KVM: s390: split kvm_s390_logical_to_effective
    x86/cpu: Initialize MSR_TSC_AUX if RDTSCP *or* RDPID is supported
    ALSA: hda/realtek: Remove redundant entry for ALC861 Haier/Uniwill devices
    ALSA: hda/realtek: Re-order ALC269 Lenovo quirk table entries
    ALSA: hda/realtek: Re-order ALC269 Sony quirk table entries
    ALSA: hda/realtek: Re-order ALC269 Dell quirk table entries
    ALSA: hda/realtek: Re-order ALC269 HP quirk table entries
    ALSA: hda/realtek: Re-order ALC882 Clevo quirk table entries
    ALSA: hda/realtek: Re-order ALC882 Sony quirk table entries
    ALSA: hda/realtek: Re-order ALC882 Acer quirk table entries
    drm/radeon: fix copy of uninitialized variable back to userspace
  * cfg80211: scan: drop entry from hidden_list on overflow
      net/wireless/scan.c
    ipw2x00: potential buffer overflow in libipw_wx_set_encodeext()
    md: Fix missing unused status line of /proc/mdstat
    md: md_open returns -EBUSY when entering racing area
    md: factor out a mddev_find_locked helper from mddev_find
    md: split mddev_find
    md-cluster: fix use-after-free issue when removing rdev
    md/bitmap: wait for external bitmap writes to complete during tear down
    misc: vmw_vmci: explicitly initialize vmci_datagram payload
    misc: vmw_vmci: explicitly initialize vmci_notify_bm_set_msg struct
    misc: lis3lv02d: Fix false-positive WARN on various HP models
    iio:accel:adis16201: Fix wrong axis assignment that prevents loading
    FDDI: defxx: Bail out gracefully with unassigned PCI resource for CSR
    MIPS: pci-rt2880: fix slot 0 configuration
    MIPS: pci-mt7620: fix PLL lock check
    ASoC: samsung: tm2_wm5110: check of of_parse return value
    net/nfc: fix use-after-free llcp_sock_bind/connect
  * bluetooth: eliminate the potential race condition when removing the HCI controller
      net/bluetooth/hci_request.c
    hsr: use netdev_err() instead of WARN_ONCE()
  * Bluetooth: verify AMP hci_chan before amp_destroy
      include/net/bluetooth/hci_core.h
      net/bluetooth/hci_event.c
  * modules: inherit TAINT_PROPRIETARY_MODULE
      include/linux/module.h
      kernel/module.c
  * modules: return licensing information from find_symbol
      include/linux/module.h
      kernel/module.c
  * modules: rename the licence field in struct symsearch to license
      include/linux/module.h
      kernel/module.c
  * modules: unexport __module_address
      kernel/module.c
  * modules: unexport __module_text_address
      kernel/module.c
  * modules: mark each_symbol_section static
      include/linux/module.h
      kernel/module.c
  * modules: mark find_symbol static
      include/linux/module.h
      kernel/module.c
  * modules: mark ref_module static
      include/linux/module.h
      kernel/module.c
  * dm rq: fix double free of blk_mq_tag_set in dev remove after table load fails
      drivers/md/dm-rq.c
    dm space map common: fix division bug in sm_ll_find_free_block()
    dm persistent data: packed struct should have an aligned() attribute too
  * tracing: Restructure trace_clock_global() to never block
      kernel/trace/trace_clock.c
  * tracing: Map all PIDs to command lines
      kernel/trace/trace.c
    rsi: Use resume_noirq for SDIO
    tty: fix memory leak in vc_deallocate
    usb: dwc2: Fix session request interrupt handler
  * usb: dwc3: gadget: Fix START_TRANSFER link state check
      drivers/usb/dwc3/gadget.c
  * usb: gadget/function/f_fs string table fix for multiple languages
      drivers/usb/gadget/function/f_fs.c
  * usb: gadget: Fix double free of device descriptor pointers
      drivers/usb/gadget/config.c
    usb: gadget: dummy_hcd: fix gpf in gadget_setup
    media: dvbdev: Fix memory leak in dvb_media_device_free()
  * ext4: fix error code in ext4_commit_super
      fs/ext4/super.c
  * ext4: do not set SB_ACTIVE in ext4_orphan_cleanup()
      fs/ext4/super.c
  * ext4: fix check to prevent false positive report of incorrect used inodes
      fs/ext4/ialloc.c
    arm64: vdso: remove commas between macro name and arguments
  * posix-timers: Preserve return value in clock_adjtime32()
      kernel/time/posix-timers.c
  * Revert 337f13046f ("futex: Allow FUTEX_CLOCK_REALTIME with FUTEX_WAIT op")
      kernel/futex.c
    jffs2: check the validity of dstlen in jffs2_zlib_compress()
  * Fix misc new gcc warnings
      include/scsi/libfcoe.h
      net/bluetooth/ecdh_helper.h
  * security: commoncap: fix -Wstringop-overread warning
      security/commoncap.c
    dm raid: fix inconclusive reshape layout on fast raid4/5/6 table reload sequences
    md/raid1: properly indicate failure when ending a failed write request
    tpm: vtpm_proxy: Avoid reading host log when using a virtual device
    intel_th: pci: Add Alder Lake-M support
    powerpc: fix EDEADLOCK redefinition error in uapi/asm/errno.h
    powerpc/eeh: Fix EEH handling for hugepages in ioremap space.
    jffs2: Fix kasan slab-out-of-bounds problem
    NFSv4: Don't discard segments marked for return in _pnfs_return_layout()
    NFS: Don't discard pNFS layout segments that are marked for return
    ACPI: GTDT: Don't corrupt interrupt mappings on watchdow probe failure
    openvswitch: fix stack OOB read while fragmenting IPv4 packets
    mlxsw: spectrum_mr: Update egress RIF list before route's action
  * f2fs: fix to avoid out-of-bounds memory access
      fs/f2fs/node.c
    ubifs: Only check replay with inode type to judge if inode linked
  * arm64/vdso: Discard .note.gnu.property sections in vDSO
      arch/arm64/kernel/vdso/vdso.lds.S
    btrfs: fix race when picking most recent mod log operation for an old root
    ALSA: hda/realtek: Add quirk for Intel Clevo PCx0Dx
  * ALSA: usb-audio: Add dB range mapping for Sennheiser Communications Headset PC 8
      sound/usb/mixer_maps.c
  * ALSA: usb-audio: More constifications
      sound/usb/mixer.c
      sound/usb/mixer_maps.c
      sound/usb/mixer_quirks.c
      sound/usb/mixer_scarlett.c
      sound/usb/proc.c
      sound/usb/stream.c
      sound/usb/validate.c
  * ALSA: usb-audio: Explicitly set up the clock selector
      sound/usb/clock.c
    ALSA: sb: Fix two use after free in snd_sb_qsound_build
    ALSA: hda/conexant: Re-order CX5066 quirk table entries
    ALSA: emu8000: Fix a use after free in snd_emu8000_create_mixer
    s390/archrandom: add parameter check for s390_arch_random_generate
    scsi: libfc: Fix a format specifier
    scsi: lpfc: Remove unsupported mbox PORT_CAPABILITIES logic
    scsi: lpfc: Fix crash when a REG_RPI mailbox fails triggering a LOGO response
    drm/amdgpu: fix NULL pointer dereference
    amdgpu: avoid incorrect %hu format string
    drm/msm/mdp5: Configure PP_SYNC_HEIGHT to double the vtotal
    media: gscpa/stv06xx: fix memory leak
    media: dvb-usb: fix memory leak in dvb_usb_adapter_init
    media: i2c: adv7842: fix possible use-after-free in adv7842_remove()
    media: i2c: adv7511-v4l2: fix possible use-after-free in adv7511_remove()
    media: adv7604: fix possible use-after-free in adv76xx_remove()
    media: tc358743: fix possible use-after-free in tc358743_remove()
    power: supply: s3c_adc_battery: fix possible use-after-free in s3c_adc_bat_remove()
    power: supply: generic-adc-battery: fix possible use-after-free in gab_remove()
    clk: socfpga: arria10: Fix memory leak of socfpga_clk on error return
    media: vivid: update EDID
    media: em28xx: fix memory leak
    scsi: scsi_dh_alua: Remove check for ASC 24h in alua_rtpg()
    scsi: qla2xxx: Fix use after free in bsg
    scsi: qla2xxx: Always check the return value of qla24xx_get_isp_stats()
    drm/amdgpu : Fix asic reset regression issue introduce by 8f211fe8ac7c4f
    power: supply: Use IRQF_ONESHOT
    media: gspca/sq905.c: fix uninitialized variable
    media: media/saa7164: fix saa7164_encoder_register() memory leak bugs
    extcon: arizona: Fix some issues when HPDET IRQ fires after the jack has been unplugged
  * power: supply: bq27xxx: fix power_avg for newer ICs
      include/linux/power/bq27xxx_battery.h
  * media: drivers: media: pci: sta2x11: fix Kconfig dependency on GPIOLIB
      drivers/media/pci/sta2x11/Kconfig
    media: ite-cir: check for receive overflow
    scsi: target: pscsi: Fix warning in pscsi_complete_cmd()
    scsi: lpfc: Fix pt2pt connection does not recover after LOGO
    scsi: lpfc: Fix incorrect dbde assignment when building target abts wqe
    btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s
    phy: phy-twl4030-usb: Fix possible use-after-free in twl4030_usb_remove()
    intel_th: Consistency and off-by-one fix
    spi: omap-100k: Fix reference leak to master
    spi: dln2: Fix reference leak to master
  * xhci: fix potential array out of bounds with several interrupters
      drivers/usb/host/xhci.c
  * xhci: check control context is valid before dereferencing it.
      drivers/usb/host/xhci.c
  * usb: xhci-mtk: support quirk to disable usb2 lpm
      drivers/usb/host/xhci-mtk.h
  * perf/arm_pmu_platform: Fix error handling
      drivers/perf/arm_pmu_platform.c
    tee: optee: do not check memref size on return from Secure World
    x86/build: Propagate $(CLANG_FLAGS) to $(REALMODE_FLAGS)
  * PCI: PM: Do not read power state in pci_enable_device_flags()
      drivers/pci/pci.c
  * usb: xhci: Fix port minor revision
      drivers/usb/host/xhci-mem.c
  * usb: dwc3: gadget: Ignore EP queue requests during bus reset
      drivers/usb/dwc3/gadget.c
    usb: gadget: f_uac1: validate input parameters
    genirq/matrix: Prevent allocation counter corruption
    usb: gadget: uvc: add bInterval checking for HS mode
  * crypto: api - check for ERR pointers in crypto_destroy_tfm()
      crypto/api.c
      include/crypto/acompress.h
      include/crypto/aead.h
      include/crypto/akcipher.h
      include/crypto/hash.h
      include/crypto/kpp.h
      include/crypto/rng.h
      include/crypto/skcipher.h
    staging: wimax/i2400m: fix byte-order issue
    fbdev: zero-fill colormap in fbcmap.c
    intel_th: pci: Add Rocket Lake CPU support
    btrfs: fix metadata extent leak after failure to create subvolume
    cifs: Return correct error code from smb2_get_enc_key
    erofs: add unsupported inode i_format check
    mmc: core: Set read only for SD cards with permanent write protect bit
    mmc: core: Do a power cycle when the CMD11 fails
    mmc: block: Issue a cache flush only when it's enabled
    mmc: block: Update ext_csd.cache_ctrl if it was written
    mmc: sdhci-pci: Fix initialization of some SD cards for Intel BYT-based controllers
    scsi: qla2xxx: Fix crash in qla2xxx_mqueuecommand()
    spi: spi-ti-qspi: Free DMA resources
    mtd: rawnand: atmel: Update ecc_stats.corrected counter
    mtd: spinand: core: add missing MODULE_DEVICE_TABLE()
  * ecryptfs: fix kernel panic with null dev_name
      fs/ecryptfs/main.c
    arm64: dts: mt8173: fix property typo of 'phys' in dsi node
    arm64: dts: marvell: armada-37xx: add syscon compatible to NB clk node
    ARM: 9056/1: decompressor: fix BSS size calculation for LLVM ld.lld
    ftrace: Handle commands when closing set_ftrace_filter file
    ACPI: custom_method: fix a possible memory leak
    ACPI: custom_method: fix potential use-after-free issue
    s390/disassembler: increase ebpf disasm buffer size
  * BACKPORT: arm64: vdso32: drop -no-integrated-as flag
      arch/arm64/kernel/vdso32/Makefile
    ANDROID: GKI: update allowed list for incrementalfs.ko
  * ANDROID: dm-user: Drop additional reference
      drivers/md/dm-user.c
    ANDROID: FUSE OWNERS pointing to android-mainline OWNERS
  * UPSTREAM: sched: Fix out-of-bound access in uclamp
      kernel/sched/core.c
    Merge 4.19.190 into android-4.19-stable
Linux 4.19.190
  * ovl: allow upperdir inside lowerdir
      fs/overlayfs/super.c
    platform/x86: thinkpad_acpi: Correct thermal sensor allocation
  * USB: Add reset-resume quirk for WD19's Realtek Hub
      drivers/usb/core/quirks.c
  * USB: Add LPM quirk for Lenovo ThinkPad USB-C Dock Gen2 Ethernet
      drivers/usb/core/quirks.c
  * ALSA: usb-audio: Add MIDI quirk for Vox ToneLab EX
      sound/usb/quirks-table.h
    iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
  * bpf: Fix masking negation logic upon negative dst register
      kernel/bpf/verifier.c
    mips: Do not include hi and lo in clobber list for R6
    iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd()
  * net: usb: ax88179_178a: initialize local variables before use
      drivers/net/usb/ax88179_178a.c
    ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()
  * ACPI: tables: x86: Reserve memory occupied by ACPI tables
      include/linux/acpi.h
    erofs: fix extended inode could cross boundary
    BACKPORT: FROMGIT: virt_wifi: Return micros for BSS TSF values
    ANDROID: Add allowed symbols requried from Qualcomm drivers
  * ANDROID: GKI: QoS: Prevent usage of dev_pm_qos_request as pm_qos_request
      drivers/base/power/qos.c
      include/linux/pm_qos.h
      kernel/power/qos.c

Bug: 189791081
Change-Id: Iab7796f3e6639b2a0b38164baa538277769efa03
Signed-off-by: Lucas Wei <lucaswei@google.com>
2021-06-14 17:29:51 +08:00
Mihai Moldovan
4b35fe9255 kconfig: nconf: stop endless search loops
[ Upstream commit 8c94b430b9f6213dec84e309bb480a71778c4213 ]

If the user selects the very first entry in a page and performs a
search-up operation, or selects the very last entry in a page and
performs a search-down operation that will not succeed (e.g., via
[/]asdfzzz[Up Arrow]), nconf will never terminate searching the page.

The reason is that in this case, the starting point will be set to -1
or n, which is then translated into (n - 1) (i.e., the last entry of
the page) or 0 (i.e., the first entry of the page) and finally the
search begins. This continues to work fine until the index reaches 0 or
(n - 1), at which point it will be decremented to -1 or incremented to
n, but not checked against the starting point right away. Instead, it's
wrapped around to the bottom or top again, after which the starting
point check occurs... and naturally fails.

My original implementation added another check for -1 before wrapping
the running index variable around, but Masahiro Yamada pointed out that
the actual issue is that the comparison point (starting point) exceeds
bounds (i.e., the [0,n-1] interval) in the first place and that,
instead, the starting point should be fixed.

This has the welcome side-effect of also fixing the case where the
starting point was n while searching down, which also lead to an
infinite loop.

OTOH, this code is now essentially all his work.

Amazingly, nobody seems to have been hit by this for 11 years - or at
the very least nobody bothered to debug and fix this.

Signed-off-by: Mihai Moldovan <ionic@ionic.de>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2021-05-22 10:59:41 +02:00
Lucas Wei
e7e6a26ceb Merge LA.UM.9.12.R2.10.00.00.685.039 via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19
Conflicts:
	modified:   arch/arm64/configs/redbull_defconfig
	modified:   arch/arm64/configs/vendor/kona_defconfig
	modified:   arch/arm64/configs/vendor/lito_defconfig
	modified:   arch/arm64/include/asm/traps.h
	modified:   arch/arm64/kernel/smp.c
	modified:   arch/arm64/mm/dma-mapping.c
	modified:   arch/arm64/mm/fault.c
	modified:   drivers/android/binder.c
	modified:   drivers/base/power/wakeup.c
	modified:   drivers/bus/mhi/core/mhi_main.c
	modified:   drivers/clk/clk.c
	modified:   drivers/clocksource/arm_arch_timer.c
	modified:   drivers/cpuidle/lpm-levels.c
	modified:   drivers/crypto/msm/qcedev.c
	modified:   drivers/devfreq/governor_memlat_trace.h
	modified:   drivers/dma-buf/dma-buf.c
	modified:   drivers/gpu/Makefile
	modified:   drivers/gpu/drm/drm_dp_mst_topology.c
	modified:   drivers/gpu/drm/drm_edid.c
	modified:   drivers/gpu/msm/Kconfig
	modified:   drivers/gpu/msm/kgsl.c
	modified:   drivers/gpu/msm/kgsl_sharedmem.c
	modified:   drivers/hwtracing/coresight/coresight-etm-perf.c
	modified:   drivers/hwtracing/coresight/coresight-tmc-etr.c
	modified:   drivers/iommu/arm-smmu.c
	modified:   drivers/iommu/io-pgtable-arm.c
	modified:   drivers/iommu/io-pgtable-fast.c
	modified:   drivers/iommu/io-pgtable.c
	modified:   drivers/iommu/iommu.c
	modified:   drivers/leds/leds-qpnp-flash-v2.c
	modified:   drivers/misc/Kconfig
	modified:   drivers/misc/qseecom.c
	modified:   drivers/mmc/core/Kconfig
	modified:   drivers/mmc/core/block.c
	modified:   drivers/mmc/host/cqhci-crypto-qti.c
	modified:   drivers/mmc/host/cqhci-crypto.c
	modified:   drivers/mmc/host/cqhci.c
	modified:   drivers/mmc/host/sdhci-msm.c
	modified:   drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c
	modified:   drivers/net/wireless/ath/wil6210/interrupt.c
	modified:   drivers/net/wireless/ath/wil6210/wmi.c
	modified:   drivers/platform/msm/ipa/ipa_v3/ipa_qmi_service.c
	modified:   drivers/power/supply/power_supply_sysfs.c
	modified:   drivers/power/supply/qcom/Kconfig
	modified:   drivers/power/supply/qcom/Makefile
	modified:   drivers/power/supply/qcom/qg-core.h
	modified:   drivers/power/supply/qcom/qpnp-qg.c
	modified:   drivers/power/supply/qcom/qpnp-smb5.c
	modified:   drivers/power/supply/qcom/smb5-lib.c
	modified:   drivers/power/supply/qcom/smb5-lib.h
	modified:   drivers/regulator/core.c
	modified:   drivers/regulator/proxy-consumer.c
	modified:   drivers/scsi/ufs/ufs_quirks.h
	modified:   drivers/scsi/ufs/ufshcd.c
	modified:   drivers/soc/qcom/icnss.c
	modified:   drivers/soc/qcom/minidump_log.c
	modified:   drivers/soc/qcom/watchdog_v2.c
	modified:   drivers/spi/spi-geni-qcom.c
	modified:   drivers/staging/android/ion/Makefile
	modified:   drivers/staging/android/ion/ion.c
	modified:   drivers/thermal/cpu_cooling.c
	modified:   drivers/thermal/of-thermal.c
	modified:   drivers/thermal/thermal_core.c
	modified:   drivers/tty/serial/Kconfig
	modified:   drivers/tty/serial/Makefile
	modified:   drivers/tty/serial/msm_geni_serial.c
	modified:   drivers/usb/core/usb.c
	modified:   drivers/usb/dwc3/gadget.c
	modified:   drivers/usb/dwc3/gadget.h
	modified:   drivers/usb/gadget/composite.c
	modified:   drivers/usb/gadget/epautoconf.c
	modified:   drivers/usb/gadget/udc/core.c
	modified:   drivers/usb/host/xhci.c
	modified:   fs/crypto/crypto.c
	modified:   fs/crypto/keysetup.c
	modified:   fs/crypto/keysetup_v1.c
	modified:   fs/f2fs/checkpoint.c
	modified:   fs/f2fs/data.c
	modified:   fs/f2fs/f2fs.h
	modified:   fs/f2fs/node.c
	modified:   fs/incfs/Kconfig
	modified:   fs/incfs/data_mgmt.c
	modified:   fs/incfs/data_mgmt.h
	modified:   fs/incfs/vfs.c
	modified:   fs/proc/task_mmu.c
	modified:   include/drm/drm_connector.h
	modified:   include/drm/drm_dp_mst_helper.h
	modified:   include/linux/clk-provider.h
	modified:   include/linux/dma-buf.h
	modified:   include/linux/dma-mapping.h
	modified:   include/linux/fs.h
	modified:   include/linux/io-pgtable.h
	modified:   include/linux/iommu.h
	modified:   include/linux/mm.h
	modified:   include/linux/mm_types.h
	modified:   include/linux/mmc/host.h
	modified:   include/linux/mmzone.h
	modified:   include/linux/perf_event.h
	modified:   include/linux/power_supply.h
	modified:   include/linux/pwm.h
	modified:   include/linux/regulator/driver.h
	modified:   include/linux/rwsem.h
	modified:   include/linux/sched.h
	modified:   include/linux/sched/signal.h
	modified:   include/linux/sched/sysctl.h
	modified:   include/linux/sched/topology.h
	modified:   include/linux/sched/user.h
	modified:   include/linux/thermal.h
	modified:   include/linux/usb.h
	modified:   include/linux/usb/gadget.h
	modified:   include/linux/usb/hcd.h
	modified:   include/linux/vm_event_item.h
	modified:   include/net/cfg80211.h
	modified:   include/scsi/scsi_device.h
	modified:   include/soc/qcom/minidump.h
	modified:   include/soc/qcom/qmi_rmnet.h
	modified:   include/soc/qcom/socinfo.h
	modified:   include/trace/events/power.h
	modified:   include/uapi/drm/drm_mode.h
	modified:   include/uapi/linux/coresight-stm.h
	modified:   include/uapi/linux/ip.h
	modified:   include/uapi/linux/nl80211.h
	modified:   include/uapi/linux/videodev2.h
	modified:   kernel/dma/mapping.c
	modified:   kernel/dma/removed.c
	modified:   kernel/panic.c
	modified:   kernel/sched/cpupri.c
	modified:   kernel/sched/cpupri.h
	modified:   kernel/sched/fair.c
	modified:   kernel/sched/rt.c
	modified:   kernel/sched/sched.h
	modified:   kernel/sched/walt.h
	modified:   kernel/sysctl.c
	modified:   mm/Kconfig
	modified:   mm/compaction.c
	modified:   mm/oom_kill.c
	modified:   mm/page_alloc.c
	modified:   mm/vmalloc.c
	modified:   mm/vmscan.c
	modified:   net/qrtr/qrtr.c
	modified:   net/wireless/nl80211.c
	modified:   net/wireless/scan.c
	modified:   sound/core/init.c
	modified:   sound/soc/soc-core.c
	modified:   sound/usb/card.c
	modified:   sound/usb/pcm.c
	modified:   sound/usb/pcm.h
	modified:   sound/usb/usbaudio.h

Bug: 172988823
Bug: 173092548
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I9c86e3a0309b7078e7640788c00172c6e9b4cf67
2021-03-17 10:53:52 +08:00
Masahiro Yamada
0caa39f2c9 kconfig: fix return value of do_error_if()
[ Upstream commit 135b4957eac43af2aedf8e2a277b9540f33c2558 ]

$(error-if,...) is expanded to an empty string. Currently, it relies on
eval_clause() returning xstrdup("") when all attempts for expansion fail,
but the correct implementation is to make do_error_if() return xstrdup("").

Fixes: 1d6272e6fe ("kconfig: add 'info', 'warning-if', and 'error-if' built-in functions")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-12-30 11:26:06 +01:00
Srinivasarao P
90264576e2 Merge android-4.19-stable.125 (a483478) into msm-4.19
* refs/heads/tmp-a483478:
  UPSTREAM: arm64: vdso: Build vDSO with -ffixed-x18
  Revert "drm/dsi: Fix byte order of DCS set/get brightness"
  Reverting below patches from android-4.19-stable.125
  Linux 4.19.125
  rxrpc: Fix ack discard
  rxrpc: Trace discarded ACKs
  iio: adc: stm32-dfsdm: fix device used to request dma
  iio: adc: stm32-dfsdm: Use dma_request_chan() instead dma_request_slave_channel()
  iio: adc: stm32-adc: fix device used to request dma
  iio: adc: stm32-adc: Use dma_request_chan() instead dma_request_slave_channel()
  x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks
  rxrpc: Fix a memory leak in rxkad_verify_response()
  rapidio: fix an error in get_user_pages_fast() error handling
  ipack: tpci200: fix error return code in tpci200_register()
  mei: release me_cl object reference
  misc: rtsx: Add short delay after exit from ASPM
  iio: dac: vf610: Fix an error handling path in 'vf610_dac_probe()'
  iio: sca3000: Remove an erroneous 'get_device()'
  staging: greybus: Fix uninitialized scalar variable
  staging: iio: ad2s1210: Fix SPI reading
  Revert "gfs2: Don't demote a glock until its revokes are written"
  brcmfmac: abort and release host after error
  tty: serial: qcom_geni_serial: Fix wrap around of TX buffer
  cxgb4/cxgb4vf: Fix mac_hlist initialization and free
  cxgb4: free mac_hlist properly
  net: bcmgenet: abort suspend on error
  net: bcmgenet: code movement
  Revert "net/ibmvnic: Fix EOI when running in XIVE mode"
  media: fdp1: Fix R-Car M3-N naming in debug message
  thunderbolt: Drop duplicated get_switch_at_route()
  staging: most: core: replace strcpy() by strscpy()
  libnvdimm/btt: Fix LBA masking during 'free list' population
  libnvdimm/btt: Remove unnecessary code in btt_freelist_init
  nfit: Add Hyper-V NVDIMM DSM command set to white list
  powerpc/64s: Disable STRICT_KERNEL_RWX
  powerpc: Remove STRICT_KERNEL_RWX incompatibility with RELOCATABLE
  drm/i915/gvt: Init DPLL/DDI vreg for virtual display instead of inheritance.
  dmaengine: owl: Use correct lock in owl_dma_get_pchan()
  dmaengine: tegra210-adma: Fix an error handling path in 'tegra_adma_probe()'
  apparmor: Fix aa_label refcnt leak in policy_update
  apparmor: fix potential label refcnt leak in aa_change_profile
  apparmor: Fix use-after-free in aa_audit_rule_init
  drm/etnaviv: fix perfmon domain interation
  ALSA: hda/realtek - Add more fixup entries for Clevo machines
  ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Xtreme
  ALSA: pcm: fix incorrect hw_base increase
  ALSA: iec1712: Initialize STDSP24 properly when using the model=staudio option
  padata: purge get_cpu and reorder_via_wq from padata_do_serial
  padata: initialize pd->cpu with effective cpumask
  padata: Replace delayed timer with immediate workqueue in padata_reorder
  ARM: futex: Address build warning
  platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA
  USB: core: Fix misleading driver bug report
  stmmac: fix pointer check after utilization in stmmac_interrupt
  ceph: fix double unlock in handle_cap_export()
  HID: quirks: Add HID_QUIRK_NO_INIT_REPORTS quirk for Dell K12A keyboard-dock
  gtp: set NLM_F_MULTI flag in gtp_genl_dump_pdp()
  x86/apic: Move TSC deadline timer debug printk
  HID: i2c-hid: reset Synaptics SYNA2393 on resume
  scsi: ibmvscsi: Fix WARN_ON during event pool release
  component: Silence bind error on -EPROBE_DEFER
  aquantia: Fix the media type of AQC100 ethernet controller in the driver
  vhost/vsock: fix packet delivery order to monitoring devices
  configfs: fix config_item refcnt leak in configfs_rmdir()
  scsi: qla2xxx: Delete all sessions before unregister local nvme port
  scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV
  HID: alps: ALPS_1657 is too specific; use U1_UNICORN_LEGACY instead
  HID: alps: Add AUI1657 device ID
  HID: multitouch: add eGalaxTouch P80H84 support
  gcc-common.h: Update for GCC 10
  ubi: Fix seq_file usage in detailed_erase_block_info debugfs file
  i2c: mux: demux-pinctrl: Fix an error handling path in 'i2c_demux_pinctrl_probe()'
  iommu/amd: Fix over-read of ACPI UID from IVRS table
  ubifs: remove broken lazytime support
  fix multiplication overflow in copy_fdtable()
  mtd: spinand: Propagate ECC information to the MTD structure
  ima: Fix return value of ima_write_policy()
  evm: Check also if *tfm is an error pointer in init_desc()
  ima: Set file->f_mode instead of file->f_flags in ima_calc_file_hash()
  riscv: set max_pfn to the PFN of the last page
  KVM: SVM: Fix potential memory leak in svm_cpu_init()
  i2c: dev: Fix the race between the release of i2c_dev and cdev
  ubsan: build ubsan.c more conservatively
  x86/uaccess, ubsan: Fix UBSAN vs. SMAP
  ANDROID: scsi: ufs: Handle clocks when lrbp fails
  ANDROID: fscrypt: handle direct I/O with IV_INO_LBLK_32
  BACKPORT: FROMLIST: fscrypt: add support for IV_INO_LBLK_32 policies
  ANDROID: Update the ABI xml and qcom whitelist
  ANDROID: Fix build.config.gki-debug
  Linux 4.19.124
  Makefile: disallow data races on gcc-10 as well
  KVM: x86: Fix off-by-one error in kvm_vcpu_ioctl_x86_setup_mce
  ARM: dts: r8a7740: Add missing extal2 to CPG node
  arm64: dts: renesas: r8a77980: Fix IPMMU VIP[01] nodes
  ARM: dts: r8a73a4: Add missing CMT1 interrupts
  arm64: dts: rockchip: Rename dwc3 device nodes on rk3399 to make dtc happy
  arm64: dts: rockchip: Replace RK805 PMIC node name with "pmic" on rk3328 boards
  clk: Unlink clock if failed to prepare or enable
  Revert "ALSA: hda/realtek: Fix pop noise on ALC225"
  usb: gadget: legacy: fix error return code in cdc_bind()
  usb: gadget: legacy: fix error return code in gncm_bind()
  usb: gadget: audio: Fix a missing error return value in audio_bind()
  usb: gadget: net2272: Fix a memory leak in an error handling path in 'net2272_plat_probe()'
  dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg()
  clk: rockchip: fix incorrect configuration of rk3228 aclk_gpu* clocks
  exec: Move would_dump into flush_old_exec
  x86/unwind/orc: Fix error handling in __unwind_start()
  x86: Fix early boot crash on gcc-10, third try
  cifs: fix leaked reference on requeued write
  ARM: dts: imx27-phytec-phycard-s-rdk: Fix the I2C1 pinctrl entries
  ARM: dts: dra7: Fix bus_dma_limit for PCIe
  usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb sg list
  USB: gadget: fix illegal array access in binding with UDC
  usb: host: xhci-plat: keep runtime active when removing host
  usb: core: hub: limit HUB_QUIRK_DISABLE_AUTOSUSPEND to USB5534B
  ALSA: usb-audio: Add control message quirk delay for Kingston HyperX headset
  ALSA: rawmidi: Fix racy buffer resize under concurrent accesses
  ALSA: hda/realtek - Limit int mic boost for Thinkpad T530
  gcc-10: avoid shadowing standard library 'free()' in crypto
  gcc-10: disable 'restrict' warning for now
  gcc-10: disable 'stringop-overflow' warning for now
  gcc-10: disable 'array-bounds' warning for now
  gcc-10: disable 'zero-length-bounds' warning for now
  Stop the ad-hoc games with -Wno-maybe-initialized
  kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig
  gcc-10 warnings: fix low-hanging fruit
  pnp: Use list_for_each_entry() instead of open coding
  hwmon: (da9052) Synchronize access with mfd
  IB/mlx4: Test return value of calls to ib_get_cached_pkey
  netfilter: nft_set_rbtree: Introduce and use nft_rbtree_interval_start()
  arm64: fix the flush_icache_range arguments in machine_kexec
  netfilter: conntrack: avoid gcc-10 zero-length-bounds warning
  NFSv4: Fix fscache cookie aux_data to ensure change_attr is included
  nfs: fscache: use timespec64 in inode auxdata
  NFS: Fix fscache super_cookie index_key from changing after umount
  mmc: block: Fix request completion in the CQE timeout path
  mmc: core: Check request type before completing the request
  i40iw: Fix error handling in i40iw_manage_arp_cache()
  pinctrl: cherryview: Add missing spinlock usage in chv_gpio_irq_handler
  pinctrl: baytrail: Enable pin configuration setting for GPIO chip
  gfs2: Another gfs2_walk_metadata fix
  ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse
  ipc/util.c: sysvipc_find_ipc() incorrectly updates position index
  drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper()
  ALSA: hda/hdmi: fix race in monitor detection during probe
  cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once
  dmaengine: mmp_tdma: Reset channel error on release
  dmaengine: pch_dma.c: Avoid data race between probe and irq handler
  riscv: fix vdso build with lld
  tcp: fix SO_RCVLOWAT hangs with fat skbs
  net: tcp: fix rx timestamp behavior for tcp_recvmsg
  netprio_cgroup: Fix unlimited memory leak of v2 cgroups
  net: ipv4: really enforce backoff for redirects
  net: dsa: loop: Add module soft dependency
  hinic: fix a bug of ndo_stop
  virtio_net: fix lockdep warning on 32 bit
  tcp: fix error recovery in tcp_zerocopy_receive()
  Revert "ipv6: add mtu lock check in __ip6_rt_update_pmtu"
  pppoe: only process PADT targeted at local interfaces
  net: phy: fix aneg restart in phy_ethtool_set_eee
  netlabel: cope with NULL catmap
  net: fix a potential recursive NETDEV_FEAT_CHANGE
  mmc: sdhci-acpi: Add SDHCI_QUIRK2_BROKEN_64_BIT_DMA for AMDI0040
  scsi: sg: add sg_remove_request in sg_write
  virtio-blk: handle block_device_operations callbacks after hot unplug
  drop_monitor: work around gcc-10 stringop-overflow warning
  net: moxa: Fix a potential double 'free_irq()'
  net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'
  shmem: fix possible deadlocks on shmlock_user_lock
  net: dsa: Do not make user port errors fatal
  ANDROID: rtc: class: call hctosys in resource managed registration
  ANDROID: GKI: Update the ABI xml and whitelist
  ANDROID: power_supply: Add RTX power-supply property
  f2fs: flush dirty meta pages when flushing them
  f2fs: fix checkpoint=disable:%u%%
  f2fs: rework filename handling
  f2fs: split f2fs_d_compare() from f2fs_match_name()
  f2fs: don't leak filename in f2fs_try_convert_inline_dir()
  ANDROID: clang: update to 11.0.1
  FROMLIST: x86_64: fix jiffies ODR violation
  ANDROID: arm64: vdso: Fix removing SCS flags
  ANDROID: GKI: Update the ABI xml and whitelist
  ANDROID: Incremental fs: wake up log pollers less often
  ANDROID: Incremental fs: Fix scheduling while atomic error
  ANDROID: Incremental fs: Avoid continually recalculating hashes
  ANDROID: export: Disable symbol trimming on modules
  ANDROID: GKI: Update the ABI xml and whitelist
  ANDROID: fscrypt: set dun_bytes more precisely
  ANDROID: dm-default-key: set dun_bytes more precisely
  ANDROID: block: backport the ability to specify max_dun_bytes
  ANDROID: Revert "ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m"
  Linux 4.19.123
  ipc/mqueue.c: change __do_notify() to bypass check_kill_permission()
  scripts/decodecode: fix trapping instruction formatting
  objtool: Fix stack offset tracking for indirect CFAs
  netfilter: nf_osf: avoid passing pointer to local var
  netfilter: nat: never update the UDP checksum when it's 0
  x86/unwind/orc: Fix premature unwind stoppage due to IRET frames
  x86/unwind/orc: Fix error path for bad ORC entry type
  x86/unwind/orc: Prevent unwinding before ORC initialization
  x86/unwind/orc: Don't skip the first frame for inactive tasks
  x86/entry/64: Fix unwind hints in rewind_stack_do_exit()
  x86/entry/64: Fix unwind hints in kernel exit path
  x86/entry/64: Fix unwind hints in register clearing code
  batman-adv: Fix refcnt leak in batadv_v_ogm_process
  batman-adv: Fix refcnt leak in batadv_store_throughput_override
  batman-adv: Fix refcnt leak in batadv_show_throughput_override
  batman-adv: fix batadv_nc_random_weight_tq
  KVM: VMX: Mark RCX, RDX and RSI as clobbered in vmx_vcpu_run()'s asm blob
  KVM: VMX: Explicitly reference RCX as the vmx_vcpu pointer in asm blobs
  coredump: fix crash when umh is disabled
  staging: gasket: Check the return value of gasket_get_bar_index()
  mm/page_alloc: fix watchdog soft lockups during set_zone_contiguous()
  arm64: hugetlb: avoid potential NULL dereference
  KVM: arm64: Fix 32bit PC wrap-around
  KVM: arm: vgic: Fix limit condition when writing to GICD_I[CS]ACTIVER
  tracing: Add a vmalloc_sync_mappings() for safe measure
  USB: serial: garmin_gps: add sanity checking for data length
  USB: uas: add quirk for LaCie 2Big Quadra
  HID: usbhid: Fix race between usbhid_close() and usbhid_stop()
  sctp: Fix bundling of SHUTDOWN with COOKIE-ACK
  HID: wacom: Read HID_DG_CONTACTMAX directly for non-generic devices
  net: stricter validation of untrusted gso packets
  bnxt_en: Fix VF anti-spoof filter setup.
  bnxt_en: Improve AER slot reset.
  net/mlx5: Fix command entry leak in Internal Error State
  net/mlx5: Fix forced completion access non initialized command entry
  bnxt_en: Fix VLAN acceleration handling in bnxt_fix_features().
  tipc: fix partial topology connection closure
  sch_sfq: validate silly quantum values
  sch_choke: avoid potential panic in choke_reset()
  net: usb: qmi_wwan: add support for DW5816e
  net_sched: sch_skbprio: add message validation to skbprio_change()
  net/mlx4_core: Fix use of ENOSPC around mlx4_counter_alloc()
  net: macsec: preserve ingress frame ordering
  fq_codel: fix TCA_FQ_CODEL_DROP_BATCH_SIZE sanity checks
  dp83640: reverse arguments to list_add_tail
  vt: fix unicode console freeing with a common interface
  tracing/kprobes: Fix a double initialization typo
  USB: serial: qcserial: Add DW5816e support
  ANDROID: usb: gadget: Add missing inline qualifier to stub functions
  ANDROID: Drop ABI monitoring from KASAN build config
  ANDROID: Rename build.config.gki.arch_kasan
  ANDROID: GKI: Enable CONFIG_STATIC_USERMODEHELPER
  ANDROID: dm-default-key: Update key size for wrapped keys
  ANDROID: gki_defconfig: enable CONFIG_MMC_CRYPTO
  ANDROID: mmc: MMC crypto API
  ANDROID: GKI: Update the ABI xml and whitelist
  ANDROID: GKI: add missing exports for cam_smmu_api.ko
  Linux 4.19.122
  drm/atomic: Take the atomic toys away from X
  cgroup, netclassid: remove double cond_resched
  mac80211: add ieee80211_is_any_nullfunc()
  platform/x86: GPD pocket fan: Fix error message when temp-limits are out of range
  ALSA: hda: Match both PCI ID and SSID for driver blacklist
  hexagon: define ioremap_uc
  hexagon: clean up ioremap
  mfd: intel-lpss: Use devm_ioremap_uc for MMIO
  lib: devres: add a helper function for ioremap_uc
  drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event
  sctp: Fix SHUTDOWN CTSN Ack in the peer restart case
  net: systemport: suppress warnings on failed Rx SKB allocations
  net: bcmgenet: suppress warnings on failed Rx SKB allocations
  lib/mpi: Fix building for powerpc with clang
  scripts/config: allow colons in option strings for sed
  s390/ftrace: fix potential crashes when switching tracers
  cifs: protect updating server->dstaddr with a spinlock
  ASoC: rsnd: Fix "status check failed" spam for multi-SSI
  ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent
  net: stmmac: Fix sub-second increment
  net: stmmac: fix enabling socfpga's ptp_ref_clock
  wimax/i2400m: Fix potential urb refcnt leak
  drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii)
  ASoC: codecs: hdac_hdmi: Fix incorrect use of list_for_each_entry
  ASoC: rsnd: Fix HDMI channel mapping for multi-SSI mode
  ASoC: rsnd: Fix parent SSI start/stop in multi-SSI mode
  usb: dwc3: gadget: Properly set maxpacket limit
  ASoC: sgtl5000: Fix VAG power-on handling
  selftests/ipc: Fix test failure seen after initial test run
  ASoC: topology: Check return value of pcm_new_ver
  powerpc/pci/of: Parse unassigned resources
  vhost: vsock: kick send_pkt worker once device is started
  ANDROID: GKI: fix build warning on 32bits due to ASoC msm change
  ANDROID: GKI: fix build error on 32bits due to ASoC msm change
  ANDROID: GKI: update abi definition due to FAIR_GROUP_SCHED removal
  ANDROID: GKI: Remove FAIR_GROUP_SCHED
  ANDROID: GKI: BULK update ABI XML representation and qcom whitelist
  ANDROID: build.config.gki.aarch64: Enable WHITELIST_STRICT_MODE
  ANDROID: GKI: Update the ABI xml and qcom whitelist
  ANDROID: remove unused variable
  ANDROID: Drop ABI monitoring from KASAN build config
  Linux 4.19.121
  mmc: meson-mx-sdio: remove the broken ->card_busy() op
  mmc: meson-mx-sdio: Set MMC_CAP_WAIT_WHILE_BUSY
  mmc: sdhci-msm: Enable host capabilities pertains to R1b response
  mmc: sdhci-pci: Fix eMMC driver strength for BYT-based controllers
  mmc: sdhci-xenon: fix annoying 1.8V regulator warning
  mmc: cqhci: Avoid false "cqhci: CQE stuck on" by not open-coding timeout loop
  btrfs: transaction: Avoid deadlock due to bad initialization timing of fs_info::journal_info
  btrfs: fix partial loss of prealloc extent past i_size after fsync
  selinux: properly handle multiple messages in selinux_netlink_send()
  dmaengine: dmatest: Fix iteration non-stop logic
  nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl
  ALSA: opti9xx: shut up gcc-10 range warning
  iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system
  scsi: target/iblock: fix WRITE SAME zeroing
  iommu/qcom: Fix local_base status check
  vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn()
  vfio: avoid possible overflow in vfio_iommu_type1_pin_pages
  RDMA/core: Fix race between destroy and release FD object
  RDMA/core: Prevent mixed use of FDs between shared ufiles
  RDMA/mlx4: Initialize ib_spec on the stack
  RDMA/mlx5: Set GRH fields in query QP on RoCE
  scsi: qla2xxx: check UNLOADING before posting async work
  scsi: qla2xxx: set UNLOADING before waiting for session deletion
  dm multipath: use updated MPATHF_QUEUE_IO on mapping for bio-based mpath
  dm writecache: fix data corruption when reloading the target
  dm verity fec: fix hash block number in verity_fec_decode
  PM: hibernate: Freeze kernel threads in software_resume()
  PM: ACPI: Output correct message on target power state
  ALSA: pcm: oss: Place the plugin buffer overflow checks correctly
  ALSA: hda/hdmi: fix without unlocked before return
  ALSA: usb-audio: Correct a typo of NuPrime DAC-10 USB ID
  ALSA: hda/realtek - Two front mics on a Lenovo ThinkCenter
  btrfs: fix block group leak when removing fails
  drm/qxl: qxl_release use after free
  drm/qxl: qxl_release leak in qxl_hw_surface_alloc()
  drm/qxl: qxl_release leak in qxl_draw_dirty_fb()
  drm/edid: Fix off-by-one in DispID DTD pixel clock
  ANDROID: GKI: Bulk update ABI XML representation
  ANDROID: GKI: Enable net testing options
  ANDROID: gki_defconfig: Enable CONFIG_REMOTEPROC
  ANDROID: Rename build.config.gki.arch_kasan
  ANDROID: GKI: Update ABI for IOMMU
  ANDROID: Incremental fs: Fix issues with very large files
  ANDROID: Correct build.config branch name
  ANDROID: GKI: Bulk update ABI XML representation and whitelist.
  UPSTREAM: vdso: Fix clocksource.h macro detection
  ANDROID: GKI: update abi definition due to added padding
  ANDROID: GKI: networking: add Android ABI padding to a lot of networking structures
  ANDROID: GKI: dma-mapping.h: add Android ABI padding to a structure
  ANDROID: GKI: ioport.h: add Android ABI padding to a structure
  ANDROID: GKI: iomap.h: add Android ABI padding to a structure
  ANDROID: GKI: genhd.h: add Android ABI padding to some structures
  ANDROID: GKI: hrtimer.h: add Android ABI padding to a structure
  ANDROID: GKI: ethtool.h: add Android ABI padding to a structure
  ANDROID: GKI: sched: add Android ABI padding to some structures
  ANDROID: GKI: kernfs.h: add Android ABI padding to some structures
  ANDROID: GKI: kobject.h: add Android ABI padding to some structures
  ANDROID: GKI: mm.h: add Android ABI padding to a structure
  ANDROID: GKI: mmu_notifier.h: add Android ABI padding to some structures
  ANDROID: GKI: pci: add Android ABI padding to some structures
  ANDROID: GKI: irqdomain.h: add Android ABI padding to a structure
  ANDROID: GKI: blk_types.h: add Android ABI padding to a structure
  ANDROID: GKI: scsi.h: add Android ABI padding to a structure
  ANDROID: GKI: quota.h: add Android ABI padding to some structures
  ANDROID: GKI: timer.h: add Android ABI padding to a structure
  ANDROID: GKI: user_namespace.h: add Android ABI padding to a structure
  FROMGIT: f2fs: fix missing check for f2fs_unlock_op
  Linux 4.19.120
  propagate_one(): mnt_set_mountpoint() needs mount_lock
  ext4: check for non-zero journal inum in ext4_calculate_overhead
  qed: Fix use after free in qed_chain_free
  bpf, x86_32: Fix clobbering of dst for BPF_JSET
  hwmon: (jc42) Fix name to have no illegal characters
  ext4: convert BUG_ON's to WARN_ON's in mballoc.c
  ext4: increase wait time needed before reuse of deleted inode numbers
  ext4: use matching invalidatepage in ext4_writepage
  arm64: Delete the space separator in __emit_inst
  ALSA: hda: call runtime_allow() for all hda controllers
  xen/xenbus: ensure xenbus_map_ring_valloc() returns proper grant status
  objtool: Support Clang non-section symbols in ORC dump
  objtool: Fix CONFIG_UBSAN_TRAP unreachable warnings
  scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN
  scsi: target: fix PR IN / READ FULL STATUS for FC
  ALSA: hda: Explicitly permit using autosuspend if runtime PM is supported
  ALSA: hda: Keep the controller initialization even if no codecs found
  xfs: fix partially uninitialized structure in xfs_reflink_remap_extent
  x86: hyperv: report value of misc_features
  net: fec: set GPR bit on suspend by DT configuration.
  bpf, x86: Fix encoding for lower 8-bit registers in BPF_STX BPF_B
  xfs: clear PF_MEMALLOC before exiting xfsaild thread
  mm: shmem: disable interrupt when acquiring info->lock in userfaultfd_copy path
  bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension
  perf/core: fix parent pid/tid in task exit events
  net/mlx5: Fix failing fw tracer allocation on s390
  cpumap: Avoid warning when CONFIG_DEBUG_PER_CPU_MAPS is enabled
  ARM: dts: bcm283x: Disable dsi0 node
  PCI: Move Apex Edge TPU class quirk to fix BAR assignment
  PCI: Avoid ASMedia XHCI USB PME# from D0 defect
  svcrdma: Fix leak of svc_rdma_recv_ctxt objects
  svcrdma: Fix trace point use-after-free race
  xfs: acquire superblock freeze protection on eofblocks scans
  net/cxgb4: Check the return from t4_query_params properly
  rxrpc: Fix DATA Tx to disable nofrag for UDP on AF_INET6 socket
  i2c: altera: use proper variable to hold errno
  nfsd: memory corruption in nfsd4_lock()
  ASoC: wm8960: Fix wrong clock after suspend & resume
  ASoC: tas571x: disable regulators on failed probe
  ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs
  iio:ad7797: Use correct attribute_group
  usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
  usb: dwc3: gadget: Do link recovery for SS and SSP
  binder: take read mode of mmap_sem in binder_alloc_free_page()
  include/uapi/linux/swab.h: fix userspace breakage, use __BITS_PER_LONG for swap
  mtd: cfi: fix deadloop in cfi_cmdset_0002.c do_write_buffer
  remoteproc: Fix wrong rvring index computation
  FROMLIST: PM / devfreq: Restart previous governor if new governor fails to start
  ANDROID: GKI: arm64: Enable GZIP and LZ4 kernel compression modes
  ANDROID: GKI: arm64: gki_defconfig: Set arm_smmu configuration
  ANDROID: GKI: iommu/arm-smmu: Modularize ARM SMMU driver
  ANDROID: GKI: iommu: Snapshot of vendor changes
  ANDROID: GKI: Additions to ARM SMMU register definitions
  ANDROID: GKI: iommu/io-pgtable-arm: LPAE related updates by vendor
  ANDROID: GKI: common: dma-mapping: make dma_common_contiguous_remap more robust
  ANDROID: GKI: dma-coherent: Expose device base address and size
  ANDROID: GKI: arm64: add support for NO_KERNEL_MAPPING and STRONGLY_ORDERED
  ANDROID: GKI: dma-mapping: Add dma_remap functions
  ANDROID: GKI: arm64: Support early fixup for CMA
  ANDROID: GKI: iommu: dma-mapping-fast: Fast ARMv7/v8 Long Descriptor Format
  ANDROID: GKI: arm64: dma-mapping: add support for IOMMU mapper
  ANDROID: GKI: add ARCH_NR_GPIO for ABI match
  ANDROID: GKI: kernel: Export symbol of `cpu_do_idle`
  ANDROID: GKI: kernel: Export symbols needed by msm_minidump.ko and minidump_log.ko (again)
  ANDROID: GKI: add missing exports for __flush_dcache_area
  ANDROID: GKI: arm64: Export caching APIs
  ANDROID: GKI: arm64: provide dma cache routines with same API as 32 bit
  ANDROID: gki_defconfig: add FORTIFY_SOURCE, remove SPMI_MSM_PMIC_ARB
  Revert "ANDROID: GKI: spmi: pmic-arb: don't enable SPMI_MSM_PMIC_ARB by default"
  ANDROID: GKI: update abi definitions after adding padding
  ANDROID: GKI: elevator: add Android ABI padding to some structures
  ANDROID: GKI: dentry: add Android ABI padding to some structures
  ANDROID: GKI: bio: add Android ABI padding to some structures
  ANDROID: GKI: scsi: add Android ABI padding to some structures
  ANDROID: GKI: ufs: add Android ABI padding to some structures
  ANDROID: GKI: workqueue.h: add Android ABI padding to some structures
  ANDROID: GKI: fs.h: add Android ABI padding to some structures
  ANDROID: GKI: USB: add Android ABI padding to some structures
  ANDROID: GKI: mm: add Android ABI padding to some structures
  ANDROID: GKI: mount.h: add Android ABI padding to some structures
  ANDROID: GKI: sched.h: add Android ABI padding to some structures
  ANDROID: GKI: sock.h: add Android ABI padding to some structures
  ANDROID: GKI: module.h: add Android ABI padding to some structures
  ANDROID: GKI: device.h: add Android ABI padding to some structures
  ANDROID: GKI: phy: add Android ABI padding to some structures
  ANDROID: GKI: add android_kabi.h
  ANDROID: ABI: update due to previous changes in the tree
  BACKPORT: sched/core: Fix reset-on-fork from RT with uclamp
  ANDROID: GKI: Add support for missing V4L2 symbols
  ANDROID: GKI: Bulk update ABI XML representation
  ANDROID: GKI: arm64: psci: Support for OS initiated scheme
  ANDROID: GKI: net: add counter for number of frames coalesced in GRO
  ANDROID: GKI: cfg80211: Include length of kek in rekey data
  BACKPORT: loop: change queue block size to match when using DIO
  ANDROID: Incremental fs: Add setattr call
  ANDROID: GKI: enable CONFIG_RTC_SYSTOHC
  ANDROID: GKI: ipv4: add vendor padding to __IPV4_DEVCONF_* enums
  Revert "ANDROID: GKI: ipv4: increase __IPV4_DEVCONF_MAX to 64"
  ANDROID: driver: gpu: drm: fix export symbol types
  ANDROID: SoC: core: fix export symbol type
  ANDROID: ufshcd-crypto: fix export symbol type
  ANDROID: GKI: drivers: mailbox: fix race resulting in multiple message submission
  ANDROID: GKI: arm64: gki_defconfig: Enable a few thermal configs
  Revert "ANDROID: GKI: add base.h include to match MODULE_VERSIONS"
  FROMLIST: thermal: Make cooling device trip point writable from sysfs
  ANDROID: GKI: drivers: thermal: cpu_cooling: Use CPU ID as cooling device ID
  ANDROID: GKI: PM / devfreq: Allow min freq to be 0
  ANDROID: GKI: arm64: gki_defconfig: Enable REGULATOR_PROXY_CONSUMER
  ANDROID: GKI: Bulk Update ABI XML representation
  ANDROID: KASAN support for GKI remove CONFIG_CC_WERROR
  ANDROID: KASAN support for GKI
  ANDROID: virt_wifi: fix export symbol types
  ANDROID: vfs: fix export symbol type
  ANDROID: vfs: fix export symbol types
  ANDROID: fscrypt: fix export symbol type
  ANDROID: cfi: fix export symbol types
  ANDROID: bpf: fix export symbol type
  Linux 4.19.119
  s390/mm: fix page table upgrade vs 2ndary address mode accesses
  xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT
  serial: sh-sci: Make sure status register SCxSR is read in correct sequence
  xhci: prevent bus suspend if a roothub port detected a over-current condition
  usb: f_fs: Clear OS Extended descriptor counts to zero in ffs_data_reset()
  usb: dwc3: gadget: Fix request completion check
  UAS: fix deadlock in error handling and PM flushing work
  UAS: no use logging any details in case of ENODEV
  cdc-acm: introduce a cool down
  cdc-acm: close race betrween suspend() and acm_softint
  staging: vt6656: Power save stop wake_up_count wrap around.
  staging: vt6656: Fix pairwise key entry save.
  staging: vt6656: Fix drivers TBTT timing counter.
  staging: vt6656: Fix calling conditions of vnt_set_bss_mode
  staging: vt6656: Don't set RCR_MULTICAST or RCR_BROADCAST by default.
  vt: don't use kmalloc() for the unicode screen buffer
  vt: don't hardcode the mem allocation upper bound
  staging: comedi: Fix comedi_device refcnt leak in comedi_open
  staging: comedi: dt2815: fix writing hi byte of analog output
  powerpc/setup_64: Set cache-line-size based on cache-block-size
  ARM: imx: provide v7_cpu_resume() only on ARM_CPU_SUSPEND=y
  iwlwifi: mvm: beacon statistics shouldn't go backwards
  iwlwifi: pcie: actually release queue memory in TVQM
  ASoC: dapm: fixup dapm kcontrol widget
  audit: check the length of userspace generated audit records
  usb-storage: Add unusual_devs entry for JMicron JMS566
  tty: rocket, avoid OOB access
  tty: hvc: fix buffer overflow during hvc_alloc().
  KVM: VMX: Enable machine check support for 32bit targets
  KVM: Check validity of resolved slot when searching memslots
  KVM: s390: Return last valid slot if approx index is out-of-bounds
  tpm: ibmvtpm: retry on H_CLOSED in tpm_ibmvtpm_send()
  tpm/tpm_tis: Free IRQ if probing fails
  ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices
  ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
  ALSA: hda/realtek - Add new codec supported for ALC245
  ALSA: hda/realtek - Fix unexpected init_amp override
  ALSA: usx2y: Fix potential NULL dereference
  tools/vm: fix cross-compile build
  mm/ksm: fix NULL pointer dereference when KSM zero page is enabled
  mm/hugetlb: fix a addressing exception caused by huge_pte_offset
  vmalloc: fix remap_vmalloc_range() bounds checks
  USB: hub: Fix handling of connect changes during sleep
  USB: core: Fix free-while-in-use bug in the USB S-Glibrary
  USB: early: Handle AMD's spec-compliant identifiers, too
  USB: Add USB_QUIRK_DELAY_CTRL_MSG and USB_QUIRK_DELAY_INIT for Corsair K70 RGB RAPIDFIRE
  USB: sisusbvga: Change port variable from signed to unsigned
  fs/namespace.c: fix mountpoint reference counter race
  iio: xilinx-xadc: Make sure not exceed maximum samplerate
  iio: xilinx-xadc: Fix sequencer configuration for aux channels in simultaneous mode
  iio: xilinx-xadc: Fix clearing interrupt when enabling trigger
  iio: xilinx-xadc: Fix ADC-B powerdown
  iio: adc: stm32-adc: fix sleep in atomic context
  iio: st_sensors: rely on odr mask to know if odr can be set
  iio: core: remove extra semi-colon from devm_iio_device_register() macro
  ALSA: usb-audio: Add connector notifier delegation
  ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos
  ALSA: hda: Remove ASUS ROG Zenith from the blacklist
  KEYS: Avoid false positive ENOMEM error on key read
  mlxsw: Fix some IS_ERR() vs NULL bugs
  vrf: Check skb for XFRM_TRANSFORMED flag
  xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish
  net: dsa: b53: b53_arl_rw_op() needs to select IVL or SVL
  net: dsa: b53: Rework ARL bin logic
  net: dsa: b53: Fix ARL register definitions
  net: dsa: b53: Lookup VID in ARL searches when VLAN is enabled
  vrf: Fix IPv6 with qdisc and xfrm
  team: fix hang in team_mode_get()
  tcp: cache line align MAX_TCP_HEADER
  sched: etf: do not assume all sockets are full blown
  net/x25: Fix x25_neigh refcnt leak when receiving frame
  net: stmmac: dwmac-meson8b: Add missing boundary to RGMII TX clock array
  net: netrom: Fix potential nr_neigh refcnt leak in nr_add_node
  net: bcmgenet: correct per TX/RX ring statistics
  macvlan: fix null dereference in macvlan_device_event()
  macsec: avoid to set wrong mtu
  ipv6: fix restrict IPV6_ADDRFORM operation
  cxgb4: fix large delays in PTP synchronization
  cxgb4: fix adapter crash due to wrong MC size
  x86/KVM: Clean up host's steal time structure
  x86/KVM: Make sure KVM_VCPU_FLUSH_TLB flag is not missed
  x86/kvm: Cache gfn to pfn translation
  x86/kvm: Introduce kvm_(un)map_gfn()
  KVM: Properly check if "page" is valid in kvm_vcpu_unmap
  kvm: fix compile on s390 part 2
  kvm: fix compilation on s390
  kvm: fix compilation on aarch64
  KVM: Introduce a new guest mapping API
  KVM: nVMX: Always sync GUEST_BNDCFGS when it comes from vmcs01
  KVM: VMX: Zero out *all* general purpose registers after VM-Exit
  f2fs: fix to avoid memory leakage in f2fs_listxattr
  blktrace: fix dereference after null check
  blktrace: Protect q->blk_trace with RCU
  net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup
  net: ipv6: add net argument to ip6_dst_lookup_flow
  PCI/ASPM: Allow re-enabling Clock PM
  scsi: smartpqi: fix call trace in device discovery
  virtio-blk: improve virtqueue error to BLK_STS
  tracing/selftests: Turn off timeout setting
  drm/amd/display: Not doing optimize bandwidth if flip pending.
  xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3
  ASoC: Intel: bytcr_rt5640: Add quirk for MPMAN MPWIN895CL tablet
  perf/core: Disable page faults when getting phys address
  pwm: bcm2835: Dynamically allocate base
  pwm: renesas-tpu: Fix late Runtime PM enablement
  Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled"
  loop: Better discard support for block devices
  s390/cio: avoid duplicated 'ADD' uevents
  kconfig: qconf: Fix a few alignment issues
  ipc/util.c: sysvipc_find_ipc() should increase position index
  selftests: kmod: fix handling test numbers above 9
  kernel/gcov/fs.c: gcov_seq_next() should increase position index
  nvme: fix deadlock caused by ANA update wrong locking
  ASoC: Intel: atom: Take the drv->lock mutex before calling sst_send_slot_map()
  scsi: iscsi: Report unbind session event when the target has been removed
  pwm: rcar: Fix late Runtime PM enablement
  ceph: don't skip updating wanted caps when cap is stale
  ceph: return ceph_mdsc_do_request() errors from __get_parent()
  scsi: lpfc: Fix crash in target side cable pulls hitting WAIT_FOR_UNREG
  scsi: lpfc: Fix kasan slab-out-of-bounds error in lpfc_unreg_login
  watchdog: reset last_hw_keepalive time at start
  arm64: Silence clang warning on mismatched value/register sizes
  arm64: compat: Workaround Neoverse-N1 #1542419 for compat user-space
  arm64: Fake the IminLine size on systems affected by Neoverse-N1 #1542419
  arm64: errata: Hide CTR_EL0.DIC on systems affected by Neoverse-N1 #1542419
  arm64: Add part number for Neoverse N1
  vti4: removed duplicate log message.
  crypto: mxs-dcp - make symbols 'sha1_null_hash' and 'sha256_null_hash' static
  bpftool: Fix printing incorrect pointer in btf_dump_ptr
  drm/msm: Use the correct dma_sync calls harder
  ext4: fix extent_status fragmentation for plain files
  ANDROID: abi_gki_aarch64_cuttlefish_whitelist: remove stale symbols
  ANDROID: GKI: ipv4: increase __IPV4_DEVCONF_MAX to 64
  ANDROID: GKI: power: add missing export for POWER_RESET_QCOM=m
  BACKPORT: cfg80211: Support key configuration for Beacon protection (BIGTK)
  BACKPORT: cfg80211: Enhance the AKM advertizement to support per interface.
  UPSTREAM: sysrq: Use panic() to force a crash
  ANDROID: GKI: kernel: sound: update codec options with block size
  ANDROID: add compat cross compiler
  ANDROID: x86/vdso: disable LTO only for VDSO
  BACKPORT: arm64: vdso32: Enable Clang Compilation
  UPSTREAM: arm64: compat: vdso: Expose BUILD_VDSO32
  BACKPORT: lib/vdso: Enable common headers
  BACKPORT: arm: vdso: Enable arm to use common headers
  BACKPORT: x86/vdso: Enable x86 to use common headers
  BACKPORT: mips: vdso: Enable mips to use common headers
  UPSTREAM: arm64: vdso32: Include common headers in the vdso library
  UPSTREAM: arm64: vdso: Include common headers in the vdso library
  UPSTREAM: arm64: Introduce asm/vdso/processor.h
  BACKPORT: arm64: vdso32: Code clean up
  UPSTREAM: linux/elfnote.h: Replace elf.h with UAPI equivalent
  UPSTREAM: scripts: Fix the inclusion order in modpost
  UPSTREAM: common: Introduce processor.h
  UPSTREAM: linux/ktime.h: Extract common header for vDSO
  UPSTREAM: linux/jiffies.h: Extract common header for vDSO
  UPSTREAM: linux/time64.h: Extract common header for vDSO
  BACKPORT: linux/time32.h: Extract common header for vDSO
  BACKPORT: linux/time.h: Extract common header for vDSO
  UPSTREAM: linux/math64.h: Extract common header for vDSO
  BACKPORT: linux/clocksource.h: Extract common header for vDSO
  BACKPORT: mips: Introduce asm/vdso/clocksource.h
  BACKPORT: arm64: Introduce asm/vdso/clocksource.h
  BACKPORT: arm: Introduce asm/vdso/clocksource.h
  BACKPORT: x86: Introduce asm/vdso/clocksource.h
  UPSTREAM: linux/limits.h: Extract common header for vDSO
  BACKPORT: linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h>
  BACKPORT: linux/bits.h: Extract common header for vDSO
  UPSTREAM: linux/const.h: Extract common header for vDSO
  BACKPORT: arm64: vdso: fix flip/flop vdso build bug
  UPSTREAM: lib/vdso: Allow the high resolution parts to be compiled out
  UPSTREAM: lib/vdso: Only read hrtimer_res when needed in __cvdso_clock_getres()
  UPSTREAM: lib/vdso: Mark do_hres() and do_coarse() as __always_inline
  UPSTREAM: lib/vdso: Avoid duplication in __cvdso_clock_getres()
  UPSTREAM: lib/vdso: Let do_coarse() return 0 to simplify the callsite
  UPSTREAM: lib/vdso: Remove checks on return value for 32 bit vDSO
  UPSTREAM: lib/vdso: Build 32 bit specific functions in the right context
  UPSTREAM: lib/vdso: Make __cvdso_clock_getres() static
  UPSTREAM: lib/vdso: Make clock_getres() POSIX compliant again
  UPSTREAM: lib/vdso/32: Provide legacy syscall fallbacks
  UPSTREAM: lib/vdso: Move fallback invocation to the callers
  UPSTREAM: lib/vdso/32: Remove inconsistent NULL pointer checks
  UPSTREAM: lib/vdso: Make delta calculation work correctly
  UPSTREAM: arm64: compat: Fix syscall number of compat_clock_getres
  BACKPORT: arm64: lse: Fix LSE atomics with LLVM
  UPSTREAM: mips: Fix gettimeofday() in the vdso library
  UPSTREAM: mips: vdso: Fix __arch_get_hw_counter()
  BACKPORT: arm64: Kconfig: Make CONFIG_COMPAT_VDSO a proper Kconfig option
  UPSTREAM: arm64: vdso32: Rename COMPATCC to CC_COMPAT
  UPSTREAM: arm64: vdso32: Pass '--target' option to clang via VDSO_CAFLAGS
  UPSTREAM: arm64: vdso32: Don't use KBUILD_CPPFLAGS unconditionally
  UPSTREAM: arm64: vdso32: Move definition of COMPATCC into vdso32/Makefile
  UPSTREAM: arm64: Default to building compat vDSO with clang when CONFIG_CC_IS_CLANG
  UPSTREAM: lib: vdso: Remove CROSS_COMPILE_COMPAT_VDSO
  UPSTREAM: arm64: vdso32: Remove jump label config option in Makefile
  UPSTREAM: arm64: vdso32: Detect binutils support for dmb ishld
  BACKPORT: arm64: vdso: Remove stale files from old assembly implementation
  UPSTREAM: arm64: vdso32: Fix broken compat vDSO build warnings
  UPSTREAM: mips: compat: vdso: Use legacy syscalls as fallback
  BACKPORT: arm64: Relax Documentation/arm64/tagged-pointers.rst
  BACKPORT: arm64: Add tagged-address-abi.rst to index.rst
  UPSTREAM: arm64: vdso: Fix Makefile regression
  UPSTREAM: mips: vdso: Fix flip/flop vdso building bug
  UPSTREAM: mips: vdso: Fix source path
  UPSTREAM: mips: Add clock_gettime64 entry point
  UPSTREAM: mips: Add clock_getres entry point
  BACKPORT: mips: Add support for generic vDSO
  BACKPORT: arm64: vdso: Explicitly add build-id option
  BACKPORT: arm64: vdso: use $(LD) instead of $(CC) to link VDSO
  BACKPORT: arm64: vdso: Cleanup Makefiles
  UPSTREAM: arm64: vdso: Fix population of AT_SYSINFO_EHDR for compat vdso
  UPSTREAM: arm64: vdso: Fix compilation with clang older than 8
  UPSTREAM: arm64: compat: Fix __arch_get_hw_counter() implementation
  UPSTREAM: arm64: Fix __arch_get_hw_counter() implementation
  UPSTREAM: x86/vdso/32: Use 32bit syscall fallback
  UPSTREAM: x86/vdso: Fix flip/flop vdso build bug
  UPSTREAM: x86/vdso: Give the [ph]vclock_page declarations real types
  UPSTREAM: x86/vdso: Add clock_gettime64() entry point
  BACKPORT: x86/vdso: Add clock_getres() entry point
  BACKPORT: x86/vdso: Switch to generic vDSO implementation
  UPSTREAM: x86/segments: Introduce the 'CPUNODE' naming to better document the segment limit CPU/node NR trick
  UPSTREAM: x86/vdso: Initialize the CPU/node NR segment descriptor earlier
  UPSTREAM: x86/vdso: Introduce helper functions for CPU and node number
  UPSTREAM: x86/segments/64: Rename the GDT PER_CPU entry to CPU_NUMBER
  BACKPORT: arm64: vdso: Enable vDSO compat support
  UPSTREAM: arm64: compat: Get sigreturn trampolines from vDSO
  UPSTREAM: arm64: elf: VDSO code page discovery
  UPSTREAM: arm64: compat: VDSO setup for compat layer
  UPSTREAM: arm64: vdso: Refactor vDSO code
  BACKPORT: arm64: compat: Add vDSO
  UPSTREAM: arm64: compat: Generate asm offsets for signals
  UPSTREAM: arm64: compat: Expose signal related structures
  UPSTREAM: arm64: compat: Add missing syscall numbers
  BACKPORT: arm64: vdso: Substitute gettimeofday() with C implementation
  UPSTREAM: timekeeping: Provide a generic update_vsyscall() implementation
  UPSTREAM: lib/vdso: Add compat support
  UPSTREAM: lib/vdso: Provide generic VDSO implementation
  UPSTREAM: vdso: Define standardized vdso_datapage
  UPSTREAM: hrtimer: Split out hrtimer defines into separate header
  UPSTREAM: nds32: Fix vDSO clock_getres()
  UPSTREAM: arm64: compat: Reduce address limit for 64K pages
  BACKPORT: arm64: compat: Add KUSER_HELPERS config option
  UPSTREAM: arm64: compat: Refactor aarch32_alloc_vdso_pages()
  BACKPORT: arm64: compat: Split kuser32
  UPSTREAM: arm64: compat: Alloc separate pages for vectors and sigpage
  ANDROID: GKI: Update ABI XML representation
  ANDROID: GKI: Enable GENERIC_IRQ_CHIP
  ANDROID: GKI: power_supply: Add FG_TYPE power-supply property
  ANDROID: GKI: mm: export mm_trace_rss_stat for modules to report RSS changes
  ANDROID: GKI: gki_defconfig: Enable CONFIG_LEDS_TRIGGER_TRANSIENT
  ANDROID: GKI: gki_defconfig: Enable CONFIG_CPU_FREQ_STAT
  ANDROID: GKI: arm64: gki_defconfig: Disable HW tracing features
  ANDROID: GKI: gki_defconfig: Enable CONFIG_I2C_CHARDEV
  ANDROID: Incremental fs: Use simple compression in log buffer
  ANDROID: GKI: usb: core: Add support to parse config summary capability descriptors
  ANDROID: GKI: Update ABI XML representation
  ANDROID: dm-bow: Fix not to skip trim at framented range
  ANDROID: Remove VLA from uid_sys_stats.c
  f2fs: fix missing check for f2fs_unlock_op
  ANDROID: fix wakeup reason findings
  UPSTREAM: cfg80211: fix and clean up cfg80211_gen_new_bssid()
  UPSTREAM: cfg80211: save multi-bssid properties
  UPSTREAM: cfg80211: make BSSID generation function inline
  UPSTREAM: cfg80211: parse multi-bssid only if HW supports it
  UPSTREAM: cfg80211: Move Multiple BSS info to struct cfg80211_bss to be visible
  UPSTREAM: cfg80211: Properly track transmitting and non-transmitting BSS
  UPSTREAM: cfg80211: use for_each_element() for multi-bssid parsing
  UPSTREAM: cfg80211: Parsing of Multiple BSSID information in scanning
  UPSTREAM: cfg80211/nl80211: Offload OWE processing to user space in AP mode
  ANDROID: GKI: cfg80211: Sync nl80211 commands/feature with upstream
  ANDROID: GKI: gki_defconfig: Enable FW_LOADER_USER_HELPER*
  ANDROID: GKI: arm64: gki_defconfig: Disable CONFIG_ARM64_TAGGED_ADDR_ABI
  ANDROID: GKI: gki_defconfig: CONFIG_CHR_DEV_SG=y
  ANDROID: GKI: gki_defconfig: CONFIG_DM_DEFAULT_KEY=m
  ANDROID: update the ABI xml representation
  ANDROID: init: GKI: enable hidden configs for GPU
  Linux 4.19.118
  bpf: fix buggy r0 retval refinement for tracing helpers
  KEYS: Don't write out to userspace while holding key semaphore
  mtd: phram: fix a double free issue in error path
  mtd: lpddr: Fix a double free in probe()
  mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB
  locktorture: Print ratio of acquisitions, not failures
  tty: evh_bytechan: Fix out of bounds accesses
  iio: si1133: read 24-bit signed integer for measurement
  fbdev: potential information leak in do_fb_ioctl()
  net: dsa: bcm_sf2: Fix overflow checks
  f2fs: fix to wait all node page writeback
  iommu/amd: Fix the configuration of GCR3 table root pointer
  libnvdimm: Out of bounds read in __nd_ioctl()
  power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks.
  ext2: fix debug reference to ext2_xattr_cache
  ext2: fix empty body warnings when -Wextra is used
  iommu/vt-d: Fix mm reference leak
  drm/vc4: Fix HDMI mode validation
  f2fs: fix NULL pointer dereference in f2fs_write_begin()
  NFS: Fix memory leaks in nfs_pageio_stop_mirroring()
  drm/amdkfd: kfree the wrong pointer
  x86: ACPI: fix CPU hotplug deadlock
  KVM: s390: vsie: Fix possible race when shadowing region 3 tables
  compiler.h: fix error in BUILD_BUG_ON() reporting
  percpu_counter: fix a data race at vm_committed_as
  include/linux/swapops.h: correct guards for non_swap_entry()
  cifs: Allocate encryption header through kmalloc
  um: ubd: Prevent buffer overrun on command completion
  ext4: do not commit super on read-only bdev
  s390/cpum_sf: Fix wrong page count in error message
  powerpc/maple: Fix declaration made after definition
  s390/cpuinfo: fix wrong output when CPU0 is offline
  NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails
  NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid()
  rtc: 88pm860x: fix possible race condition
  soc: imx: gpc: fix power up sequencing
  clk: tegra: Fix Tegra PMC clock out parents
  power: supply: bq27xxx_battery: Silence deferred-probe error
  clk: at91: usb: continue if clk_hw_round_rate() return zero
  x86/Hyper-V: Report crash data in die() when panic_on_oops is set
  x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set
  x86/Hyper-V: Trigger crash enlightenment only once during system crash.
  x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump
  x86/Hyper-V: Unload vmbus channel in hv panic callback
  xsk: Add missing check on user supplied headroom size
  rbd: call rbd_dev_unprobe() after unwatching and flushing notifies
  rbd: avoid a deadlock on header_rwsem when flushing notifies
  video: fbdev: sis: Remove unnecessary parentheses and commented code
  lib/raid6: use vdupq_n_u8 to avoid endianness warnings
  x86/Hyper-V: Report crash register data or kmsg before running crash kernel
  of: overlay: kmemleak in dup_and_fixup_symbol_prop()
  of: unittest: kmemleak in of_unittest_overlay_high_level()
  of: unittest: kmemleak in of_unittest_platform_populate()
  of: unittest: kmemleak on changeset destroy
  ALSA: hda: Don't release card at firmware loading error
  irqchip/mbigen: Free msi_desc on device teardown
  netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type
  ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN.
  arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0
  watchdog: sp805: fix restart handler
  ext4: use non-movable memory for superblock readahead
  scsi: sg: add sg_remove_request in sg_common_write
  objtool: Fix switch table detection in .text.unlikely
  arm, bpf: Fix offset overflow for BPF_MEM BPF_DW
  ANDROID: GKI: Bulk update ABI report.
  ANDROID: GKI: qos: Register irq notify after adding the qos request
  ANDROID: GKI: Add dual role mode to usb_dr_modes array
  UPSTREAM: virtio-gpu api: comment feature flags
  ANDROID: arch:arm64: Increase kernel command line size
  ANDROID: GKI: Add special linux_banner_ptr for modules
  Revert "ANDROID: GKI: Make linux_banner a C pointer"
  ANDROID: GKI: PM / devfreq: Add new flag to do simple clock scaling
  ANDROID: GKI: Resolve ABI diff for struct snd_usb_audio
  ANDROID: GKI: Bulk update ABI
  ANDROID: GKI: Update the whitelist for qcom SoCs
  ANDROID: GKI: arm64: gki_defconfig: Set CONFIG_SCSI_UFSHCD=m
  ANDROID: GKI: scsi: add option to override the command timeout
  ANDROID: GKI: scsi: Adjust DBD setting in mode sense for caching mode page per LLD
  ANDROID: add ion_stat tracepoint to common kernel
  UPSTREAM: gpu/trace: add a gpu total memory usage tracepoint
  Linux 4.19.117
  mm/vmalloc.c: move 'area->pages' after if statement
  wil6210: remove reset file from debugfs
  wil6210: make sure Rx ring sizes are correlated
  wil6210: add general initialization/size checks
  wil6210: ignore HALP ICR if already handled
  wil6210: check rx_buff_mgmt before accessing it
  x86/resctrl: Fix invalid attempt at removing the default resource group
  x86/resctrl: Preserve CDP enable over CPU hotplug
  x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE
  scsi: target: fix hang when multiple threads try to destroy the same iscsi session
  scsi: target: remove boilerplate code
  kvm: x86: Host feature SSBD doesn't imply guest feature SPEC_CTRL_SSBD
  ext4: do not zeroout extents beyond i_disksize
  drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled
  usb: dwc3: gadget: Don't clear flags before transfer ended
  usb: dwc3: gadget: don't enable interrupt when disabling endpoint
  mac80211_hwsim: Use kstrndup() in place of kasprintf()
  btrfs: check commit root generation in should_ignore_root
  tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
  keys: Fix proc_keys_next to increase position index
  ALSA: usb-audio: Check mapping at creating connector controls, too
  ALSA: usb-audio: Don't create jack controls for PCM terminals
  ALSA: usb-audio: Don't override ignore_ctl_error value from the map
  ALSA: usb-audio: Filter error from connector kctl ops, too
  ASoC: Intel: mrfld: return error codes when an error occurs
  ASoC: Intel: mrfld: fix incorrect check on p->sink
  ext4: fix incorrect inodes per group in error message
  ext4: fix incorrect group count in ext4_fill_super error message
  pwm: pca9685: Fix PWM/GPIO inter-operation
  jbd2: improve comments about freeing data buffers whose page mapping is NULL
  scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
  ovl: fix value of i_ino for lower hardlink corner case
  net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
  net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes
  net: revert default NAPI poll timeout to 2 jiffies
  net: qrtr: send msgs from local of same id as broadcast
  net: ipv6: do not consider routes via gateways for anycast address check
  net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin
  hsr: check protocol version in hsr_newlink()
  amd-xgbe: Use __napi_schedule() in BH context
  ANDROID: GKI: drivers: of-thermal: Relate thermal zones using same sensor
  ANDROID: GKI: Bulk ABI update
  ANDROID: GKI: dma: Add set_dma_mask hook to struct dma_map_ops
  ANDROID: GKI: ABI update due to recent patches
  FROMLIST: drm/prime: add support for virtio exported objects
  FROMLIST: dma-buf: add support for virtio exported objects
  UPSTREAM: drm/virtio: module_param_named() requires linux/moduleparam.h
  UPSTREAM: drm/virtio: fix resource id creation race
  UPSTREAM: drm/virtio: make resource id workaround runtime switchable.
  BACKPORT: drm/virtio: Drop deprecated load/unload initialization
  ANDROID: GKI: Add DRM_TTM config to GKI
  ANDROID: Bulk update the ABI xml representation
  ANDROID: GKI: spmi: pmic-arb: don't enable SPMI_MSM_PMIC_ARB by default
  ANDROID: GKI: attribute page lock and waitqueue functions as sched
  ANDROID: GKI: extcon: Fix Add usage of blocking notifier chain
  ANDROID: GKI: USB: pd: Extcon fix for C current
  ANDROID: drm/dsi: Fix byte order of DCS set/get brightness
  ANDROID: GKI: mm: Export symbols to modularize CONFIG_MSM_DRM
  ANDROID: GKI: ALSA: compress: Add support to send codec specific data
  ANDROID: GKI: ALSA: Compress - dont use lock for all ioctls
  ANDROID: GKI: ASoC: msm: qdsp6v2: add support for AMR_WB_PLUS offload
  ANDROID: GKI: msm: dolby: MAT and THD audiocodec name modification
  ANDROID: GKI: asoc: msm: Add support for compressed perf mode
  ANDROID: GKI: msm: audio: support for gapless_pcm
  ANDROID: GKI: uapi: msm: dolby: Support for TrueHD and MAT decoders
  ANDROID: GKI: ASoC: msm: qdsp6v2: Add TrueHD HDMI compress pass-though
  ANDROID: GKI: ALSA: compress: Add APTX format support in ALSA
  ANDROID: GKI: msm: qdsp6v2: Add timestamp support for compress capture
  ANDROID: GKI: SoC: msm: Add support for meta data in compressed TX
  ANDROID: GKI: ALSA: compress: Add DSD format support for ALSA
  ANDROID: GKI: ASoC: msm: qdsp6v2: add support for ALAC and APE offload
  ANDROID: GKI: SoC: msm: Add compressed TX and passthrough support
  ANDROID: GKI: ASoC: msm: qdsp6v2: Add FLAC in compress offload path
  ANDROID: GKI: ASoC: msm: add support for different compressed formats
  ANDROID: GKI: ASoC: msm: Update the encode option and sample rate
  ANDROID: GKI: Enable CONFIG_SND_VERBOSE_PROCFS in gki_defconfig
  ANDROID: GKI: Add hidden CONFIG_SND_SOC_COMPRESS to gki_defconfig
  ANDROID: GKI: ALSA: pcm: add locks for accessing runtime resource
  ANDROID: GKI: Update ABI for DRM changes
  ANDROID: GKI: Add drm_dp_send_dpcd_{read,write} accessor functions
  ANDROID: GKI: drm: Add drm_dp_mst_get_max_sdp_streams_supported accessor function
  ANDROID: GKI: drm: Add drm_dp_mst_has_fec accessor function
  ANDROID: GKI: Add 'dsc_info' to struct drm_dp_mst_port
  ANDROID: GKI: usb: Add support to handle USB SMMU S1 address
  ANDROID: GKI: usb: Add helper APIs to return xhci phys addresses
  ANDROID: Add C protos for dma_buf/drm_prime get_uuid
  ANDROID: GKI: Make linux_banner a C pointer
  ANDROID: GKI: Add 'refresh_rate', 'id' to struct drm_panel_notifier
  ANDROID: GKI: Add 'i2c_mutex' to struct drm_dp_aux
  ANDROID: GKI: Add 'checksum' to struct drm_connector
  Revert "BACKPORT: drm: Add HDR source metadata property"
  Revert "BACKPORT: drm: Parse HDR metadata info from EDID"
  ANDROID: drm: Add DP colorspace property
  ANDROID: GKI: drm: Initialize display->hdmi when parsing vsdb
  ANDROID: drivers: gpu: drm: add support to batch commands
  ANDROID: ABI: update the qcom whitelist
  ANDROID: GKI: ARM64: smp: add vendor field pending_ipi
  ANDROID: gki_defconfig: enable msm serial early console
  ANDROID: serial: msm_geni_serial_console : Add Earlycon support
  ANDROID: GKI: serial: core: export uart_console_device
  f2fs: fix quota_sync failure due to f2fs_lock_op
  f2fs: support read iostat
  f2fs: Fix the accounting of dcc->undiscard_blks
  f2fs: fix to handle error path of f2fs_ra_meta_pages()
  f2fs: report the discard cmd errors properly
  f2fs: fix long latency due to discard during umount
  f2fs: add tracepoint for f2fs iostat
  f2fs: introduce sysfs/data_io_flag to attach REQ_META/FUA
  ANDROID: GKI: update abi definition due to previous changes in the tree
  Linux 4.19.116
  efi/x86: Fix the deletion of variables in mixed mode
  mfd: dln2: Fix sanity checking for endpoints
  etnaviv: perfmon: fix total and idle HI cyleces readout
  misc: echo: Remove unnecessary parentheses and simplify check for zero
  powerpc/fsl_booke: Avoid creating duplicate tlb1 entry
  ftrace/kprobe: Show the maxactive number on kprobe_events
  drm: Remove PageReserved manipulation from drm_pci_alloc
  drm/dp_mst: Fix clearing payload state on topology disable
  Revert "drm/dp_mst: Remove VCPI while disabling topology mgr"
  crypto: ccree - only try to map auth tag if needed
  crypto: ccree - dec auth tag size from cryptlen map
  crypto: ccree - don't mangle the request assoclen
  crypto: ccree - zero out internal struct before use
  crypto: ccree - improve error handling
  crypto: caam - update xts sector size for large input length
  dm zoned: remove duplicate nr_rnd_zones increase in dmz_init_zone()
  btrfs: use nofs allocations for running delayed items
  powerpc: Make setjmp/longjmp signature standard
  powerpc: Add attributes for setjmp/longjmp
  scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug
  powerpc/kprobes: Ignore traps that happened in real mode
  powerpc/xive: Use XIVE_BAD_IRQ instead of zero to catch non configured IPIs
  powerpc/hash64/devmap: Use H_PAGE_THP_HUGE when setting up huge devmap PTE entries
  powerpc/64/tm: Don't let userspace set regs->trap via sigreturn
  powerpc/powernv/idle: Restore AMR/UAMOR/AMOR after idle
  xen/blkfront: fix memory allocation flags in blkfront_setup_indirect()
  ipmi: fix hung processes in __get_guid()
  libata: Return correct status in sata_pmp_eh_recover_pm() when ATA_DFLAG_DETACH is set
  hfsplus: fix crash and filesystem corruption when deleting files
  cpufreq: powernv: Fix use-after-free
  kmod: make request_module() return an error when autoloading is disabled
  clk: ingenic/jz4770: Exit with error if CGU init failed
  Input: i8042 - add Acer Aspire 5738z to nomux list
  s390/diag: fix display of diagnose call statistics
  perf tools: Support Python 3.8+ in Makefile
  ocfs2: no need try to truncate file beyond i_size
  fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once()
  ext4: fix a data race at inode->i_blocks
  NFS: Fix a page leak in nfs_destroy_unlinked_subrequests()
  powerpc/pseries: Avoid NULL pointer dereference when drmem is unavailable
  drm/etnaviv: rework perfmon query infrastructure
  rtc: omap: Use define directive for PIN_CONFIG_ACTIVE_HIGH
  selftests: vm: drop dependencies on page flags from mlock2 tests
  arm64: armv8_deprecated: Fix undef_hook mask for thumb setend
  scsi: zfcp: fix missing erp_lock in port recovery trigger for point-to-point
  dm verity fec: fix memory leak in verity_fec_dtr
  dm writecache: add cond_resched to avoid CPU hangs
  arm64: dts: allwinner: h6: Fix PMU compatible
  net: qualcomm: rmnet: Allow configuration updates to existing devices
  mm: Use fixed constant in page_frag_alloc instead of size + 1
  tools: gpio: Fix out-of-tree build regression
  x86/speculation: Remove redundant arch_smt_update() invocation
  powerpc/pseries: Drop pointless static qualifier in vpa_debugfs_init()
  erofs: correct the remaining shrink objects
  crypto: mxs-dcp - fix scatterlist linearization for hash
  btrfs: fix missing semaphore unlock in btrfs_sync_file
  btrfs: fix missing file extent item for hole after ranged fsync
  btrfs: drop block from cache on error in relocation
  btrfs: set update the uuid generation as soon as possible
  Btrfs: fix crash during unmount due to race with delayed inode workers
  mtd: spinand: Do not erase the block before writing a bad block marker
  mtd: spinand: Stop using spinand->oobbuf for buffering bad block markers
  CIFS: Fix bug which the return value by asynchronous read is error
  KVM: VMX: fix crash cleanup when KVM wasn't used
  KVM: x86: Gracefully handle __vmalloc() failure during VM allocation
  KVM: VMX: Always VMCLEAR in-use VMCSes during crash with kexec support
  KVM: x86: Allocate new rmap and large page tracking when moving memslot
  KVM: s390: vsie: Fix delivery of addressing exceptions
  KVM: s390: vsie: Fix region 1 ASCE sanity shadow address checks
  KVM: nVMX: Properly handle userspace interrupt window request
  x86/entry/32: Add missing ASM_CLAC to general_protection entry
  signal: Extend exec_id to 64bits
  ath9k: Handle txpower changes even when TPC is disabled
  MIPS: OCTEON: irq: Fix potential NULL pointer dereference
  MIPS/tlbex: Fix LDDIR usage in setup_pw() for Loongson-3
  pstore: pstore_ftrace_seq_next should increase position index
  irqchip/versatile-fpga: Apply clear-mask earlier
  KEYS: reaching the keys quotas correctly
  tpm: tpm2_bios_measurements_next should increase position index
  tpm: tpm1_bios_measurements_next should increase position index
  tpm: Don't make log failures fatal
  PCI: endpoint: Fix for concurrent memory allocation in OB address region
  PCI: Add boot interrupt quirk mechanism for Xeon chipsets
  PCI/ASPM: Clear the correct bits when enabling L1 substates
  PCI: pciehp: Fix indefinite wait on sysfs requests
  nvme: Treat discovery subsystems as unique subsystems
  nvme-fc: Revert "add module to ops template to allow module references"
  thermal: devfreq_cooling: inline all stubs for CONFIG_DEVFREQ_THERMAL=n
  acpi/x86: ignore unspecified bit positions in the ACPI global lock field
  media: ti-vpe: cal: fix disable_irqs to only the intended target
  ALSA: hda/realtek - Add quirk for MSI GL63
  ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups
  ALSA: hda/realtek - Set principled PC Beep configuration for ALC256
  ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256
  ALSA: pcm: oss: Fix regression by buffer overflow fix
  ALSA: ice1724: Fix invalid access for enumerated ctl items
  ALSA: hda: Fix potential access overflow in beep helper
  ALSA: hda: Add driver blacklist
  ALSA: usb-audio: Add mixer workaround for TRX40 and co
  usb: gadget: composite: Inform controller driver of self-powered
  usb: gadget: f_fs: Fix use after free issue as part of queue failure
  ASoC: topology: use name_prefix for new kcontrol
  ASoC: dpcm: allow start or stop during pause for backend
  ASoC: dapm: connect virtual mux with default value
  ASoC: fix regwmask
  slub: improve bit diffusion for freelist ptr obfuscation
  uapi: rename ext2_swab() to swab() and share globally in swab.h
  IB/mlx5: Replace tunnel mpls capability bits for tunnel_offloads
  btrfs: track reloc roots based on their commit root bytenr
  btrfs: remove a BUG_ON() from merge_reloc_roots()
  btrfs: qgroup: ensure qgroup_rescan_running is only set when the worker is at least queued
  block, bfq: fix use-after-free in bfq_idle_slice_timer_body
  locking/lockdep: Avoid recursion in lockdep_count_{for,back}ward_deps()
  firmware: fix a double abort case with fw_load_sysfs_fallback
  md: check arrays is suspended in mddev_detach before call quiesce operations
  irqchip/gic-v4: Provide irq_retrigger to avoid circular locking dependency
  usb: dwc3: core: add support for disabling SS instances in park mode
  media: i2c: ov5695: Fix power on and off sequences
  block: Fix use-after-free issue accessing struct io_cq
  genirq/irqdomain: Check pointer in irq_domain_alloc_irqs_hierarchy()
  efi/x86: Ignore the memory attributes table on i386
  x86/boot: Use unsigned comparison for addresses
  gfs2: Don't demote a glock until its revokes are written
  pstore/platform: fix potential mem leak if pstore_init_fs failed
  libata: Remove extra scsi_host_put() in ata_scsi_add_hosts()
  media: i2c: video-i2c: fix build errors due to 'imply hwmon'
  PCI/switchtec: Fix init_completion race condition with poll_wait()
  selftests/x86/ptrace_syscall_32: Fix no-vDSO segfault
  sched: Avoid scale real weight down to zero
  irqchip/versatile-fpga: Handle chained IRQs properly
  block: keep bdi->io_pages in sync with max_sectors_kb for stacked devices
  x86: Don't let pgprot_modify() change the page encryption bit
  xhci: bail out early if driver can't accress host in resume
  null_blk: fix spurious IO errors after failed past-wp access
  null_blk: Handle null_add_dev() failures properly
  null_blk: Fix the null_add_dev() error path
  firmware: arm_sdei: fix double-lock on hibernate with shared events
  media: venus: hfi_parser: Ignore HEVC encoding for V1
  cpufreq: imx6q: Fixes unwanted cpu overclocking on i.MX6ULL
  i2c: st: fix missing struct parameter description
  qlcnic: Fix bad kzalloc null test
  cxgb4/ptp: pass the sign of offset delta in FW CMD
  hinic: fix wrong para of wait_for_completion_timeout
  hinic: fix a bug of waitting for IO stopped
  net: vxge: fix wrong __VA_ARGS__ usage
  bus: sunxi-rsb: Return correct data when mixing 16-bit and 8-bit reads
  ARM: dts: sun8i-a83t-tbs-a711: HM5065 doesn't like such a high voltage
  ANDROID: build.config.allmodconfig: Re-enable XFS_FS
  FROMGIT: of: property: Add device link support for extcon
  ANDROID: GKI: arm64: gki_defconfig: enable CONFIG_MM_EVENT_STAT
  ANDROID: GKI: add fields from per-process mm event tracking feature
  ANDROID: GKI: fix ABI diffs caused by ION heap and pool vmstat additions
  UPSTREAM: GKI: panic/reboot: allow specifying reboot_mode for panic only
  ANDROID: GKI: of: property: Add device link support for phys property
  ANDROID: GKI: usb: phy: Fix ABI diff for usb_otg_state
  ANDROID: GKI: usb: phy: Fix ABI diff due to usb_phy.drive_dp_pulse
  ANDROID: GKI: usb: phy: Fix ABI diff for usb_phy_type and usb_phy.reset
  ANDROID: gki_defconfig: enable CONFIG_GPIO_SYSFS
  ANDROID: GKI: qcom: Fix compile issue when setting msm_lmh_dcvs as a module
  ANDROID: GKI: drivers: cpu_cooling: allow platform freq mitigation
  ANDROID: GKI: ASoC: Add locking in DAPM widget power update
  ANDROID: GKI: ASoC: jack: Fix buttons enum value
  ANDROID: GKI: ALSA: jack: Add support to report second microphone
  ANDROID: GKI: ALSA: jack: Update supported jack switch types
  ANDROID: GKI: ALSA: jack: update jack types
  ANDROID: GKI: Export symbols arm_cpuidle_suspend, cpuidle_dev and cpuidle_register_governor
  ANDROID: GKI: usb: hcd: Add USB atomic notifier callback for HC died error
  ANDROID: media: increase video max frame number
  BACKPORT: nvmem: core: add NVMEM_SYSFS Kconfig
  UPSTREAM: nvmem: add support for cell info
  UPSTREAM: nvmem: remove the global cell list
  UPSTREAM: nvmem: use kref
  UPSTREAM: nvmem: use list_for_each_entry_safe in nvmem_device_remove_all_cells()
  UPSTREAM: nvmem: provide nvmem_dev_name()
  ANDROID: GKI: Bulk ABI update
  ANDROID: GKI: cpuhotplug: adding hotplug enums for vendor code
  ANDROID: Incremental fs: Fix create_file performance
  ANDROID: build.config.common: Add BUILDTOOLS_PREBUILT_BIN
  UPSTREAM: kheaders: include only headers into kheaders_data.tar.xz
  UPSTREAM: kheaders: remove meaningless -R option of 'ls'
  ANDROID: GKI: of: platform: initialize of_reserved_mem
  ANDROID: driver: gpu: drm: add notifier for panel related events
  ANDROID: include: drm: support unicasting mipi cmds to dsi ctrls
  ANDROID: include: drm: increase DRM max property count to 64
  BACKPORT: drm: Add HDMI colorspace property
  ANDROID: drm: edid: add support for additional CEA extension blocks
  BACKPORT: drm: Parse HDR metadata info from EDID
  BACKPORT: drm: Add HDR source metadata property
  BACKPORT: drm/dp_mst: Parse FEC capability on MST ports
  ANDROID: GKI: ABI update for DRM changes
  ANDROID: ABI: add missing elf variables to representation
  ANDROID: GKI: power_supply: Add PROP_MOISTURE_DETECTION_ENABLED
  ANDROID: include: drm: add the definitions for DP Link Compliance tests
  ANDROID: drivers: gpu: drm: fix bugs encountered while fuzzing
  FROMLIST: power_supply: Add additional health properties to the header
  UPSTREAM: power: supply: core: Update sysfs-class-power ABI document
  UPSTREAM: Merge remote-tracking branch 'aosp/upstream-f2fs-stable-linux-4.19.y' into android-4.19 (v5.7-rc1)
  ANDROID: drivers: gpu: drm: add support for secure framebuffer
  ANDROID: include: uapi: drm: add additional QCOM modifiers
  ANDROID: drm: dsi: add two DSI mode flags for BLLP
  ANDROID: include: uapi: drm: add additional drm mode flags
  UPSTREAM: drm: plug memory leak on drm_setup() failure
  UPSTREAM: drm: factor out drm_close_helper() function
  ANDROID: GKI: Bulk ABI update
  BACKPORT: nl80211: Add per peer statistics to compute FCS error rate
  ANDROID: GKI: sound: usb: Add snd_usb_enable_audio_stream/find_snd_usb_substream
  ANDROID: GKI: add dma-buf includes
  ANDROID: GKI: sched: struct fields for Per-Sched-domain over utilization
  ANDROID: GKI: Add vendor fields to root_domain
  ANDROID: gki_defconfig: Enable CONFIG_IRQ_TIME_ACCOUNTING
  ANDROID: fix allmodconfig build to use the right toolchain
  ANDROID: fix allmodconfig build to use the right toolchain
  ANDROID: GKI: Update ABI
  Revert "UPSTREAM: mm, page_alloc: spread allocations across zones before introducing fragmentation"
  Revert "UPSTREAM: mm: use alloc_flags to record if kswapd can wake"
  Revert "BACKPORT: mm: move zone watermark accesses behind an accessor"
  Revert "BACKPORT: mm: reclaim small amounts of memory when an external fragmentation event occurs"
  Revert "BACKPORT: mm, compaction: be selective about what pageblocks to clear skip hints"
  ANDROID: GKI: panic: add vendor callback function in panic()
  UPSTREAM: GKI: thermal: make device_register's type argument const
  ANDROID: GKI: add base.h include to match MODULE_VERSIONS
  ANDROID: update the ABI based on the new whitelist
  ANDROID: GKI: fdt: export symbols required by modules
  ANDROID: GKI: drivers: of: Add APIs to find DDR device rank, HBB
  ANDROID: GKI: security: Add mmap export symbols for modules
  ANDROID: GKI: arch: add stub symbols for boot_reason and cold_boot
  ANDROID: GKI: USB: Fix ABI diff for struct usb_bus
  ANDROID: GKI: USB: Resolve ABI diff for usb_gadget and usb_gadget_ops
  ANDROID: GKI: add hidden V4L2_MEM2MEM_DEV
  ANDROID: GKI: enable VIDEO_V4L2_SUBDEV_API
  ANDROID: GKI: export symbols from abi_gki_aarch64_qcom_whitelist
  ANDROID: Update the whitelist for qcom SoCs
  ANDROID: Incremental fs: Fix compound page usercopy crash
  ANDROID: Incremental fs: Clean up incfs_test build process
  ANDROID: Incremental fs: make remount log buffer change atomic
  ANDROID: Incremental fs: Optimize get_filled_block
  ANDROID: Incremental fs: Fix mislabeled __user ptrs
  ANDROID: Incremental fs: Use 64-bit int for file_size when writing hash blocks
  Linux 4.19.115
  drm/msm: Use the correct dma_sync calls in msm_gem
  drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read()
  usb: dwc3: don't set gadget->is_otg flag
  rpmsg: glink: Remove chunk size word align warning
  arm64: Fix size of __early_cpu_boot_status
  drm/msm: stop abusing dma_map/unmap for cache
  clk: qcom: rcg: Return failure for RCG update
  fbcon: fix null-ptr-deref in fbcon_switch
  RDMA/cm: Update num_paths in cma_resolve_iboe_route error flow
  Bluetooth: RFCOMM: fix ODEBUG bug in rfcomm_dev_ioctl
  RDMA/cma: Teach lockdep about the order of rtnl and lock
  RDMA/ucma: Put a lock around every call to the rdma_cm layer
  ceph: canonicalize server path in place
  ceph: remove the extra slashes in the server path
  IB/hfi1: Fix memory leaks in sysfs registration and unregistration
  IB/hfi1: Call kobject_put() when kobject_init_and_add() fails
  ASoC: jz4740-i2s: Fix divider written at incorrect offset in register
  hwrng: imx-rngc - fix an error path
  tools/accounting/getdelays.c: fix netlink attribute length
  usb: dwc3: gadget: Wrap around when skip TRBs
  random: always use batched entropy for get_random_u{32,64}
  mlxsw: spectrum_flower: Do not stop at FLOW_ACTION_VLAN_MANGLE
  slcan: Don't transmit uninitialized stack data in padding
  net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting
  net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers
  net: dsa: bcm_sf2: Ensure correct sub-node is parsed
  net: dsa: bcm_sf2: Do not register slave MDIO bus with OF
  ipv6: don't auto-add link-local address to lag ports
  mm: mempolicy: require at least one nodeid for MPOL_PREFERRED
  include/linux/notifier.h: SRCU: fix ctags
  bitops: protect variables in set_mask_bits() macro
  padata: always acquire cpu_hotplug_lock before pinst->lock
  net: Fix Tx hash bound checking
  rxrpc: Fix sendmsg(MSG_WAITALL) handling
  ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
  power: supply: axp288_charger: Add special handling for HP Pavilion x2 10
  extcon: axp288: Add wakeup support
  mei: me: add cedar fork device ids
  coresight: do not use the BIT() macro in the UAPI header
  misc: pci_endpoint_test: Avoid using module parameter to determine irqtype
  misc: pci_endpoint_test: Fix to support > 10 pci-endpoint-test devices
  misc: rtsx: set correct pcr_ops for rts522A
  media: rc: IR signal for Panasonic air conditioner too long
  drm/etnaviv: replace MMU flush marker with flush sequence
  tools/power turbostat: Fix missing SYS_LPI counter on some Chromebooks
  tools/power turbostat: Fix gcc build warnings
  drm/amdgpu: fix typo for vcn1 idle check
  initramfs: restore default compression behavior
  drm/bochs: downgrade pci_request_region failure from error to warning
  drm/amd/display: Add link_rate quirk for Apple 15" MBP 2017
  nvme-rdma: Avoid double freeing of async event data
  sctp: fix possibly using a bad saddr with a given dst
  sctp: fix refcount bug in sctp_wfree
  net, ip_tunnel: fix interface lookup with no key
  ipv4: fix a RCU-list lock in fib_triestat_seq_show
  ANDROID: GKI: export symbols required by SPECTRA_CAMERA
  ANDROID: GKI: ARM/ARM64: Introduce arch_read_hardware_id
  ANDROID: GKI: drivers: base: soc: export symbols for socinfo
  ANDROID: GKI: Update ABI
  ANDROID: GKI: ASoC: msm: fix integer overflow for long duration offload playback
  ANDROID: GKI: Bulk ABI update
  Revert "ANDROID: GKI: mm: add struct/enum fields for SPECULATIVE_PAGE_FAULTS"
  ANDROID: GKI: Revert "arm64: kill flush_cache_all()"
  ANDROID: GKI: Revert "arm64: Remove unused macros from assembler.h"
  ANDROID: GKI: kernel/dma, mm/cma: Export symbols needed by vendor modules
  ANDROID: GKI: mm: Export symbols __next_zones_zonelist and zone_watermark_ok_safe
  ANDROID: GKI: mm/memblock: export memblock_overlaps_memory
  ANDROID: GKI: net, skbuff: export symbols needed by vendor drivers
  ANDROID: GKI: Add stub __cpu_isolated_mask symbol
  ANDROID: GKI: sched: stub sched_isolate symbols
  ANDROID: GKI: export saved_command_line
  ANDROID: GKI: Update ABI
  ANDROID: GKI: ASoC: core: Update ALSA core to issue restart in underrun.
  ANDROID: GKI: SoC: pcm: Add a restart callback field to struct snd_pcm_ops
  ANDROID: GKI: SoC: pcm: Add fields to struct snd_pcm_ops and struct snd_soc_component_driver
  ANDROID: GKI: ASoC: core: Add compat_ioctl callback to struct snd_pcm_ops
  ANDROID: GKI: ALSA: core: modify, rename and export create_subdir API
  ANDROID: GKI: usb: Add helper API to issue stop endpoint command
  ANDROID: GKI: Thermal: thermal_zone_get_cdev_by_name added
  ANDROID: GKI: add missing exports for CONFIG_ARM_SMMU=m
  ANDROID: power: wakeup_reason: wake reason enhancements
  BACKPORT: FROMGIT: kbuild: mkcompile_h: Include $LD version in /proc/version
  ANDROID: GKI: kernel: Export symbols needed by msm_minidump.ko and minidump_log.ko
  ubifs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  f2fs: wire up FS_IOC_GET_ENCRYPTION_NONCE
  ext4: wire up FS_IOC_GET_ENCRYPTION_NONCE
  fscrypt: add FS_IOC_GET_ENCRYPTION_NONCE ioctl
  ANDROID: Bulk update the ABI xml
  ANDROID: gki_defconfig: add CONFIG_IPV6_SUBTREES
  ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays
  ANDROID: GKI: of: reserved_mem: Fix kmemleak crash on no-map region
  ANDROID: GKI: sched: add task boost vendor fields to task_struct
  ANDROID: GKI: mm: add rss counter for unreclaimable pages
  ANDROID: GKI: irqdomain: add bus token DOMAIN_BUS_WAKEUP
  ANDROID: GKI: arm64: fault: do_tlb_conf_fault_cb register fault callback
  ANDROID: GKI: QoS: Enhance framework to support cpu/irq specific QoS requests
  ANDROID: GKI: Bulk ABI update
  ANDROID: GKI: PM/devfreq: Do not switch governors from sysfs when device is suspended
  ANDROID: GKI: PM / devfreq: Fix race condition between suspend/resume and governor_store
  ANDROID: GKI: PM / devfreq: Introduce a sysfs lock
  ANDROID: GKI: regmap: irq: Add support to clear ack registers
  ANDROID: GKI: Remove SCHED_AUTOGROUP
  ANDROID: ignore compiler tag __must_check for GENKSYMS
  ANDROID: GKI: Bulk update ABI
  ANDROID: GKI: Fix ABI diff for struct thermal_cooling_device_ops
  ANDROID: GKI: ASoC: soc-core: export function to find components
  ANDROID: GKI: thermal: thermal_sys: Add configurable thermal trip points.
  ANDROID: fscrypt: fall back to filesystem-layer crypto when needed
  ANDROID: block: require drivers to declare supported crypto key type(s)
  ANDROID: block: make blk_crypto_start_using_mode() properly check for support
  ANDROID: GKI: power: supply: format regression
  ANDROID: GKI: kobject: increase number of kobject uevent pointers to 64
  ANDROID: GKI: drivers: video: backlight: Fix ABI diff for struct backlight_device
  ANDROID: GKI: usb: xhci: Add support for secondary interrupters
  ANDROID: GKI: usb: host: xhci: Add support for usb core indexing
  ANDROID: gki_defconfig: enable USB_XHCI_HCD
  ANDROID: gki_defconfig: enable CONFIG_BRIDGE
  ANDROID: GKI: Update ABI report
  ANDROID: GKI: arm64: smp: Add set_update_ipi_history_callback
  ANDROID: kbuild: ensure __cfi_check is correctly aligned
  f2fs: keep inline_data when compression conversion
  f2fs: fix to disable compression on directory
  f2fs: add missing CONFIG_F2FS_FS_COMPRESSION
  f2fs: switch discard_policy.timeout to bool type
  f2fs: fix to verify tpage before releasing in f2fs_free_dic()
  f2fs: show compression in statx
  f2fs: clean up dic->tpages assignment
  f2fs: compress: support zstd compress algorithm
  f2fs: compress: add .{init,destroy}_decompress_ctx callback
  f2fs: compress: fix to call missing destroy_compress_ctx()
  f2fs: change default compression algorithm
  f2fs: clean up {cic,dic}.ref handling
  f2fs: fix to use f2fs_readpage_limit() in f2fs_read_multi_pages()
  f2fs: xattr.h: Make stub helpers inline
  f2fs: fix to avoid double unlock
  f2fs: fix potential .flags overflow on 32bit architecture
  f2fs: fix NULL pointer dereference in f2fs_verity_work()
  f2fs: fix to clear PG_error if fsverity failed
  f2fs: don't call fscrypt_get_encryption_info() explicitly in f2fs_tmpfile()
  f2fs: don't trigger data flush in foreground operation
  f2fs: fix NULL pointer dereference in f2fs_write_begin()
  f2fs: clean up f2fs_may_encrypt()
  f2fs: fix to avoid potential deadlock
  f2fs: don't change inode status under page lock
  f2fs: fix potential deadlock on compressed quota file
  f2fs: delete DIO read lock
  f2fs: don't mark compressed inode dirty during f2fs_iget()
  f2fs: fix to account compressed blocks in f2fs_compressed_blocks()
  f2fs: xattr.h: Replace zero-length array with flexible-array member
  f2fs: fix to update f2fs_super_block fields under sb_lock
  f2fs: Add a new CP flag to help fsck fix resize SPO issues
  f2fs: Fix mount failure due to SPO after a successful online resize FS
  f2fs: use kmem_cache pool during inline xattr lookups
  f2fs: skip migration only when BG_GC is called
  f2fs: fix to show tracepoint correctly
  f2fs: avoid __GFP_NOFAIL in f2fs_bio_alloc
  f2fs: introduce F2FS_IOC_GET_COMPRESS_BLOCKS
  f2fs: fix to avoid triggering IO in write path
  f2fs: add prefix for f2fs slab cache name
  f2fs: introduce DEFAULT_IO_TIMEOUT
  f2fs: skip GC when section is full
  f2fs: add migration count iff migration happens
  f2fs: clean up bggc mount option
  f2fs: clean up lfs/adaptive mount option
  f2fs: fix to show norecovery mount option
  f2fs: clean up parameter of macro XATTR_SIZE()
  f2fs: clean up codes with {f2fs_,}data_blkaddr()
  f2fs: show mounted time
  f2fs: Use scnprintf() for avoiding potential buffer overflow
  f2fs: allow to clear F2FS_COMPR_FL flag
  f2fs: fix to check dirty pages during compressed inode conversion
  f2fs: fix to account compressed inode correctly
  f2fs: fix wrong check on F2FS_IOC_FSSETXATTR
  f2fs: fix to avoid use-after-free in f2fs_write_multi_pages()
  f2fs: fix to avoid using uninitialized variable
  f2fs: fix inconsistent comments
  f2fs: remove i_sem lock coverage in f2fs_setxattr()
  f2fs: cover last_disk_size update with spinlock
  f2fs: fix to check i_compr_blocks correctly
  FROMLIST: kmod: make request_module() return an error when autoloading is disabled
  ANDROID: GKI: Update ABI report
  ANDROID: GKI: ARM64: dma-mapping: export symbol arch_setup_dma_ops
  ANDROID: GKI: ARM: dma-mapping: export symbol arch_setup_dma_ops
  ANDROID: GKI: ASoC: dapm: Avoid static route b/w cpu and codec dai
  ANDROID: GKI: ASoC: pcm: Add support for hostless playback/capture
  ANDROID: GKI: ASoC: core - add hostless DAI support
  ANDROID: GKI: drivers: thermal: Resolve ABI diff for struct thermal_zone_device_ops
  ANDROID: GKI: drivers: thermal: Add support for getting trip temperature
  ANDROID: GKI: Add functions of_thermal_handle_trip/of_thermal_handle_trip_temp
  ANDROID: GKI: drivers: thermal: Add post suspend evaluate flag to thermal zone devicetree
  UPSTREAM: loop: Only freeze block queue when needed.
  UPSTREAM: loop: Only change blocksize when needed.
  ANDROID: Fix wq fp check for CFI builds
  ANDROID: GKI: update abi definition after CONFIG_DEBUG_LIST was enabled
  ANDROID: gki_defconfig: enable CONFIG_DEBUG_LIST
  ANDROID: GKI: Update ABI definition
  ANDROID: GKI: remove condition causing sk_buff struct ABI differences
  ANDROID: GKI: Export symbol arch_timer_mem_get_cval
  ANDROID: GKI: pwm: core: Add option to config PWM duty/period with u64 data length
  ANDROID: Update ABI whitelist for qcom SoCs
  ANDROID: Incremental fs: Fix remount
  ANDROID: Incremental fs: Protect get_fill_block, and add a field
  ANDROID: Incremental fs: Fix crash polling 0 size read_log
  ANDROID: Incremental fs: get_filled_blocks: better index_out
  ANDROID: GKI: of: property: Add device links support for "qcom,wrapper-dev"
  ANDROID: GKI: update abi definitions due to recent changes
  ANDROID: GKI: clk: Initialize in stack clk_init_data to 0 in all drivers
  ANDROID: GKI: drivers: clksource: Add API to return cval
  ANDROID: GKI: clk: Add support for voltage voting
  ANDROID: GKI: kernel: Export task and IRQ affinity symbols
  ANDROID: GKI: regulator: core: Add support for regulator providers with sync state
  ANDROID: GKI: regulator: Call proxy-consumer functions for each regulator registered
  ANDROID: GKI: regulator: Add proxy consumer driver
  ANDROID: GKI: regulator: core: allow long device tree supply regulator property names
  ANDROID: GKI: Revert "regulator: Enable supply regulator if child rail is enabled."
  ANDROID: GKI: regulator: Remove redundant set_mode call in drms_uA_update
  ANDROID: GKI: net: Add the get current NAPI context API
  ANDROID: GKI: remove DRM_KMS_CMA_HELPER from GKI configuration
  ANDROID: GKI: edac: Fix ABI diffs in edac_device_ctl_info struct
  ANDROID: GKI: pwm: Add different PWM output types support
  UPSTREAM: cfg80211: Authentication offload to user space in AP mode
  Linux 4.19.114
  arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode
  arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id
  ARM: dts: N900: fix onenand timings
  ARM: dts: imx6: phycore-som: fix arm and soc minimum voltage
  ARM: bcm2835-rpi-zero-w: Add missing pinctrl name
  ARM: dts: oxnas: Fix clear-mask property
  perf map: Fix off by one in strncpy() size argument
  arm64: alternative: fix build with clang integrated assembler
  net: ks8851-ml: Fix IO operations, again
  gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model
  bpf: Explicitly memset some bpf info structures declared on the stack
  bpf: Explicitly memset the bpf_attr structure
  platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table
  vt: vt_ioctl: fix use-after-free in vt_in_use()
  vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
  vt: vt_ioctl: remove unnecessary console allocation checks
  vt: switch vt_dont_switch to bool
  vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines
  vt: selection, introduce vc_is_sel
  mac80211: fix authentication with iwlwifi/mvm
  mac80211: Check port authorization in the ieee80211_tx_dequeue() case
  media: xirlink_cit: add missing descriptor sanity checks
  media: stv06xx: add missing descriptor sanity checks
  media: dib0700: fix rc endpoint lookup
  media: ov519: add missing endpoint sanity checks
  libfs: fix infoleak in simple_attr_read()
  ahci: Add Intel Comet Lake H RAID PCI ID
  staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback
  staging: wlan-ng: fix ODEBUG bug in prism2sta_disconnect_usb
  staging: rtl8188eu: Add ASUS USB-N10 Nano B1 to device table
  media: usbtv: fix control-message timeouts
  media: flexcop-usb: fix endpoint sanity check
  usb: musb: fix crash with highmen PIO and usbmon
  USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback
  USB: cdc-acm: restore capability check order
  USB: serial: option: add Wistron Neweb D19Q1
  USB: serial: option: add BroadMobi BM806U
  USB: serial: option: add support for ASKEY WWHC050
  mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX
  mac80211: add option for setting control flags
  Revert "r8169: check that Realtek PHY driver module is loaded"
  vti6: Fix memory leak of skb if input policy check fails
  bpf/btf: Fix BTF verification of enum members in struct/union
  netfilter: nft_fwd_netdev: validate family and chain type
  netfilter: flowtable: reload ip{v6}h in nf_flow_tuple_ip{v6}
  afs: Fix some tracing details
  xfrm: policy: Fix doulbe free in xfrm_policy_timer
  xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire
  xfrm: fix uctx len check in verify_sec_ctx_len
  RDMA/mlx5: Block delay drop to unprivileged users
  vti[6]: fix packet tx through bpf_redirect() in XinY cases
  xfrm: handle NETDEV_UNREGISTER for xfrm device
  genirq: Fix reference leaks on irq affinity notifiers
  RDMA/core: Ensure security pkey modify is not lost
  gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 BYT + AXP288 model
  gpiolib: acpi: Rework honor_wakeup option into an ignore_wake option
  gpiolib: acpi: Correct comment for HP x2 10 honor_wakeup quirk
  mac80211: mark station unauthorized before key removal
  nl80211: fix NL80211_ATTR_CHANNEL_WIDTH attribute type
  scsi: sd: Fix optimal I/O size for devices that change reported values
  scripts/dtc: Remove redundant YYLOC global declaration
  tools: Let O= makes handle a relative path with -C option
  perf probe: Do not depend on dwfl_module_addrsym()
  ARM: dts: omap5: Add bus_dma_limit for L3 bus
  ARM: dts: dra7: Add bus_dma_limit for L3 bus
  ceph: check POOL_FLAG_FULL/NEARFULL in addition to OSDMAP_FULL/NEARFULL
  Input: avoid BIT() macro usage in the serio.h UAPI header
  Input: synaptics - enable RMI on HP Envy 13-ad105ng
  Input: raydium_i2c_ts - fix error codes in raydium_i2c_boot_trigger()
  i2c: hix5hd2: add missed clk_disable_unprepare in remove
  ftrace/x86: Anotate text_mutex split between ftrace_arch_code_modify_post_process() and ftrace_arch_code_modify_prepare()
  sxgbe: Fix off by one in samsung driver strncpy size arg
  dpaa_eth: Remove unnecessary boolean expression in dpaa_get_headroom
  mac80211: Do not send mesh HWMP PREQ if HWMP is disabled
  scsi: ipr: Fix softlockup when rescanning devices in petitboot
  s390/qeth: handle error when backing RX buffer
  fsl/fman: detect FMan erratum A050385
  arm64: dts: ls1043a: FMan erratum A050385
  dt-bindings: net: FMan erratum A050385
  cgroup1: don't call release_agent when it is ""
  drivers/of/of_mdio.c:fix of_mdiobus_register()
  cpupower: avoid multiple definition with gcc -fno-common
  nfs: add minor version to nfs_server_key for fscache
  cgroup-v1: cgroup_pidlist_next should update position index
  hsr: set .netnsok flag
  hsr: add restart routine into hsr_get_node_list()
  hsr: use rcu_read_lock() in hsr_get_node_{list/status}()
  vxlan: check return value of gro_cells_init()
  tcp: repair: fix TCP_QUEUE_SEQ implementation
  r8169: re-enable MSI on RTL8168c
  net: phy: mdio-mux-bcm-iproc: check clk_prepare_enable() return value
  net: dsa: mt7530: Change the LINK bit to reflect the link status
  net: ip_gre: Accept IFLA_INFO_DATA-less configuration
  net: ip_gre: Separate ERSPAN newlink / changelink callbacks
  bnxt_en: Reset rings if ring reservation fails during open()
  bnxt_en: fix memory leaks in bnxt_dcbnl_ieee_getets()
  slcan: not call free_netdev before rtnl_unlock in slcan_open
  NFC: fdp: Fix a signedness bug in fdp_nci_send_patch()
  net: stmmac: dwmac-rk: fix error path in rk_gmac_probe
  net_sched: keep alloc_hash updated after hash allocation
  net_sched: cls_route: remove the right filter from hashtable
  net: qmi_wwan: add support for ASKEY WWHC050
  net/packet: tpacket_rcv: avoid a producer race condition
  net: mvneta: Fix the case where the last poll did not process all rx
  net: dsa: Fix duplicate frames flooded by learning
  net: cbs: Fix software cbs to consider packet sending time
  mlxsw: spectrum_mr: Fix list iteration in error path
  macsec: restrict to ethernet devices
  hsr: fix general protection fault in hsr_addr_is_self()
  geneve: move debug check after netdev unregister
  Revert "drm/dp_mst: Skip validating ports during destruction, just ref"
  mmc: sdhci-tegra: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command
  mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard
  mmc: core: Allow host controllers to require R1B for CMD6
  f2fs: fix to avoid potential deadlock
  f2fs: add missing function name in kernel message
  f2fs: recycle unused compress_data.chksum feild
  f2fs: fix to avoid NULL pointer dereference
  f2fs: fix leaking uninitialized memory in compressed clusters
  f2fs: fix the panic in do_checkpoint()
  f2fs: fix to wait all node page writeback
  mm/swapfile.c: move inode_lock out of claim_swapfile
  fscrypt: don't evict dirty inodes after removing key

 Conflicts:
	Documentation/arm64/silicon-errata.txt
	Documentation/devicetree/bindings
	Documentation/devicetree/bindings/net/fsl-fman.txt
	arch/arm/kernel/setup.c
	arch/arm/kernel/smp.c
	arch/arm/mm/dma-mapping.c
	arch/arm64/Kconfig
	arch/arm64/Makefile
	arch/arm64/include/asm/cpucaps.h
	arch/arm64/include/asm/cputype.h
	arch/arm64/include/asm/proc-fns.h
	arch/arm64/include/asm/traps.h
	arch/arm64/kernel/arm64ksyms.c
	arch/arm64/kernel/cpu_errata.c
	arch/arm64/kernel/setup.c
	arch/arm64/kernel/smp.c
	arch/arm64/mm/dma-mapping.c
	arch/arm64/mm/fault.c
	arch/arm64/mm/proc.S
	drivers/base/power/wakeup.c
	drivers/clk/clk.c
	drivers/clk/qcom/clk-rcg2.c
	drivers/clocksource/arm_arch_timer.c
	drivers/devfreq/devfreq.c
	drivers/devfreq/governor_simpleondemand.c
	drivers/dma-buf/dma-buf.c
	drivers/extcon/extcon.c
	drivers/gpu/Makefile
	drivers/gpu/drm/drm_connector.c
	drivers/gpu/drm/drm_dp_mst_topology.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/drm_file.c
	drivers/gpu/drm/drm_panel.c
	drivers/gpu/drm/drm_property.c
	drivers/iommu/Kconfig
	drivers/iommu/Makefile
	drivers/iommu/arm-smmu.c
	drivers/iommu/dma-iommu.c
	drivers/iommu/dma-mapping-fast.c
	drivers/iommu/io-pgtable-arm.c
	drivers/iommu/io-pgtable-fast.c
	drivers/iommu/io-pgtable.c
	drivers/iommu/iommu.c
	drivers/irqchip/irq-gic-v3.c
	drivers/media/v4l2-core/v4l2-ioctl.c
	drivers/mmc/core/Kconfig
	drivers/mmc/core/block.c
	drivers/mmc/core/queue.c
	drivers/mmc/host/cqhci.c
	drivers/mmc/host/sdhci-msm.c
	drivers/net/wireless/ath/wil6210/interrupt.c
	drivers/net/wireless/ath/wil6210/main.c
	drivers/net/wireless/ath/wil6210/wil6210.h
	drivers/net/wireless/ath/wil6210/wmi.c
	drivers/nvmem/core.c
	drivers/nvmem/nvmem-sysfs.c
	drivers/of/fdt.c
	drivers/power/supply/power_supply_sysfs.c
	drivers/pwm/sysfs.c
	drivers/regulator/core.c
	drivers/scsi/sd.c
	drivers/scsi/ufs/ufshcd.c
	drivers/tty/serial/Kconfig
	drivers/tty/serial/Makefile
	drivers/usb/common/common.c
	fs/crypto/crypto.c
	fs/f2fs/checkpoint.c
	fs/f2fs/f2fs.h
	include/drm/drm_connector.h
	include/drm/drm_dp_mst_helper.h
	include/drm/drm_panel.h
	include/linux/clk-provider.h
	include/linux/dma-buf.h
	include/linux/dma-mapping-fast.h
	include/linux/dma-mapping.h
	include/linux/extcon.h
	include/linux/io-pgtable.h
	include/linux/iommu.h
	include/linux/kobject.h
	include/linux/mm.h
	include/linux/mm_types.h
	include/linux/mmc/host.h
	include/linux/netdevice.h
	include/linux/power_supply.h
	include/linux/pwm.h
	include/linux/regulator/driver.h
	include/linux/thermal.h
	include/linux/vm_event_item.h
	include/net/cfg80211.h
	include/scsi/scsi_device.h
	include/sound/pcm.h
	include/sound/soc.h
	include/uapi/drm/drm_mode.h
	include/uapi/linux/coresight-stm.h
	include/uapi/linux/ip.h
	include/uapi/linux/nl80211.h
	include/uapi/linux/videodev2.h
	include/uapi/sound/compress_offload.h
	kernel/dma/coherent.c
	kernel/dma/mapping.c
	kernel/panic.c
	kernel/power/qos.c
	kernel/sched/sched.h
	mm/Kconfig
	mm/filemap.c
	mm/swapfile.c
	mm/vmalloc.c
	mm/vmstat.c
	net/qrtr/qrtr.c
	net/wireless/nl80211.c
	net/wireless/scan.c
	sound/core/compress_offload.c
	sound/soc/soc-core.c
	sound/usb/card.c
	sound/usb/pcm.c
	sound/usb/pcm.h
	sound/usb/usbaudio.h

 Fixed build errors:
	drivers/base/power/main.c
	drivers/thermal/thermal_core.c
	drivers/cpuidle/lpm-levels.c
	include/soc/qcom/lpm_levels.h

Change-Id: Idf25b239f53681bdfa2ef371a91720fadf1a3f01
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
2020-09-20 23:45:10 +05:30
Masahiro Yamada
a215278022 kconfig: qconf: fix signal connection to invalid slots
[ Upstream commit d85de3399f97467baa2026fbbbe587850d01ba8a ]

If you right-click in the ConfigList window, you will see the following
messages in the console:

QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:888
QObject::connect:  (sender name:   'config')
QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:897
QObject::connect:  (sender name:   'config')
QObject::connect: No such slot QAction::setOn(bool) in scripts/kconfig/qconf.cc:906
QObject::connect:  (sender name:   'config')

Right, there is no such slot in QAction. I think this is a typo of
setChecked.

Due to this bug, when you toggled the menu "Option->Show Name/Range/Data"
the state of the context menu was not previously updated. Fix this.

Fixes: d5d973c3f8 ("Port xconfig to Qt5 - Put back some of the old implementation(part 2)")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-08-26 10:31:04 +02:00
Masahiro Yamada
f0a4033282 kconfig: qconf: do not limit the pop-up menu to the first row
[ Upstream commit fa8de0a3bf3c02e6f00b7746e7e934db522cdda9 ]

If you right-click the first row in the option tree, the pop-up menu
shows up, but if you right-click the second row or below, the event
is ignored due to the following check:

  if (e->y() <= header()->geometry().bottom()) {

Perhaps, the intention was to show the pop-menu only when the tree
header was right-clicked, but this handler is not called in that case.

Since the origin of e->y() starts from the bottom of the header,
this check is odd.

Going forward, you can right-click anywhere in the tree to get the
pop-up menu.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-08-26 10:31:04 +02:00
Raghavendra Rao Ananta
bd2fa1828f scripts: Consider env variables while running 'make'
The scripts, gki/generate_defconfig.sh and kconfig/merge_config.sh
doesn't consider the host exported environment variables (such as
HOSTCC) while running 'make'. This is particularly needed in the
Android build environment as it uses the compiler, linker, and
other utilities from a pre-builts' path, rather than depending on
the host tools. Hence, pass the environment variables explicitly.

Change-Id: I082c0c05be5f4266fc647e3c1ebef8302e1a433a
Signed-off-by: Raghavendra Rao Ananta <rananta@codeaurora.org>
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
2020-05-29 11:51:00 +05:30
Mauro Carvalho Chehab
7667fd8e5b kconfig: qconf: Fix a few alignment issues
[ Upstream commit 60969f02f07ae1445730c7b293c421d179da729c ]

There are a few items with wrong alignments. Solve them.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-04-29 16:31:13 +02:00
Masahiro Yamada
296372fbd4 kconfig: fix broken dependency in randconfig-generated .config
[ Upstream commit c8fb7d7e48d11520ad24808cfce7afb7b9c9f798 ]

Running randconfig on arm64 using KCONFIG_SEED=0x40C5E904 (e.g. on v5.5)
produces the .config with CONFIG_EFI=y and CONFIG_CPU_BIG_ENDIAN=y,
which does not meet the !CONFIG_CPU_BIG_ENDIAN dependency.

This is because the user choice for CONFIG_CPU_LITTLE_ENDIAN vs
CONFIG_CPU_BIG_ENDIAN is set by randomize_choice_values() after the
value of CONFIG_EFI is calculated.

When this happens, the has_changed flag should be set.

Currently, it takes the result from the last iteration. It should
accumulate all the results of the loop.

Fixes: 3b9a19e089 ("kconfig: loop as long as we changed some symbols in randconfig")
Reported-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-02-24 08:34:39 +01:00
Thomas Hebb
a64d7894b4 kconfig: don't crash on NULL expressions in expr_eq()
[ Upstream commit 272a72103012862e3a24ea06635253ead0b6e808 ]

NULL expressions are taken to always be true, as implemented by the
expr_is_yes() macro and by several other functions in expr.c. As such,
they ought to be valid inputs to expr_eq(), which compares two
expressions.

Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2020-01-12 12:17:19 +01:00
M. Vefa Bicakci
3736612d25 kconfig: Clear "written" flag to avoid data loss
commit 0c5b6c28ed68becb692b43eae5e44d5aa7e160ce upstream.

Prior to this commit, starting nconfig, xconfig or gconfig, and saving
the .config file more than once caused data loss, where a .config file
that contained only comments would be written to disk starting from the
second save operation.

This bug manifests itself because the SYMBOL_WRITTEN flag is never
cleared after the first call to conf_write, and subsequent calls to
conf_write then skip all of the configuration symbols due to the
SYMBOL_WRITTEN flag being set.

This commit resolves this issue by clearing the SYMBOL_WRITTEN flag
from all symbols before conf_write returns.

Fixes: 8e2442a5f86e ("kconfig: fix missing choice values in auto.conf")
Cc: linux-stable <stable@vger.kernel.org> # 4.19+
Signed-off-by: M. Vefa Bicakci <m.v.b@runbox.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-08-06 19:06:53 +02:00
Masahiro Yamada
c77cbc8735 kconfig: fix missing choice values in auto.conf
commit 8e2442a5f86e1f77b86401fce274a7f622740bc4 upstream.

Since commit 00c864f890 ("kconfig: allow all config targets to write
auto.conf if missing"), Kconfig creates include/config/auto.conf in the
defconfig stage when it is missing.

Joonas Kylmälä reported incorrect auto.conf generation under some
circumstances.

To reproduce it, apply the following diff:

|  --- a/arch/arm/configs/imx_v6_v7_defconfig
|  +++ b/arch/arm/configs/imx_v6_v7_defconfig
|  @@ -345,14 +345,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
|   CONFIG_USB_CONFIGFS_F_HID=y
|   CONFIG_USB_CONFIGFS_F_UVC=y
|   CONFIG_USB_CONFIGFS_F_PRINTER=y
|  -CONFIG_USB_ZERO=m
|  -CONFIG_USB_AUDIO=m
|  -CONFIG_USB_ETH=m
|  -CONFIG_USB_G_NCM=m
|  -CONFIG_USB_GADGETFS=m
|  -CONFIG_USB_FUNCTIONFS=m
|  -CONFIG_USB_MASS_STORAGE=m
|  -CONFIG_USB_G_SERIAL=m
|  +CONFIG_USB_FUNCTIONFS=y
|   CONFIG_MMC=y
|   CONFIG_MMC_SDHCI=y
|   CONFIG_MMC_SDHCI_PLTFM=y

And then, run:

$ make ARCH=arm mrproper imx_v6_v7_defconfig

You will see CONFIG_USB_FUNCTIONFS=y is correctly contained in the
.config, but not in the auto.conf.

Please note drivers/usb/gadget/legacy/Kconfig is included from a choice
block in drivers/usb/gadget/Kconfig. So USB_FUNCTIONFS is a choice value.

This is probably a similar situation described in commit beaaddb625
("kconfig: tests: test defconfig when two choices interact").

When sym_calc_choice() is called, the choice symbol forgets the
SYMBOL_DEF_USER unless all of its choice values are explicitly set by
the user.

The choice symbol is given just one chance to recall it because
set_all_choice_values() is called if SYMBOL_NEED_SET_CHOICE_VALUES
is set.

When sym_calc_choice() is called again, the choice symbol forgets it
forever, since SYMBOL_NEED_SET_CHOICE_VALUES is a one-time aid.
Hence, we cannot call sym_clear_all_valid() again and again.

It is crazy to repeat set and unset of internal flags. However, we
cannot simply get rid of "sym->flags &= flags | ~SYMBOL_DEF_USER;"
Doing so would re-introduce the problem solved by commit 5d09598d48
("kconfig: fix new choices being skipped upon config update").

To work around the issue, conf_write_autoconf() stopped calling
sym_clear_all_valid().

conf_write() must be changed accordingly. Currently, it clears
SYMBOL_WRITE after the symbol is written into the .config file. This
is needed to prevent it from writing the same symbol multiple times in
case the symbol is declared in two or more locations. I added the new
flag SYMBOL_WRITTEN, to track the symbols that have been written.

Anyway, this is a cheesy workaround in order to suppress the issue
as far as defconfig is concerned.

Handling of choices is totally broken. sym_clear_all_valid() is called
every time a user touches a symbol from the GUI interface. To reproduce
it, just add a new symbol drivers/usb/gadget/legacy/Kconfig, then touch
around unrelated symbols from menuconfig. USB_FUNCTIONFS will disappear
from the .config file.

I added the Fixes tag since it is more fatal than before. But, this
has been broken since long long time before, and still it is.
We should take a closer look to fix this correctly somehow.

Fixes: 00c864f890 ("kconfig: allow all config targets to write auto.conf if missing")
Cc: linux-stable <stable@vger.kernel.org> # 4.19+
Reported-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-07-26 09:14:24 +02:00
Changbin Du
75a5e3e634 kconfig/[mn]conf: handle backspace (^H) key
[ Upstream commit 9c38f1f044080392603c497ecca4d7d09876ff99 ]

Backspace is not working on some terminal emulators which do not send the
key code defined by terminfo. Terminals either send '^H' (8) or '^?' (127).
But currently only '^?' is handled. Let's also handle '^H' for those
terminals.

Signed-off-by: Changbin Du <changbin.du@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
2019-05-04 09:20:22 +02:00
Masahiro Yamada
461991104d kconfig: fix memory leak when EOF is encountered in quotation
[ Upstream commit fbac5977d81cb2b2b7e37b11c459055d9585273c ]

An unterminated string literal followed by new line is passed to the
parser (with "multi-line strings not supported" warning shown), then
handled properly there.

On the other hand, an unterminated string literal at end of file is
never passed to the parser, then results in memory leak.

[Test Code]

  ----------(Kconfig begin)----------
  source "Kconfig.inc"

  config A
          bool "a"
  -----------(Kconfig end)-----------

  --------(Kconfig.inc begin)--------
  config B
          bool "b\No new line at end of file
  ---------(Kconfig.inc end)---------

[Summary from Valgrind]

  Before the fix:

    LEAK SUMMARY:
       definitely lost: 16 bytes in 1 blocks
       ...

  After the fix:

    LEAK SUMMARY:
       definitely lost: 0 bytes in 0 blocks
       ...

Eliminate the memory leak path by handling this case. Of course, such
a Kconfig file is wrong already, so I will add an error message later.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-26 09:32:39 +01:00
Masahiro Yamada
ba8efcdc57 kconfig: fix file name and line number of warn_ignored_character()
[ Upstream commit 77c1c0fa8b1477c5799bdad65026ea5ff676da44 ]

Currently, warn_ignore_character() displays invalid file name and
line number.

The lexer should use current_file->name and yylineno, while the parser
should use zconf_curname() and zconf_lineno().

This difference comes from that the lexer is always going ahead
of the parser. The parser needs to look ahead one token to make a
shift/reduce decision, so the lexer is requested to scan more text
from the input file.

This commit fixes the warning message from warn_ignored_character().

[Test Code]

  ----(Kconfig begin)----
  /
  -----(Kconfig end)-----

[Output]

  Before the fix:

  <none>:0:warning: ignoring unsupported character '/'

  After the fix:

  Kconfig:1:warning: ignoring unsupported character '/'

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-01-26 09:32:39 +01:00
Masahiro Yamada
fd65465b70 kconfig: do not require pkg-config on make {menu,n}config
Meelis Roos reported a {menu,n}config regression:
 "I have libncurses devel package installed in the default system
  location (as do 99%+ on actual developers probably) and in this
  case, pkg-config is useless.  pkg-config is needed only when
  libraries and headers are installed in non-default locations but
  it is bad to require installation of pkg-config on all the machines
  where make menuconfig would be possibly run."

For {menu,n}config, do not use pkg-config if it is not installed.
For {g,x}config, keep checking pkg-config since we really rely on it
for finding the installation paths of the required packages.

Fixes: 4ab3b80159 ("kconfig: check for pkg-config on make {menu,n,g,x}config")
Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Meelis Roos <mroos@linux.ee>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
2018-09-03 02:13:48 +09:00
Lukas Bulwahn
bc8d2e20a3 kconfig: remove a spurious self-assignment
The self assignment was probably introduced by an automated code
refactoring in
commit 694c49a7c0 ("kconfig: drop localization support").

The issue was identified by a self-assign warning when running
make menuconfig with clang.

Fixes: 694c49a7c0 ("kconfig: drop localization support")
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-09-01 01:21:42 +09:00
Masahiro Yamada
9a9ddcf478 kconfig: suppress "configuration written to .config" for syncconfig
The top-level Makefile invokes "make syncconfig" when necessary.
Then, Kconfig displays the following message when .config is updated.

  #
  # configuration written to .config
  #

It is distracting because "make syncconfig" happens during the build
stage, and does nothing important in most cases.

Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-08-22 23:21:41 +09:00
Masahiro Yamada
98a4afbfaf kconfig: fix "Can't open ..." in parallel build
If you run "make menuconfig" or "make nconfig" with -j<N> option in a
fresh source tree, you will see several "Can't open ..." messages:

  $ make -j8 menuconfig
    HOSTCC  scripts/basic/fixdep
    YACC    scripts/kconfig/zconf.tab.c
    LEX     scripts/kconfig/zconf.lex.c
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .:   HOSTCC  scripts/kconfig/lxdialog/checklist.o
  Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
    HOSTCC  scripts/kconfig/lxdialog/inputbox.o
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
    UPD     scripts/kconfig/.mconf-cfg
  /bin/sh: 1: .: Can't open scripts/kconfig/.mconf-cfg
    HOSTCC  scripts/kconfig/lxdialog/menubox.o
    HOSTCC  scripts/kconfig/lxdialog/textbox.o
    HOSTCC  scripts/kconfig/lxdialog/util.o
    HOSTCC  scripts/kconfig/lxdialog/yesno.o
    HOSTCC  scripts/kconfig/mconf.o
    HOSTCC  scripts/kconfig/zconf.tab.o
    HOSTLD  scripts/kconfig/mconf

Correct dependencies to fix this problem.

Fixes: 1c5af5cf93 ("kconfig: refactor ncurses package checks for building mconf and nconf")
Cc: linux-stable <stable@vger.kernel.org> # v4.18
Reported-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Borislav Petkov <bp@suse.de>
2018-08-22 23:21:41 +09:00
Masahiro Yamada
f498926c47 kconfig: improve the recursive dependency report
This commit improves the messages of the recursive dependency.
Currently, sym->dir_dep.expr is not checked.  Hence, any dependency
in property visibility is regarded as the dependency of the symbol.

[Test Code 1]

  config A
          bool "a"
          depends on B

  config B
          bool "b"
          depends on A

[Test Code 2]

  config A
          bool "a" if B

  config B
          bool "b"
          depends on A

For both cases above, the same message is displayed:

        symbol B depends on A
        symbol A depends on B

This commit changes the message for the latter, like this:

        symbol B depends on A
        symbol A prompt is visible depending on B

Also, 'select' and 'imply' are distinguished.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Dirk Gouders <dirk@gouders.net>
2018-08-22 23:21:39 +09:00
Masahiro Yamada
5e8c5299d3 kconfig: report recursive dependency involving 'imply'
Currently, Kconfig does not complain about the recursive dependency
where 'imply' keywords are involved.

[Test Code]

  config A
          bool "a"

  config B
          bool "b"
          imply A
          depends on A

In the code above, Kconfig cannot calculate the symbol values correctly
due to the circular dependency.  For example, allyesconfig followed by
syncconfig results in an odd behavior because CONFIG_B becomes visible
in syncconfig.

  $ make allyesconfig
  scripts/kconfig/conf  --allyesconfig Kconfig
  #
  # configuration written to .config
  #
  $ cat .config
  #
  # Automatically generated file; DO NOT EDIT.
  # Main menu
  #
  CONFIG_A=y
  $ make syncconfig
  scripts/kconfig/conf  --syncconfig Kconfig
  *
  * Restart config...
  *
  *
  * Main menu
  *
  a (A) [Y/n/?] y
    b (B) [N/y/?] (NEW)

To detect this correctly, sym_check_expr_deps() should recurse to
not only sym->rev_dep.expr but also sym->implied.expr .

At this moment, sym_check_print_recursive() cannot distinguish
'select' and 'imply' since it does not know the precise context
where the recursive dependency has been hit.  This will be solved
by the next commit.

In fact, even the document and the unit-test are confused.  Using
'imply' does not solve recursive dependency since 'imply' addresses
the unmet direct dependency, which 'select' could cause.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Dirk Gouders <dirk@gouders.net>
2018-08-22 23:21:39 +09:00
Masahiro Yamada
f1575595d1 kconfig: error out when seeing recursive dependency
Originally, recursive dependency was a fatal error for Kconfig
because Kconfig cannot compute symbol values in such a situation.

Commit d595cea624 ("kconfig: print more info when we see a recursive
dependency") changed it to a warning, which I guess was not intentional.

Get it back to an error again.

Also, rename the unit test directory "warn_recursive_dep" to
"err_recursive_dep" so that it matches to the behavior.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Dirk Gouders <dirk@gouders.net>
2018-08-22 23:21:38 +09:00
Randy Dunlap
4bf6a9af0e kconfig: add build-only configurator targets
Add build-only targets for build_menuconfig, build_nconfig,
build_xconfig, and build_gconfig.
(targets must end in "config" to qualify in top-level Makefile)

This allows these target to be built without execution (e.g., to
look for errors or warnings) and/or to be built and checked by sparse.

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-08-22 23:21:37 +09:00
Linus Torvalds
01f0e5cded Merge tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kconfig updates from Masahiro Yamada:

 - show clearer error messages where pkg-config is needed, but not
   installed

 - rename SYMBOL_AUTO to SYMBOL_NO_WRITE to reflect its semantics

 - create all necessary directories by Kconfig tool itself instead of
   Makefile

 - update the .config unconditionally when syncconfig is invoked

 - use 'include' directive instead of '-include' where
   include/config/{auto,tristate}.conf is mandatory

 - do not try to update the .config when running install targets

 - add .DELETE_ON_ERROR to delete partially updated files

 - misc cleanups and fixes

* tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: remove P_ENV property type
  kconfig: remove unused sym_get_env_prop() function
  kconfig: fix the rule of mainmenu_stmt symbol
  init/Kconfig: Use short unix-style option instead of --longname
  Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory
  kbuild: remove auto.conf from prerequisite of phony targets
  kbuild: do not update config for 'make kernelrelease'
  kbuild: do not update config when running install targets
  kbuild: add .DELETE_ON_ERROR special target
  kbuild: use 'include' directive to load auto.conf from top Makefile
  kconfig: allow all config targets to write auto.conf if missing
  kconfig: make syncconfig update .config regardless of sym_change_count
  kconfig: create directories needed for syncconfig by itself
  kconfig: remove unneeded directory generation from local*config
  kconfig: split out useful helpers in confdata.c
  kconfig: rename file_write_dep and move it to confdata.c
  kconfig: fix typos in description of "choice" in kconfig-language.txt
  kconfig: handle format string before calling conf_message_callback()
  kconfig: rename SYMBOL_AUTO to SYMBOL_NO_WRITE
  kconfig: check for pkg-config on make {menu,n,g,x}config
2018-08-15 12:50:10 -07:00
Masahiro Yamada
1880861226 kconfig: remove P_ENV property type
This property is not set by anyone since commit 104daea149 ("kconfig:
reference environment variables directly and remove 'option env='").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
2018-08-14 09:01:47 +09:00
Masahiro Yamada
c151272d16 kconfig: remove unused sym_get_env_prop() function
This function is unused since commit 104daea149 ("kconfig: reference
environment variables directly and remove 'option env='").

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
2018-08-14 08:59:57 +09:00
Masahiro Yamada
56869d45e3 kconfig: fix the rule of mainmenu_stmt symbol
The rule of mainmenu_stmt does not have debug print of zconf_lineno(),
but if it had, it would print a wrong line number for the same reason
as commit b2d00d7c61 ("kconfig: fix line numbers for if-entries in
menu tree").

The mainmenu_stmt does not need to eat following empty lines because
they are reduced to common_stmt.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-08-13 12:04:51 +09:00
Masahiro Yamada
00c864f890 kconfig: allow all config targets to write auto.conf if missing
Currently, only syncconfig creates or updates include/config/auto.conf
and some other files.  Other config targets create or update only the
.config file.

When you configure and build the kernel from a pristine source tree,
any config target is followed by syncconfig in the build stage since
include/config/auto.conf is missing.

We are moving compiler tests from Makefile to Kconfig.  It means that
parsing Kconfig files will be more costly since Kconfig invokes the
compiler commands internally.  Thus, we want to avoid invoking Kconfig
twice (one for *config to create the .config, and one for syncconfig
to synchronize the auto.conf).  If auto.conf does not exist, we can
generate all configuration files in the first configuration stage,
which will save the syncconfig in the build stage.

Please note this should be done only when auto.conf is missing.  If
*config blindly did this, time stamp files under include/config/ would
be unnecessarily touched, triggering unneeded rebuild of objects.

I assume a scenario like this:

 1. You have a source tree that has already been built
    with CONFIG_FOO disabled

 2. Run "make menuconfig" to enable CONFIG_FOO

 3. CONFIG_FOO turns out to be unnecessary.
    Run "make menuconfig" again to disable CONFIG_FOO

 4. Run "make"

In this case, include/config/foo.h should not be touched since there
is no change in CONFIG_FOO.  The sync process should be delayed until
the user really attempts to build the kernel.

This commit has another motivation; I want to suppress the 'No such
file or directory' warning from the 'include' directive.

The top-level Makefile includes auto.conf with '-include' directive,
like this:

  ifeq ($(dot-config),1)
  -include include/config/auto.conf
  endif

This looks strange because auto.conf is mandatory when dot-config is 1.
I guess only the reason of using '-include' is to suppress the warning
'include/config/auto.conf: No such file or directory' when building
from a clean tree.  However, this has a side-effect; Make considers
the files included by '-include' are optional.  Hence, Make continues
to build even if it fails to generate include/config/auto.conf.  I will
change this in the next commit, but the warning message is annoying.
(At least, kbuild test robot reports it as a regression.)

With this commit, Kconfig will generate all configuration files together
with the .config and I guess it is a solution good enough to suppress
the warning.

Note:
GNU Make 4.2 or later does not display the warning from the 'include'
directive if include files are successfully generated.  See GNU Make
commit 87a5f98d248f ("[SV 102] Don't show unnecessary include file
errors.")  However, older GNU Make versions are still widely used.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:30 +09:00
Masahiro Yamada
16952b77d8 kconfig: make syncconfig update .config regardless of sym_change_count
syncconfig updates the .config only when sym_change_count > 0, i.e.
any change in config symbols has been detected.

Not only symbols but also comments are contained in the .config file.
If only comments are updated, they are not fed back to the .config,
then the stale comments are left-over.  Of course, this is just a
matter of comments, but why not fix it.

I see some scenarios where this happens.

Scenario A:

 1. You have a source tree that has already been configured.

 2. Linus increments the version number in the top-level Makefile
    (i.e. he commits a new release)

 3. You pull it, and run 'make'

 4. syncconfig is invoked because the environment variable,
    KERNELVERSION is updated, but the .config is not updated since
    no config symbol is changed.

 5. The .config file contains a kernel version in the top line:

    # Automatically generated file; DO NOT EDIT.
    # Linux/arm64 4.18.0-rc2 Kernel Configuration

    ... which points to a previous version.

Scenario B:

 1. You have a source tree that has already been configured.

 2. You upgrade the compiler, but it still has the same version number.
    This may happen if you regularly build the latest compiler from
    the source code.

 3. You run 'make'

 4. syncconfig is invoked because the environment variable,
    CC_VERSION_TEXT is updated, but the .config is not updated since
    no config symbol is changed.

 5. The .config file contains the version string of the compiler:

    #
    # Compiler: aarch64-linux-gcc (GCC) 9.0.0 20180628 (experimental)
    #

    ... which carries the information of the old compiler.

If KCONFIG_NOSILENTUPDATE is set, syncconfig is not allowed to update
the .config file.  Otherwise, it is fine to update it regardless of
sym_change_count.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:30 +09:00
Masahiro Yamada
79123b1389 kconfig: create directories needed for syncconfig by itself
'make syncconfig' creates some files such as include/config/auto.conf,
include/generate/autoconf.h, etc. but the necessary directory creation
relies on scripts/kconfig/Makefile.

To make Kconfig self-contained, create directories as needed in
conf_write_autoconf().

This change allows scripts/kconfig/Makefile cleanups; syncconfig can
be merged into simple-targets.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:30 +09:00
Masahiro Yamada
adc18acf42 kconfig: remove unneeded directory generation from local*config
Commit 17263baf95 ("kconfig: Create include/generated for
localmodconfig") added the 'mkdir' line because local{yes,mod}config
ran streamline_config.pl followed by silentoldconfig at that time.

Since commit 81d2bc2273 ("kconfig: invoke oldconfig instead of
silentoldconfig from local*config"), no sub-directory is required.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:29 +09:00
Masahiro Yamada
0608182ad5 kconfig: split out useful helpers in confdata.c
Split out helpers:
 is_present() - check if the given path exists
 is_dir() - check if the given path exists and it is a directory
 make_parent_dir() - create the parent directories of the given path

These helpers will be reused in later commits.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:29 +09:00
Masahiro Yamada
a2ff404015 kconfig: rename file_write_dep and move it to confdata.c
file_write_dep() is called only from conf_write_autoconf().
Move it from util.c to confdata.c to make it static.
Also, rename it to conf_write_dep() since it should belong to
the group of conf_write* functions.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-25 23:25:28 +09:00
Masahiro Yamada
5accd7f336 kconfig: handle format string before calling conf_message_callback()
As you see in mconf.c and nconf.c, conf_message_callback() hooks are
likely to end up with the boilerplate of vsnprintf().  Process the
string format before calling conf_message_callback() so that it
receives a simple string.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Dirk Gouders <dirk@gouders.net>
2018-07-25 23:24:35 +09:00
Dirk Gouders
693359f7ac kconfig: rename SYMBOL_AUTO to SYMBOL_NO_WRITE
Over time, the use of the flag SYMBOL_AUTO changed from initially
marking three automatically generated symbols ARCH, KERNELRELEASE and
UNAME_RELEASE to today's effect of protecting symbols from being
written out.

Currently, only symbols of type CHOICE and those with option
defconf_list set have that flag set.

Reflect that change in semantics in the flag's name.

Signed-off-by: Dirk Gouders <dirk@gouders.net>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-18 01:18:09 +09:00
Randy Dunlap
4ab3b80159 kconfig: check for pkg-config on make {menu,n,g,x}config
Each of 'make {menu,n,g,x}config' uses (needs) pkg-config to make sure
that other required files are present and to determine build flags
settings, but none of these check that pkg-config itself is present.
Add a check for all 4 of these targets and update
Documentation/process/changes.rst to mention 'pkg-config'.

Fixes kernel bugzilla #77511:
https://bugzilla.kernel.org/show_bug.cgi?id=77511

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Bjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-18 01:18:09 +09:00
Laura Abbott
8377bd2b9e kbuild: Rename HOST_LOADLIBES to KBUILD_HOSTLDLIBS
In preparation for enabling command line LDLIBS, re-name HOST_LOADLIBES
to KBUILD_HOSTLDLIBS as the internal use only flags. Also rename
existing usage to HOSTLDLIBS for consistency. This should not have any
visible effects.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2018-07-18 01:18:05 +09:00