40 Commits

Author	SHA1	Message	Date
lucaswei	cf18f36ffb	Merge android-4.14-q (4.14.204) into android-msm-pixel-4.14-lts ... Merge 4.14.204 into android-4.14-q Linux 4.14.204 staging: octeon: Drop on uncorrectable alignment or FCS error staging: octeon: repair "fixed-link" support staging: comedi: cb_pcidas: Allow 2-channel commands for AO subdevice * KVM: arm64: Fix AArch32 handling of DBGD{CCINT,SCRext} and DBGVCR arch/arm64/include/asm/kvm_host.h * device property: Don't clear secondary pointer for shared primary firmware node drivers/base/core.c * device property: Keep secondary firmware node secondary by type drivers/base/core.c ARM: s3c24xx: fix missing system reset ARM: samsung: fix PM debug build with DEBUG_LL but !MMU arm: dts: mt7623: add missing pause for switchport hil/parisc: Disable HIL driver when it gets stuck cachefiles: Handle readpage error correctly * arm64: berlin: Select DW_APB_TIMER_OF arch/arm64/Kconfig.platforms tty: make FONTX ioctl use the tty pointer they were actually passed rtc: rx8010: don't modify the global rtc ops drm/ttm: fix eviction valuable range check. * ext4: fix invalid inode checksum fs/ext4/inode.c * ext4: fix error handling code in add_new_gdb fs/ext4/resize.c * ext4: fix leaking sysfs kobject after failed mount fs/ext4/super.c vringh: fix __vringh_iov() when riov and wiov are different * ring-buffer: Return 0 on success from ring_buffer_resize() kernel/trace/ring_buffer.c 9P: Cast to loff_t before multiplying libceph: clear con->out_msg on Policy::stateful_server faults ceph: promote to unsigned long long before shifting drm/amdgpu: don't map BO in reserved region ia64: fix build error with !COREDUMP ubi: check kthread_should_stop() after the setting of task state perf python scripting: Fix printable strings in python3 scripts ubifs: dent: Fix some potential memory leaks while iterating entries NFSD: Add missing NFSv2 .pc_func methods * NFSv4.2: support EXCHGID4_FLAG_SUPP_FENCE_OPS 4.2 EXCHANGE_ID flag include/uapi/linux/nfs4.h powerpc/powernv/elog: Fix race while processing OPAL error log event. powerpc: Warn about use of smt_snooze_delay powerpc/rtas: Restrict RTAS requests from userspace s390/stp: add locking to sysfs functions iio:gyro:itg3200: Fix timestamp alignment and prevent data leak. iio:adc:ti-adc12138 Fix alignment issue with timestamp iio:adc:ti-adc0832 Fix alignment issue with timestamp iio:light:si1145: Fix timestamp alignment and prevent data leak. dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status vt: keyboard, extend func_buf_lock to readers vt: keyboard, simplify vt_kdgkbsent drm/i915: Force VT'd workarounds when running as a guest OS usb: host: fsl-mph-dr-of: check return of dma_set_mask() usb: cdc-acm: fix cooldown mechanism * usb: dwc3: core: don't trigger runtime pm when remove driver drivers/usb/dwc3/core.c * usb: dwc3: core: add phy cleanup for probe error handling drivers/usb/dwc3/core.c * usb: dwc3: ep0: Fix ZLP for OUT ep0 requests drivers/usb/dwc3/ep0.c btrfs: fix use-after-free on readahead extent after failure to create it btrfs: cleanup cow block on error btrfs: use kvzalloc() to allocate clone_roots in btrfs_ioctl_send() btrfs: send, recompute reference path after orphanization of a directory btrfs: reschedule if necessary when logging directory items scsi: mptfusion: Fix null pointer dereferences in mptscsih_remove() w1: mxc_w1: Fix timeout resolution problem leading to bus error acpi-cpufreq: Honor _PSD table setting on new AMD CPUs ACPI: debug: don't allow debugging when ACPI is disabled ACPI: video: use ACPI backlight for HP 635 Notebook ACPI / extlog: Check for RDMSR failure NFS: fix nfs_path in case of a rename retry * fs: Don't invalidate page buffers in block_write_full_page() fs/buffer.c leds: bcm6328, bcm6358: use devres LED registering function perf/x86/amd/ibs: Fix raw sample data accumulation perf/x86/amd/ibs: Don't include randomized bits in get_ibs_op_count() md/raid5: fix oops during stripe resizing nvme-rdma: fix crash when connect rejected * sgl_alloc_order: fix memory leak lib/scatterlist.c nbd: make the config put is called before the notifying the waiter ARM: dts: s5pv210: remove dedicated 'audio-subsystem' node ARM: dts: s5pv210: move PMU node out of clock controller ARM: dts: s5pv210: remove DMA controller bus node name to fix dtschema warnings memory: emif: Remove bogus debugfs error handling arm64: dts: renesas: ulcb: add full-pwr-cycle-in-suspend into eMMC nodes gfs2: add validation checks for size of superblock * ext4: Detect already used quota file early fs/ext4/super.c drivers: watchdog: rdc321x_wdt: Fix race condition bugs net: 9p: initialize sun_server.sun_path to have addr's value only when addr is valid clk: ti: clockdomain: fix static checker warning bnxt_en: Log unknown link speed appropriately. md/bitmap: md_bitmap_get_counter returns wrong blocks power: supply: test_power: add missing newlines when printing parameters by sysfs bus/fsl_mc: Do not rely on caller to provide non NULL mc_io drivers/net/wan/hdlc_fr: Correctly handle special skb->protocol values ACPI: Add out of bounds and numa_off protections to pxm_to_node() * arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE arch/arm64/include/asm/numa.h * uio: free uio id after uio file node is freed drivers/uio/uio.c USB: adutux: fix debugging cpufreq: sti-cpufreq: add stih418 support kgdb: Make "kgdbcon" work properly with "kgdb_earlycon" * printk: reduce LOG_BUF_SHIFT range for H8300 init/Kconfig drm/bridge/synopsys: dsi: add support for non-continuous HS clock mmc: via-sdmmc: Fix data race bug media: tw5864: check status of tw5864_frameinterval_get usb: typec: tcpm: During PR_SWAP, source caps should be sent only after tSwapSourceStart media: platform: Improve queue set up flow for bug fixing * media: videodev2.h: RGB BT2020 and HSV are always full range include/uapi/linux/videodev2.h drm/brige/megachips: Add checking if ge_b850v3_lvds_init() is working correctly ath10k: fix VHT NSS calculation when STBC is enabled ath10k: start recovery process when payload length exceeds max htc length for sdio video: fbdev: pvr2fb: initialize variables xfs: fix realtime bitmap/summary file truncation when growing rt volume ARM: 8997/2: hw_breakpoint: Handle inexact watchpoint addresses um: change sigio_spinlock to a mutex * f2fs: fix to check segment boundary during SIT page readahead fs/f2fs/checkpoint.c * f2fs: add trace exit in exception path fs/f2fs/checkpoint.c sparc64: remove mm_cpumask clearing to fix kthread_use_mm race powerpc: select ARCH_WANT_IRQS_OFF_ACTIVATE_MM powerpc/powernv/smp: Fix spurious DBG() warning * futex: Fix incorrect should_fail_futex() handling kernel/futex.c mlxsw: core: Fix use-after-free in mlxsw_emad_trans_finish() x86/unwind/orc: Fix inactive tasks with stack pointer in %sp on GCC 10 compiled kernels * fscrypt: return -EXDEV for incompatible rename or link into encrypted dir fs/crypto/policy.c fs/ext4/namei.c fs/f2fs/namei.c ata: sata_rcar: Fix DMA boundary mask mtd: lpddr: Fix bad logic in print_drs_error p54: avoid accessing the data mapped to streaming DMA * fuse: fix page dereference after free fs/fuse/dev.c x86/xen: disable Firmware First mode for correctable memory errors arch/x86/amd/ibs: Fix re-arming IBS Fetch tipc: fix memory leak caused by tipc_buf_append() ravb: Fix bit fields checking in ravb_hwtstamp_get() gtp: fix an use-before-init in gtp_newlink() efivarfs: Replace invalid slashes with exclamation marks in dentries. * arm64: link with -z norelro regardless of CONFIG_RELOCATABLE arch/arm64/Makefile * scripts/setlocalversion: make git describe output more reliable scripts/setlocalversion * BACKPORT: xfrm/compat: Translate 32-bit user_policy from sockptr include/net/xfrm.h net/xfrm/xfrm_state.c * BACKPORT: xfrm/compat: Add 32=>64-bit messages translator include/net/xfrm.h net/xfrm/Kconfig net/xfrm/xfrm_user.c * UPSTREAM: xfrm/compat: Attach xfrm dumps to 64=>32 bit translator net/xfrm/xfrm_user.c * UPSTREAM: xfrm/compat: Add 64=>32-bit messages translator include/net/xfrm.h net/xfrm/xfrm_user.c * BACKPORT: xfrm: Provide API to register translator module include/net/xfrm.h net/xfrm/Kconfig net/xfrm/Makefile net/xfrm/xfrm_state.c * UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller mm/slub.c ANDROID: Publish uncompressed Image on aarch64 * ANDROID: Makefile: append BUILD_NUMBER to version string when defined Makefile Merge 4.14.203 into android-4.14-q Linux 4.14.203 powerpc/powernv/opal-dump : Use IRQ_HANDLED instead of numbers in interrupt handler * usb: gadget: f_ncm: allow using NCM in SuperSpeed Plus gadgets. drivers/usb/gadget/function/f_ncm.c eeprom: at25: set minimum read/write access stride to 1 USB: cdc-wdm: Make wdm_flush() interruptible and add wdm_fsync(). usb: cdc-acm: add quirk to blacklist ETAS ES58X devices tty: serial: fsl_lpuart: fix lpuart32_poll_get_char net: korina: cast KSEG0 address to pointer in kfree ath10k: check idx validity in __ath10k_htt_rx_ring_fill_n() * scsi: ufs: ufs-qcom: Fix race conditions caused by ufs_qcom_testbus_config() drivers/scsi/ufs/ufs-qcom.c * usb: core: Solve race condition in anchor cleanup functions drivers/usb/core/urb.c brcm80211: fix possible memleak in brcmf_proto_msgbuf_attach mwifiex: don't call del_timer_sync() on uninitialized timer reiserfs: Fix memory leak in reiserfs_parse_options() ipvs: Fix uninit-value in do_ip_vs_set_ctl() tty: ipwireless: fix error handling scsi: qedi: Fix list_del corruption while removing active I/O scsi: qedi: Protect active command list to avoid list corruption Fix use after free in get_capset_info callback. rtl8xxxu: prevent potential memory leak brcmsmac: fix memory leak in wlc_phy_attach_lcnphy scsi: ibmvfc: Fix error return in ibmvfc_probe() * Bluetooth: Only mark socket zapped after unlocking net/bluetooth/l2cap_sock.c * usb: ohci: Default to per-port over-current protection drivers/usb/host/ohci-hcd.c xfs: make sure the rt allocator doesn't run off the end reiserfs: only call unlock_new_inode() if I_NEW misc: rtsx: Fix memory leak in rtsx_pci_probe ath9k: hif_usb: fix race condition between usb_get_urb() and usb_kill_anchored_urbs() can: flexcan: flexcan_chip_stop(): add error handling and propagate error value USB: cdc-acm: handle broken union descriptors udf: Avoid accessing uninitialized data on failed inode read udf: Limit sparing table size usb: gadget: function: printer: fix use-after-free in __lock_acquire misc: vop: add round_up(x,4) for vring_size to avoid kernel panic mic: vop: copy data to kernel space then write to io memory * scsi: target: core: Add CONTROL field for trace events include/scsi/scsi_common.h scsi: mvumi: Fix error return in mvumi_io_attach() PM: hibernate: remove the bogus call to get_gendisk() in software_resume() mac80211: handle lack of sband->bitrates in rates ntfs: add check for mft record size in superblock media: venus: core: Fix runtime PM imbalance in venus_probe fs: dlm: fix configfs memory leak media: saa7134: avoid a shift overflow mmc: sdio: Check for CISTPL_VERS_1 buffer size * media: uvcvideo: Ensure all probed info is returned to v4l2 drivers/media/usb/uvc/uvc_v4l2.c media: media/pci: prevent memory leak in bttv_probe media: bdisp: Fix runtime PM imbalance on error media: platform: sti: hva: Fix runtime PM imbalance on error media: platform: s3c-camif: Fix runtime PM imbalance on error media: vsp1: Fix runtime PM imbalance on error media: exynos4-is: Fix a reference count leak media: exynos4-is: Fix a reference count leak due to pm_runtime_get_sync media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync media: sti: Fix reference count leaks media: st-delta: Fix reference count leak in delta_run_work media: ati_remote: sanity check for both endpoints media: firewire: fix memory leak crypto: ccp - fix error handling i2c: core: Restore acpi_walk_dep_device_list() getting called after registering the ACPI i2c devs * perf: correct SNOOPX field offset include/uapi/linux/perf_event.h NTB: hw: amd: fix an issue about leak system resources nvmet: fix uninitialized work for zero kato powerpc/powernv/dump: Fix race while processing OPAL dump arm64: dts: zynqmp: Remove additional compatible string for i2c IPs ARM: dts: owl-s500: Fix incorrect PPI interrupt specifiers arm64: dts: qcom: msm8916: Fix MDP/DSI interrupts memory: fsl-corenet-cf: Fix handling of platform_get_irq() error memory: omap-gpmc: Fix a couple off by ones KVM: x86: emulating RDPID failure shall return #UD rather than #GP Input: sun4i-ps2 - fix handling of platform_get_irq() error Input: twl4030_keypad - fix handling of platform_get_irq() error Input: omap4-keypad - fix handling of platform_get_irq() error Input: ep93xx_keypad - fix handling of platform_get_irq() error Input: stmfts - fix a & vs && typo Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() vfio iommu type1: Fix memory leak in vfio_iommu_type1_pin_pages vfio/pci: Clear token on bypass registration failure * ext4: limit entries returned when counting fsmap records fs/ext4/fsmap.c clk: bcm2835: add missing release if devm_clk_hw_register fails clk: at91: clk-main: update key before writing AT91_CKGR_MOR PCI: iproc: Set affinity mask on MSI interrupts * i2c: rcar: Auto select RESET_CONTROLLER drivers/i2c/busses/Kconfig * mailbox: avoid timer start from callback drivers/mailbox/mailbox.c rapidio: fix the missed put_device() for rio_mport_add_riodev rapidio: fix error handling path ramfs: fix nommu mmap with gaps in the page cache * lib/crc32.c: fix trivial typo in preprocessor condition lib/crc32.c * f2fs: wait for sysfs kobject removal before freeing f2fs_sb_info fs/f2fs/sysfs.c IB/rdmavt: Fix sizeof mismatch cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_reboot_notifier powerpc/perf/hv-gpci: Fix starting index value powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints * overflow: Include header file with SIZE_MAX declaration include/linux/overflow.h kdb: Fix pager search for multi-line strings RDMA/hns: Set the unsupported wr opcode perf intel-pt: Fix "context_switch event has no tid" error powerpc/tau: Disable TAU between measurements powerpc/tau: Remove duplicated set_thresholds() call powerpc/tau: Use appropriate temperature sample interval RDMA/qedr: Fix use of uninitialized field xfs: limit entries returned when counting fsmap records arc: plat-hsdk: fix kconfig dependency warning when !RESET_CONTROLLER ARM: 9007/1: l2c: fix prefetch bits init in L2X0_AUX_CTRL using DT values mtd: mtdoops: Don't write panic data twice mtd: lpddr: fix excessive stack usage with clang powerpc/icp-hv: Fix missing of_node_put() in success path powerpc/pseries: Fix missing of_node_put() in rng_init() IB/mlx4: Adjust delayed work when a dup is observed IB/mlx4: Fix starvation in paravirt mux/demux * mm, oom_adj: don't loop through tasks in __set_oom_adj when not necessary fs/proc/base.c include/linux/oom.h include/linux/sched/coredump.h kernel/fork.c mm/oom_kill.c mm/memcg: fix device private memcg accounting net: korina: fix kfree of rx/tx descriptor array mwifiex: fix double free scsi: be2iscsi: Fix a theoretical leak in beiscsi_create_eqs() usb: dwc2: Fix INTR OUT transfers in DDMA mode. * nl80211: fix non-split wiphy information net/wireless/nl80211.c * usb: gadget: u_ether: enable qmult on SuperSpeed Plus as well drivers/usb/gadget/function/u_ether.c * usb: gadget: f_ncm: fix ncm_bitrate for SuperSpeed and above. drivers/usb/gadget/function/f_ncm.c iwlwifi: mvm: split a print to avoid a WARNING in ROC mfd: sm501: Fix leaks in probe() net: enic: Cure the enic api locking trainwreck qtnfmac: fix resource leaks on unsupported iftype error return path * HID: hid-input: fix stylus battery reporting drivers/hid/hid-input.c * quota: clear padding in v2r1_mem2diskdqb() fs/quota/quota_v2.c usb: dwc2: Fix parameter type in function pointer prototype ALSA: seq: oss: Avoid mutex lock for a long-time ioctl misc: mic: scif: Fix error handling path ath6kl: wmi: prevent a shift wrapping bug in ath6kl_wmi_delete_pstream_cmd() pinctrl: mcp23s08: Fix mcp23x17 precious range pinctrl: mcp23s08: Fix mcp23x17_regmap initialiser HID: roccat: add bounds checking in kone_sysfs_write_settings() video: fbdev: sis: fix null ptr dereference video: fbdev: vga16fb: fix setting of pixclock because a pass-by-value error drivers/virt/fsl_hypervisor: Fix error handling path pwm: lpss: Add range limit check for the base_unit register value pwm: lpss: Fix off by one error in base_unit math in pwm_lpss_prepare() * pty: do tty_flip_buffer_push without port->lock in pty_write drivers/tty/pty.c tty: hvcs: Don't NULL tty->driver_data until hvcs_cleanup() * tty: serial: earlycon dependency drivers/tty/serial/Kconfig VMCI: check return value of get_user_pages_fast() for errors backlight: sky81452-backlight: Fix refcount imbalance on error scsi: csiostor: Fix wrong return value in csio_hw_prep_fw() scsi: qla4xxx: Fix an error handling path in 'qla4xxx_get_host_stats()' drm/gma500: fix error check mwifiex: Do not use GFP_KERNEL in atomic context brcmfmac: check ndev pointer ASoC: qcom: lpass-cpu: fix concurrency issue ASoC: qcom: lpass-platform: fix memory leak wcn36xx: Fix reported 802.11n rx_highest rate wcn3660/wcn3680 ath9k: Fix potential out of bounds in ath9k_htc_txcompletion_cb() ath6kl: prevent potential array overflow in ath6kl_add_new_sta() Bluetooth: hci_uart: Cancel init work before unregistering ath10k: provide survey info as accumulated data * regulator: resolve supply after creating regulator drivers/regulator/core.c media: ti-vpe: Fix a missing check and reference count leak media: s5p-mfc: Fix a reference count leak media: platform: fcp: Fix a reference count leak. media: tc358743: initialize variable media: mx2_emmaprp: Fix memleak in emmaprp_probe cypto: mediatek - fix leaks in mtk_desc_ring_alloc crypto: omap-sham - fix digcnt register handling with export/import media: omap3isp: Fix memleak in isp_probe * media: uvcvideo: Set media controller entity functions drivers/media/usb/uvc/uvc_entity.c media: m5mols: Check function pointer in m5mols_sensor_power media: Revert "media: exynos4-is: Add missed check for pinctrl_lookup_state()" * media: tuner-simple: fix regression in simple_set_radio_freq drivers/media/tuners/tuner-simple.c crypto: ixp4xx - Fix the size used in a 'dma_free_coherent()' call crypto: mediatek - Fix wrong return value in mtk_desc_ring_alloc() crypto: algif_skcipher - EBUSY on aio should be an error drivers/perf: xgene_pmu: Fix uninitialized resource struct x86/fpu: Allow multiple bits in clearcpuid= parameter EDAC/i5100: Fix error handling order in i5100_init_one() crypto: algif_aead - Do not set MAY_BACKLOG on the async path ima: Don't ignore errors from crypto_shash_update() KVM: SVM: Initialize prev_ga_tag before use KVM: x86/mmu: Commit zap of remaining invalid pages when recovering lpages cifs: Return the error from crypt_message when enc/dec key not found. cifs: remove bogus debug code * icmp: randomize the global rate limiter net/ipv4/icmp.c * tcp: fix to update snd_wl1 in bulk receiver fast path net/ipv4/tcp_input.c nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download() net: hdlc_raw_eth: Clear the IFF_TX_SKB_SHARING flag after calling ether_setup net: hdlc: In hdlc_rcv, check to make sure dev is an HDLC device ALSA: bebob: potential info leak in hwdep_read() * binder: fix UAF when releasing todo list drivers/android/binder.c r8169: fix data corruption issue on RTL8402 * net/ipv4: always honour route mtu during forwarding include/net/ip.h tipc: fix the skb_unshare() in tipc_buf_append() net: usb: qmi_wwan: add Cellient MPL200 card mlx4: handle non-napi callers to napi_poll * ipv4: Restore flowi4_oif update before call to xfrm_lookup_route net/ipv4/route.c ibmveth: Identify ingress large send packets. ibmveth: Switch order of ibmveth_helper calls. * UPSTREAM: binder: fix UAF when releasing todo list drivers/android/binder.c Merge 4.14.202 into android-4.14-q Linux 4.14.202 crypto: qat - check cipher length for aead AES-CBC-HMAC-SHA crypto: bcm - Verify GCM/CCM key length in setkey drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case reiserfs: Fix oops during mount reiserfs: Initialize inode keys properly USB: serial: ftdi_sio: add support for FreeCalypso JTAG+UART adapters USB: serial: pl2303: add device-id for HP GC device staging: comedi: check validity of wMaxPacketSize of usb endpoints found USB: serial: option: Add Telit FT980-KS composition USB: serial: option: add Cellient MPL200 card media: usbtv: Fix refcounting mixup * Bluetooth: Disconnect if E0 is used for Level 4 include/net/bluetooth/hci_core.h net/bluetooth/hci_conn.c net/bluetooth/hci_event.c * Bluetooth: Fix update of connection state in `hci_encrypt_cfm` include/net/bluetooth/hci_core.h * Bluetooth: Consolidate encryption handling in hci_encrypt_cfm include/net/bluetooth/hci_core.h net/bluetooth/hci_event.c * Bluetooth: MGMT: Fix not checking if BT_HS is enabled net/bluetooth/mgmt.c * Bluetooth: L2CAP: Fix calling sk_filter on non-socket based channel include/net/bluetooth/l2cap.h net/bluetooth/l2cap_core.c net/bluetooth/l2cap_sock.c * Bluetooth: A2MP: Fix not initializing all members net/bluetooth/a2mp.c * Bluetooth: fix kernel oops in store_pending_adv_report net/bluetooth/hci_event.c Merge 4.14.201 into android-4.14-q Linux 4.14.201 * net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails drivers/net/usb/rtl8150.c * mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged include/linux/khugepaged.h mm/page_alloc.c mmc: core: don't set limits.discard_granularity as 0 * perf: Fix task_function_call() error handling kernel/events/core.c rxrpc: Fix server keyring leak rxrpc: Fix some missing _bh annotations on locking conn->state_lock rxrpc: Downgrade the BUG() for unsupported token type in rxrpc_read() rxrpc: Fix rxkad token xdr encoding * net: usb: ax88179_178a: fix missing stop entry in driver_info drivers/net/usb/ax88179_178a.c * mdio: fix mdio-thunder.c dependency & build error drivers/net/phy/Kconfig * bonding: set dev->needed_headroom in bond_setup_by_slave() drivers/net/bonding/bond_main.c * xfrm: Use correct address family in xfrm_state_find net/xfrm/xfrm_state.c * platform/x86: fix kconfig dependency warning for FUJITSU_LAPTOP drivers/platform/x86/Kconfig net: stmmac: removed enabling eee in EEE set callback * xfrm: clone whole liftime_cur structure in xfrm_do_migrate net/xfrm/xfrm_state.c * xfrm: clone XFRMA_SEC_CTX in xfrm_do_migrate net/xfrm/xfrm_state.c * xfrm: clone XFRMA_REPLAY_ESN_VAL in xfrm_do_migrate include/net/xfrm.h drm/amdgpu: prevent double kfree ttm->sg openvswitch: handle DNAT tuple collision net: team: fix memory leak in __team_options_register team: set dev->needed_headroom in team_setup_by_port() * sctp: fix sctp_auth_init_hmacs() error path net/sctp/auth.c i2c: meson: fix clock setting overwrite cifs: Fix incomplete memory allocation on setxattr path mm/khugepaged: fix filemap page_to_pgoff(page) != offset macsec: avoid use-after-free in macsec_handle_frame() ftrace: Move RCU is watching check after recursion check Btrfs: fix unexpected failure of nocow buffered writes after snapshotting when low on space mtd: rawnand: sunxi: Fix the probe error path perf top: Fix stdio interface input handling with glibc 2.28+ * driver core: Fix probe_count imbalance in really_probe() drivers/base/dd.c platform/x86: thinkpad_acpi: re-initialize ACPI buffer size when reuse platform/x86: thinkpad_acpi: initialize tp_nvram_state variable * usermodehelper: reset umask to default before executing user process kernel/umh.c * net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() net/wireless/nl80211.c fbcon: Fix global-out-of-bounds read in fbcon_get_font() Revert "ravb: Fixed to be able to unload modules" Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h * drm/syncobj: Fix drm_syncobj_handle_to_fd refcount leak drivers/gpu/drm/drm_syncobj.c * netfilter: ctnetlink: add a range check for l3/l4 protonum net/netfilter/nf_conntrack_netlink.c * ep_create_wakeup_source(): dentry name can change under you... fs/eventpoll.c * epoll: EPOLL_CTL_ADD: close the race in decision to take fast path fs/eventpoll.c * epoll: replace ->visited/visited_list with generation count fs/eventpoll.c * epoll: do not insert into poll queues until all sanity checks are done fs/eventpoll.c * net/packet: fix overflow in tpacket_rcv net/packet/af_packet.c * random32: Restore __latent_entropy attribute on net_rand_state lib/random32.c Input: trackpoint - enable Synaptics trackpoints i2c: cpm: Fix i2c_ram structure iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate() clk: samsung: exynos4: mark 'chipid' clock as CLK_IGNORE_UNUSED nfs: Fix security label length not being reset pinctrl: mvebu: Fix i2c sda definition for 98DX3236 nvme-fc: fail new connections to a deleted host or remote port spi: fsl-espi: Only process interrupts for expected events mac80211: do not allow bigger VHT MPDUs than the hardware supports drivers/net/wan/hdlc: Set skb->protocol before transmitting drivers/net/wan/lapbether: Make skb->protocol consistent with the header rndis_host: increase sleep time in the query-response loop net: dec: de2104x: Increase receive ring size for Tulip drm/sun4i: mixer: Extend regmap max_register drivers/net/wan/hdlc_fr: Add needed_headroom for PVC devices drm/amdgpu: restore proper ref count in amdgpu_display_crtc_set_config Input: i8042 - add nopnp quirk for Acer Aspire 5 A515 gpio: tc35894: fix up tc35894 interrupt configuration * USB: gadget: f_ncm: Fix NDP16 datagram validation drivers/usb/gadget/function/f_ncm.c net: virtio_vsock: Enhance connection semantics vsock/virtio: add transport parameter to the virtio_transport_reset_no_sock() vsock/virtio: stop workers during the .remove() vsock/virtio: use RCU to avoid use-after-free on the_virtio_vsock Merge 4.14.200 into android-4.14-q Linux 4.14.200 ata: sata_mv, avoid trigerrable BUG_ON ata: make qc_prep return ata_completion_errors ata: define AC_ERR_OK * lib/string.c: implement stpcpy lib/string.c * mm, THP, swap: fix allocating cluster for swapfile by mistake mm/swapfile.c kprobes: Fix to check probe enabled before disarm_kprobe_ftrace() s390/dasd: Fix zero write for FBA devices MIPS: Add the missing 'CPU_1074K' into __get_cpu_type() ALSA: asihpi: fix iounmap in error handler batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh batman-adv: Add missing include for in_interrupt() net: qed: RDMA personality shouldn't fail VF load drm/vc4/vc4_hdmi: fill ASoC card owner mac802154: tx: fix use-after-free batman-adv: mcast/TT: fix wrongly dropped or rerouted packets atm: eni: fix the missed pci_disable_device() for eni_init_one() batman-adv: bla: fix type misuse for backbone_gw hash indexing mwifiex: Increase AES key storage size to 256 bits clocksource/drivers/h8300_timer8: Fix wrong return value in h8300_8timer_init() ieee802154/adf7242: check status of adf7242_read_reg ieee802154: fix one possible memleak in ca8210_dev_com_init objtool: Fix noreturn detection for ignored functions * i2c: core: Call i2c_acpi_install_space_handler() before i2c_acpi_register_devices() drivers/i2c/i2c-core-base.c s390/init: add missing __init annotations btrfs: qgroup: fix data leak caused by race between writeback and truncate vfio/pci: fix racy on error and request eventfd ctx selftests/x86/syscall_nt: Clear weird flags after each test scsi: libfc: Skip additional kref updating work event scsi: libfc: Handling of extra kref cifs: Fix double add page to memcg when cifs_readpages vfio/pci: Clear error and request eventfd ctx after releasing x86/speculation/mds: Mark mds_user_clear_cpu_buffers() __always_inline mtd: parser: cmdline: Support MTD names containing one or more colons rapidio: avoid data race between file operation callbacks and mport_cdev_add(). * mm/swap_state: fix a data race in swapin_nr_pages mm/swap_state.c ceph: fix potential race in ceph_check_caps mtd: rawnand: omap_elm: Fix runtime PM imbalance on error perf kcore_copy: Fix module map when there are no modules loaded perf util: Fix memory leak of prefix_if_not_in vfio/pci: fix memory leaks of eventfd ctx btrfs: don't force read-only after error in drop snapshot * usb: dwc3: Increase timeout for CmdAct cleared by device controller drivers/usb/dwc3/gadget.c * printk: handle blank console arguments passed in. kernel/printk/printk.c drm/nouveau/debugfs: fix runtime pm imbalance on error e1000: Do not perform reset in reset_task if we are already down * arm64/cpufeature: Drop TraceFilt feature exposure from ID_DFR0 register arch/arm64/kernel/cpufeature.c USB: EHCI: ehci-mv: fix less than zero comparison of an unsigned int * fuse: don't check refcount after stealing page fs/fuse/dev.c powerpc/traps: Make unrecoverable NMIs die instead of panic ALSA: hda: Fix potential race in unsol event handler tty: serial: samsung: Correct clock selection logic USB: EHCI: ehci-mv: fix error handling in mv_ehci_probe() * Bluetooth: Handle Inquiry Cancel error after Inquiry Complete net/bluetooth/hci_event.c phy: samsung: s5pv210-usb2: Add delay after reset power: supply: max17040: Correct voltage reading atm: fix a memory leak of vcc->user_back dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion * arm64: cpufeature: Relax checks for AArch32 support at EL[0-2] arch/arm64/kernel/cpufeature.c sparc64: vcc: Fix error return code in vcc_probe() staging:r8188eu: avoid skb_clone for amsdu to msdu conversion drivers: char: tlclk.c: Avoid data race between init and interrupt handler * bdev: Reduce time holding bd_mutex in sync in blkdev_close() fs/block_dev.c KVM: Remove CREATE_IRQCHIP/SET_PIT2 race serial: uartps: Wait for tx_empty in console setup scsi: qedi: Fix termination timeouts in session logout * mm/mmap.c: initialize align_offset explicitly for vm_unmapped_area mm/mmap.c * mm/vmscan.c: fix data races using kswapd_classzone_idx mm/vmscan.c * mm/filemap.c: clear page error before actual read mm/filemap.c mm/kmemleak.c: use address-of operator on section symbols NFS: Fix races nfs_page_group_destroy() vs nfs_destroy_unlinked_subrequests() * ALSA: usb-audio: Fix case when USB MIDI interface has more than one extra endpoint descriptor sound/usb/midi.c ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len svcrdma: Fix leak of transport addresses SUNRPC: Fix a potential buffer overflow in 'svc_print_xprts()' RDMA/rxe: Set sys_image_guid to be aligned with HW IB devices tools: gpio-hammer: Avoid potential overflow in main cpufreq: powernv: Fix frame-size-overflow in powernv_cpufreq_work_fn perf cpumap: Fix snprintf overflow check serial: 8250: 8250_omap: Terminate DMA before pushing data on RX timeout serial: 8250_omap: Fix sleeping function called from invalid context during probe serial: 8250_port: Don't service RX FIFO if throttled * tracing: Use address-of operator on section symbols kernel/trace/trace.c rtc: ds1374: fix possible race condition tpm: ibmvtpm: Wait for buffer to be set before proceeding xfs: don't ever return a stale pointer from __xfs_dir3_free_read media: tda10071: fix unsigned sign extension overflow * Bluetooth: L2CAP: handle l2cap config request during open state net/bluetooth/l2cap_core.c scsi: aacraid: Disabling TM path and only processing IOP reset ath10k: use kzalloc to read for ath10k_sdio_hif_diag_read drm/amdgpu: increase atombios cmd timeout * mm: avoid data corruption on CoW fault into PFN-mapped VMA mm/memory.c * ext4: fix a data race at inode->i_disksize fs/ext4/inode.c * timekeeping: Prevent 32bit truncation in scale64_check_overflow() kernel/time/timekeeping.c * Bluetooth: guard against controllers sending zero'd events net/bluetooth/hci_event.c media: go7007: Fix URB type for interrupt handling dmaengine: tegra-apb: Prevent race conditions on channel's freeing * bpf: Remove recursion prevention from rcu free callback kernel/bpf/hashtab.c x86/pkeys: Add check for pkey "overflow" media: staging/imx: Missing assignment in imx_media_capture_device_register() KVM: x86: fix incorrect comparison in trace event RDMA/rxe: Fix configuration of atomic queue pair attributes perf test: Fix test trace+probe_vfs_getname.sh on s390 drm/omap: fix possible object reference leak scsi: lpfc: Fix coverity errors in fmdi attribute handling scsi: lpfc: Fix RQ buffer leakage when no IOCBs available * selinux: sel_avc_get_stat_idx should increase position index security/selinux/selinuxfs.c audit: CONFIG_CHANGE don't log internal bookkeeping as an event * skbuff: fix a data race in skb_queue_len() include/linux/skbuff.h net/unix/af_unix.c ALSA: hda: Clear RIRB status before reading WP KVM: fix overflow of zero page refcount with ksm running * Bluetooth: prefetch channel before killing sock net/bluetooth/l2cap_sock.c * mm: pagewalk: fix termination condition in walk_pte_range() mm/pagewalk.c * Bluetooth: Fix refcount use-after-free issue net/bluetooth/l2cap_core.c net/bluetooth/l2cap_sock.c tools/power/x86/intel_pstate_tracer: changes for python 3 compatibility selftests/ftrace: fix glob selftest ar5523: Add USB ID of SMCWUSBT-G2 wireless adapter * tracing: Set kernel_stack's caller size properly kernel/trace/trace_entries.h powerpc/eeh: Only dump stack once if an MMIO loop is detected dmaengine: zynqmp_dma: fix burst length configuration ACPI: EC: Reference count query handlers under lock media: ti-vpe: cal: Restrict DMA to avoid memory corruption * seqlock: Require WRITE_ONCE surrounding raw_seqcount_barrier include/linux/seqlock.h * rt_cpu_seq_next should increase position index net/ipv4/route.c * neigh_stat_seq_next() should increase position index net/core/neighbour.c * kernel/sys.c: avoid copying possible padding bytes in copy_to_user kernel/sys.c CIFS: Properly process SMB3 lease breaks * debugfs: Fix !DEBUG_FS debugfs_create_automount include/linux/debugfs.h gfs2: clean up iopen glock mess in gfs2_create_inode mmc: core: Fix size overflow for mmc partitions RDMA/iw_cgxb4: Fix an error handling path in 'c4iw_connect()' xfs: fix attr leaf header freemap.size underflow RDMA/i40iw: Fix potential use after free bcache: fix a lost wake-up problem caused by mca_cannibalize_lock * tracing: Adding NULL checks for trace_array descriptor pointer kernel/trace/trace.c kernel/trace/trace_events.c * mfd: mfd-core: Protect against NULL call-back function pointer drivers/mfd/mfd-core.c mtd: cfi_cmdset_0002: don't free cfi->cfiq in error path of cfi_amdstd_setup() clk/ti/adpll: allocate room for terminating null scsi: fnic: fix use after free PM / devfreq: tegra30: Fix integer overflow on CPU's freq max out ALSA: hda/realtek - Couldn't detect Mic if booting with headset plugged * ALSA: usb-audio: Add delay quirk for H570e USB headsets sound/usb/quirks.c x86/ioapic: Unbreak check_timer() arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback media: smiapp: Fix error handling at NVM reading ASoC: kirkwood: fix IRQ error handling gma/gma500: fix a memory disclosure bug due to uninitialized bytes m68k: q40: Fix info-leak in rtc_ioctl scsi: aacraid: fix illegal IO beyond last LBA * mm: fix double page fault on arm64 if PTE_AF is cleared mm/memory.c serial: 8250: Avoid error message on reprobe geneve: add transport ports in route lookup for geneve * ipv4: Update exception handling for multipath routes via same device net/ipv4/route.c * net: add __must_check to skb_put_padto() include/linux/skbuff.h * net: phy: Avoid NPD upon phy_detach() when driver is unbound drivers/net/phy/phy_device.c bnxt_en: Protect bnxt_set_eee() and bnxt_set_pauseparam() with mutex. tipc: use skb_unshare() instead in tipc_buf_append() tipc: fix shutdown() of connection oriented socket * net: ipv6: fix kconfig dependency warning for IPV6_SEG6_HMAC net/ipv6/Kconfig * ip: fix tos reflection in ack and reset packets net/ipv4/ip_output.c hdlc_ppp: add range checks in ppp_cp_parse_cr() RDMA/ucma: ucma_context reference leak in error path mm/thp: fix __split_huge_pmd_locked() for migration PMD kprobes: fix kill kprobe which has been marked as gone KVM: fix memory leak in kvm_io_bus_unregister_dev() phy: qcom-qmp: Use correct values for ipq8074 PCIe Gen2 PHY init * af_key: pfkey_dump needs parameter validation net/key/af_key.c Change-Id: I5bd9fd75e9245cf37257308ba579b61e8e48265c Signed-off-by: lucaswei <lucaswei@google.com>	2020-12-03 20:59:35 +08:00
Rasmus Villemoes	78afc1990a	scripts/setlocalversion: make git describe output more reliable ... commit 548b8b5168c90c42e88f70fcf041b4ce0b8e7aa8 upstream. When building for an embedded target using Yocto, we're sometimes observing that the version string that gets built into vmlinux (and thus what uname -a reports) differs from the path under /lib/modules/ where modules get installed in the rootfs, but only in the length of the -gabc123def suffix. Hence modprobe always fails. The problem is that Yocto has the concept of "sstate" (shared state), which allows different developers/buildbots/etc. to share build artifacts, based on a hash of all the metadata that went into building that artifact - and that metadata includes all dependencies (e.g. the compiler used etc.). That normally works quite well; usually a clean build (without using any sstate cache) done by one developer ends up being binary identical to a build done on another host. However, one thing that can cause two developers to end up with different builds [and thus make one's vmlinux package incompatible with the other's kernel-dev package], which is not captured by the metadata hashing, is this `git describe`: The output of that can be affected by (1) git version: before 2.11 git defaulted to a minimum of 7, since 2.11 (git.git commit e6c587) the default is dynamic based on the number of objects in the repo (2) hence even if both run the same git version, the output can differ based on how many remotes are being tracked (or just lots of local development branches or plain old garbage) (3) and of course somebody could have a core.abbrev config setting in ~/.gitconfig So in order to avoid `uname -a` output relying on such random details of the build environment which are rather hard to ensure are consistent between developers and buildbots, make sure the abbreviated sha1 always consists of exactly 12 hex characters. That is consistent with the current rule for -stable patches, and is almost always enough to identify the head commit unambigously - in the few cases where it does not, the v5.4.3-00021- prefix would certainly nail it down. [Adapt to `` vs $() differences between 5.4 and upstream.] Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2020-11-05 11:06:51 +01:00
lucaswei	678313afe1	Merge android-4.14 (4.14.155) into android-msm-floral-4.14-lts ... Merge 4.14.155 into android-4.14 Linux 4.14.155 slcan: Fix memory leak in error path * memfd: Use radix_tree_deref_slot_protected to avoid the warning. mm/shmem.c net: phy: mdio-bcm-unimac: mark PM functions as __maybe_unused IB/iser: Fix possible NULL deref at iser_inv_desc() * fuse: use READ_ONCE on congestion_threshold and max_background fs/fuse/control.c usb: xhci-mtk: fix ISOC error when interval is zero * netfilter: masquerade: don't flush all conntracks if only one address deleted on device net/ipv4/netfilter/nf_nat_masquerade_ipv4.c rtc: armada38x: fix possible race condition ARM: dts: lpc32xx: Fix SPI controller node names arm64: dts: lg: Fix SPI controller node names arm64: dts: amd: Fix SPI bus warnings scsi: NCR5380: Check for bus reset scsi: NCR5380: Handle BUS FREE during reselection scsi: NCR5380: Don't call dsprintk() following reselection interrupt scsi: NCR5380: Don't clear busy flag when abort fails scsi: NCR5380: Check for invalid reselection target scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data scsi: NCR5380: Withhold disconnect privilege for REQUEST SENSE scsi: NCR5380: Have NCR5380_select() return a bool scsi: NCR5380: Clear all unissued commands on host reset iwlwifi: mvm: Allow TKIP for AP mode iwlwifi: api: annotate compressed BA notif array sizes iwlwifi: dbg: don't crash if the firmware crashes in the middle of a debug dump * crypto: fix a memory leak in rsa-kcs1pad's encryption mode crypto/rsa-pkcs1pad.c crypto: s5p-sss: Fix Fix argument list alignment x86/hyperv: Suppress "PCI: Fatal: No config space access function found" * Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS net/bluetooth/l2cap_core.c Bluetooth: hci_serdev: clear HCI_UART_PROTO_READY to avoid closing proto races firmware: dell_rbu: Make payload memory uncachable ARM: dts: realview: Fix SPI controller node names * EDAC: Raise the maximum number of memory controllers include/linux/edac.h * f2fs: mark inode dirty explicitly in recover_inode() fs/f2fs/recovery.c * f2fs: fix to recover inode's project id during POR fs/f2fs/recovery.c net: faraday: fix return type of ndo_start_xmit function net: smsc: fix return type of ndo_start_xmit function ARM: dts: paz00: fix wakeup gpio keycode ARM: tegra: apalis_t30: fix mmc1 cmd pull-up ARM: dts: tegra30: fix xcvr-setup-use-fuses phy: lantiq: Fix compile warning scsi: libsas: always unregister the old device if going to discover new vfio/pci: Mask buggy SR-IOV VF INTx support vfio/pci: Fix potential memory leak in vfio_msi_cap_len misc: genwqe: should return proper error value. misc: kgdbts: Fix restrict error coresight: tmc: Fix byte-address alignment for RRP coresight: etm4x: Configure EL2 exception level when kernel is running in HYP coresight: perf: Disable trace path upon source error coresight: perf: Fix per cpu path management coresight: Fix handling of sinks usb: gadget: uvc: Only halt video streaming endpoint in bulk mode usb: gadget: uvc: Factor out video USB request queueing phy: phy-twl4030-usb: fix denied runtime access phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs * phy: brcm-sata: allow PHY_BRCM_SATA driver to be built for DSL SoCs drivers/phy/broadcom/Kconfig i2c: aspeed: fix invalid clock parameters for very large divisors usb: gadget: uvc: configfs: Prevent format changes after linking header usb: gadget: uvc: configfs: Drop leaked references to config items ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock media: davinci: Fix implicit enum conversion warning media: au0828: Fix incorrect error messages media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() arm64: dts: rockchip: Fix microSD in rk3399 sapphire board MIPS: kexec: Relax memory restriction x86/CPU: Change query logic so CPUID is enabled before testing x86/CPU: Use correct macros for Cyrix calls net: freescale: fix return type of ndo_start_xmit function net: micrel: fix return type of ndo_start_xmit function net: phy: mdio-bcm-unimac: Allow configuring MDIO clock divider samples/bpf: fix compilation failure bnx2x: Ignore bandwidth attention in single function mode ARM: dts: clearfog: fix sdhci supply property name x86/mce-inject: Reset injection struct after injection ARM: dts: marvell: Fix SPI and I2C bus warnings crypto: arm/crc32 - avoid warning when compiling with Clang * cpufeature: avoid warning when compiling with clang include/linux/cpufeature.h spi: pic32: Use proper enum in dmaengine_prep_slave_rg ARM: dts: ste: Fix SPI controller node names ARM: dts: ux500: Fix LCDA clock line muxing ARM: dts: ux500: Correct SCU unit address * f2fs: fix to recover inode's uid/gid during POR fs/f2fs/recovery.c ARM: dts: am335x-evm: fix number of cpsw mlxsw: spectrum: Init shaper for TCs 8..15 usb: chipidea: Fix otg event handler usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started nfp: provide a better warning when ring allocation fails net: hns3: Fix parameter type for q_id in hclge_tm_q_to_qs_map_cfg() net: hns3: Fix for setting speed for phy failed problem net: sun: fix return type of ndo_start_xmit function net: amd: fix return type of ndo_start_xmit function net: broadcom: fix return type of ndo_start_xmit function net: xilinx: fix return type of ndo_start_xmit function net: toshiba: fix return type of ndo_start_xmit function power: supply: twl4030_charger: disable eoc interrupt on linear charge power: supply: twl4030_charger: fix charging current out-of-bounds * libfdt: Ensure INT_MAX is defined in libfdt_env.h include/linux/libfdt_env.h * OPP: Protect dev_list with opp_table lock drivers/base/power/opp/core.c drivers/base/power/opp/cpu.c drivers/base/power/opp/opp.h RDMA/i40iw: Fix incorrect iterator type powerpc: Fix duplicate const clang warning in user access code powerpc/pseries: Disable CPU hotplug across migrations powerpc/64s/hash: Fix stab_rr off by one initialization powerpc/iommu: Avoid derefence before pointer check net: hns3: fix return type of ndo_start_xmit function ipmi:dmi: Ignore IPMI SMBIOS entries with a zero base address spi: mediatek: Don't modify spi_transfer when transfer. samples/bpf: fix a compilation failure serial: mxs-auart: Fix potential infinite loop serial: samsung: Enable baud clock for UART reset procedure in resume serial: uartps: Fix suspend functionality PCI/ACPI: Correct error message for ASPM disabling s390/qeth: invoke softirqs after napi_schedule() ath9k: Fix a locking bug in ath9k_add_interface() ACPI / LPSS: Exclude I2C busses shared with PUNIT from pmc_atom_d3_mask ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 * ip_gre: fix parsing gre header in ipgre_err net/ipv4/gre_demux.c * kernfs: Fix range checks in kernfs_get_target_path fs/kernfs/symlink.c * component: fix loop condition to call unbind() if bind() fails drivers/base/component.c power: supply: max8998-charger: Fix platform data retrieval power: reset: at91-poweroff: do not procede if at91_shdwc is allocated power: supply: ab8500_fg: silence uninitialized variable warnings arm64: dts: meson: Fix erroneous SPI bus warnings blok, bfq: do not plug I/O if all queues are weight-raised cxgb4: Fix endianness issue in t4_fwcache() pinctrl: at91: don't use the same irqchip with multiple gpiochips ARM: dts: socfpga: Fix I2C bus unit-address error powerpc/vdso: Correct call frame information soc: qcom: wcnss_ctrl: Avoid string overflow ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value * llc: avoid blocking in llc_sap_close() include/net/llc.h net/llc/llc_core.c pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() ALSA: intel8x0m: Register irq handler after register initializations arm64: dts: meson: libretech: update board model * media: dvb: fix compat ioctl translation fs/compat_ioctl.c media: fix: media: pci: meye: validate offset to avoid arbitrary access media: dt-bindings: adv748x: Fix decimal unit addresses * nvmem: core: return error code instead of NULL from nvmem_device_get drivers/nvmem/core.c Drivers: hv: vmbus: Fix synic per-cpu context initialization kprobes: Don't call BUG_ON() if there is a kprobe in use on free list scsi: pm80xx: Fixed system hang issue during kexec boot scsi: pm80xx: Corrected dma_unmap_sg() parameter ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() scsi: lpfc: Fix errors in log messages. scsi: qla2xxx: Fix dropped srb resource. scsi: qla2xxx: Defer chip reset until target mode is enabled scsi: qla2xxx: Fix iIDMA error * f2fs: fix memory leak of percpu counter in fill_super() fs/f2fs/super.c signal: Properly deliver SIGSEGV from x86 uprobes * signal: Properly deliver SIGILL from uprobes kernel/events/uprobes.c * signal: Always ignore SIGKILL and SIGSTOP sent to the global init kernel/signal.c IB/hfi1: Missing return value in error path for user sdma ath9k: add back support for using active monitor interfaces for tx99 rtc: pl030: fix possible race condition rtc: mt6397: fix possible race condition EDAC, sb_edac: Return early on ADDRV bit and address type test dmaengine: dma-jz4780: Further residue status fix * dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 drivers/dma/Kconfig arm64: dts: rockchip: Fix VCC5V0_HOST_EN on rk3399-sapphire * sched/debug: Use symbolic names for task state constants include/trace/events/sched.h ARM: dts: omap3-gta04: keep vpll2 always on ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot ARM: dts: omap3-gta04: fix touchscreen tsc2007 ARM: dts: omap3-gta04: tvout: enable as display1 alias ARM: dts: omap3-gta04: fixes for tvout / venc ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files * of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC drivers/of/base.c ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation mips: txx9: fix iounmap related issue RDMA/core: Follow correct unregister order between sysfs and cgroup RDMA/core: Rate limit MAD error messages IB/ipoib: Ensure that MTU isn't less than minimum permitted ath10k: wmi: disable softirq's while calling ieee80211_rx ARM: dts: exynos: Disable pull control for S5M8767 PMIC ASoC: sgtl5000: avoid division by zero if lo_vag is zero net: lan78xx: Bail out if lan78xx_get_endpoints fails ARM: dts: meson8b: fix the clock controller register size ARM: dts: meson8: fix the clock controller register size net: phy: mscc: read 'vsc8531, edge-slowdown' as an u32 net: phy: mscc: read 'vsc8531,vddmac' as an u32 ASoC: rsnd: ssi: Fix issue in dma data address assignment soc: imx: gpc: fix PDN delay rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument ARM: dts: pxa: fix power i2c base address ARM: dts: pxa: fix the rtc controller iwlwifi: mvm: avoid sending too many BARs iwlwifi: don't WARN on trying to dump dead firmware IB/rxe: fixes for rdma read retry i40e: Prevent deleting MAC address from VF when set by PF i40e: hold the rtnl lock on clearing interrupt scheme i40e: use correct length for strncpy ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks liquidio: fix race condition in instruction completion processing ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 pinctrl: ingenic: Probe driver at subsys_initcall * ASoC: dpcm: Properly initialise hw->rate_max sound/soc/soc-pcm.c gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated ath10k: limit available channels via DT ieee80211-freq-limit ath9k: fix tx99 with monitor mode interface ALSA: seq: Do error checks at creating system ports * cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set net/wireless/reg.c extcon: cht-wc: Return from default case to avoid warnings remoteproc/davinci: Use %zx for formating size_t rtc: rv8803: fix the rv8803 id in the OF table ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply ALSA: pcm: signedness bug in snd_pcm_plug_alloc() arm64: dts: allwinner: a64: NanoPi-A64: Fix DCDC1 voltage arm64: dts: allwinner: a64: Olinuxino: fix DRAM voltage iio: dac: mcp4922: fix error handling in mcp4922_write_raw ath10k: fix kernel panic by moving pci flush after napi_disable tee: optee: take DT status property into account iio: adc: max9611: explicitly cast gain_selectors mmc: sdhci-of-at91: fix quirk2 overwrite mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() * mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() mm/memcontrol.c iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros * ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either fs/ecryptfs/inode.c * ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable fs/ecryptfs/inode.c i2c: acpi: Force bus speed to 400KHz if a Silead touchscreen is present IB/hfi1: Ensure full Gen3 speed in a Gen4 system Input: synaptics-rmi4 - destroy F54 poller workqueue when removing Input: synaptics-rmi4 - clear IRQ enables for F54 Input: synaptics-rmi4 - do not consume more data than we have (F11, F12) Input: synaptics-rmi4 - disable the relative position IRQ in the F12 driver Input: synaptics-rmi4 - fix video buffer size * Input: ff-memless - kill timer in destroy() drivers/input/ff-memless.c * ALSA: usb-audio: not submit urb for stopped endpoint sound/usb/endpoint.c * ALSA: usb-audio: Fix missing error check at mixer resolution test sound/usb/mixer.c slip: Fix memory leak in slip_open error path net: usb: qmi_wwan: add support for Foxconn T77W968 LTE modules * ax88172a: fix information leak on short answers drivers/net/usb/ax88172a.c powerpc/perf: Fix kfree memory allocated for nest pmus powerpc/perf: Fix IMC_MAX_PMU macro Revert "Input: synaptics-rmi4 - avoid processing unknown IRQs" * scsi: core: Handle drivers which set sg_tablesize to zero drivers/scsi/scsi_lib.c MIPS: BCM63XX: fix switch core reset on BCM6368 KVM: x86: introduce is_pae_paging kvm: mmu: Don't read PDPTEs when paging is not enabled * ANDROID: uid_sys_stats: avoid double accounting of dying threads drivers/misc/uid_sys_stats.c Merge 4.14.154 into android-4.14 ANDROID: cuttlefish_defconfig: enable fs-verity BACKPORT:FROMGIT: coresight: replicator: Fix missing spin_lock_init() BACKPORT:FROMGIT: coresight: funnel: Fix missing spin_lock_init() BACKPORT:FROMGIT: coresight: Serialize enabling/disabling a link device. UPSTREAM: coresight: tmc-etr: Add barrier packets when moving offset forward UPSTREAM: coresight: tmc-etr: Decouple buffer sync and barrier packet insertion UPSTREAM: coresight: tmc: Make memory width mask computation into a function UPSTREAM: coresight: tmc-etr: Fix perf_data check UPSTREAM: coresight: tmc-etr: Fix updating buffer in not-snapshot mode. UPSTREAM: coresight: tmc-etr: Check if non-secure access is enabled UPSTREAM: coresight: tmc-etr: Handle memory errors BACKPORT: coresight: etr_buf: Consolidate refcount initialization UPSTREAM: coresight: Fix DEBUG_LOCKS_WARN_ON for uninitialized attribute UPSTREAM: coresight: Use coresight device names for sinks in PMU attribute UPSTREAM: coresight: tmc-etr: alloc_perf_buf: Do not call smp_processor_id from preemptible UPSTREAM: coresight: tmc-etr: Do not call smp_processor_id() from preemptible UPSTREAM: coresight: perf: Don't set the truncated flag in snapshot mode UPSTREAM: coresight: tmc-etf: Fix snapshot mode update function UPSTREAM: coresight: tmc-etr: Properly set AUX buffer head in snapshot mode UPSTREAM: coresight: funnel: Support static funnel UPSTREAM: coresight: tmc-etr: Add support for CPU-wide trace scenarios UPSTREAM: coresight: tmc-etr: Allocate and free ETR memory buffers for CPU-wide scenarios UPSTREAM: coresight: tmc-etr: Introduce the notion of IDR to ETR devices UPSTREAM: coresight: tmc-etr: Introduce the notion of reference counting to ETR devices UPSTREAM: coresight: tmc-etr: Introduce the notion of process ID to ETR devices UPSTREAM: coresight: tmc-etr: Create per-thread buffer allocation function UPSTREAM: coresight: tmc-etr: Refactor function tmc_etr_setup_perf_buf() * UPSTREAM: coresight: Communicate perf event to sink buffer allocation functions include/linux/coresight.h UPSTREAM: coresight: perf: Refactor function free_event_data() UPSTREAM: coresight: perf: Clean up function etm_setup_aux() UPSTREAM: coresight: Properly address concurrency in sink::update() functions UPSTREAM: coresight: Properly address errors in sink::disable() functions UPSTREAM: coresight: Move reference counting inside sink drivers * UPSTREAM: coresight: Adding return code to sink::disable() operation include/linux/coresight.h UPSTREAM: coresight: etm4x: Configure tracers to emit timestamps UPSTREAM: coresight: etm4x: Skip selector pair 0 * UPSTREAM: coresight: etm4x: Add kernel configuration for CONTEXTID drivers/hwtracing/coresight/Kconfig UPSTREAM: coresight: pmu: Adding ITRACE property to cs_etm PMU UPSTREAM: coresight: tmc: Cleanup power management UPSTREAM: coresight: Fix freeing up the coresight connections UPSTREAM: coresight: tmc: Report DMA setup failures UPSTREAM: coresight: catu: fix clang build warning * UPSTREAM: perf/core: Fix the address filtering fix kernel/events/core.c * UPSTREAM: perf, pt, coresight: Fix address filters for vmas with non-zero offset include/linux/perf_event.h kernel/events/core.c * BACKPORT: perf: Copy parent's address filter offsets on clone kernel/events/core.c UPSTREAM: coresight: Use event attributes for sink selection * UPSTREAM: coresight: perf: Add "sinks" group to PMU directory include/linux/coresight.h * BACKPORT: perf/aux: Make perf_event accessible to setup_aux() include/linux/perf_event.h kernel/events/ring_buffer.c UPSTREAM: coresight: etb10: Add support for CLAIM tag UPSTREAM: coreisght: tmc: Claim device before use UPSTREAM: coresight: dynamic-replicator: Claim device for use UPSTREAM: coresight: funnel: Claim devices before use UPSTREAM: coresight: etmx: Claim devices before use * UPSTREAM: coresight: Add support for CLAIM tag protocol include/linux/coresight.h UPSTREAM: coresight: dynamic-replicator: Handle multiple connections UPSTREAM: coresight: etb10: Handle errors enabling the device UPSTREAM: coresight: etm3: Add support for handling errors UPSTREAM: coresight: etm4x: Add support for handling errors UPSTREAM: coresight: tmc-etb/etf: Prepare to handle errors enabling UPSTREAM: coresight: tmc-etr: Handle errors enabling CATU UPSTREAM: coresight: tmc-etr: Refactor for handling errors UPSTREAM: coresight: Handle failures in enabling a trace path UPSTREAM: coresight: tmc: Fix byte-address alignment for RRP UPSTREAM: coresight: etm4x: Configure EL2 exception level when kernel is running in HYP UPSTREAM: coresight: etb10: Splitting function etb_enable() UPSTREAM: coresight: etb10: Refactor etb_drvdata::mode handling UPSTREAM: coresight: etm-perf: Add support for ETR backend * UPSTREAM: coresight: perf: Remove set_buffer call back include/linux/coresight.h UPSTREAM: coresight: perf: Add helper to retrieve sink configuration * UPSTREAM: coresight: perf: Remove reset_buffer call back for sinks include/linux/coresight.h UPSTREAM: coresight: Convert driver messages to dev_dbg UPSTREAM: coresight: tmc-etr: Relax collection of trace from sysfs mode UPSTREAM: coresight: tmc-etr: Handle driver mode specific ETR buffers UPSTREAM: coresight: perf: Disable trace path upon source error UPSTREAM: coresight: perf: Allow tracing on hotplugged CPUs UPSTREAM: coresight: perf: Avoid unncessary CPU hotplug read lock UPSTREAM: coresight: perf: Fix per cpu path management UPSTREAM: coresight: Fix handling of sinks UPSTREAM: coresight: Use ERR_CAST instead of ERR_PTR UPSTREAM: coresight: Fix remote endpoint parsing UPSTREAM: coresight: platform: Fix leaking device reference UPSTREAM: coresight: platform: Fix refcounting for graph nodes UPSTREAM: coresight: platform: Refactor graph endpoint parsing UPSTREAM: coresight: Document error handling in coresight_register UPSTREAM: coresight: catu: Plug in CATU as a backend for ETR buffer UPSTREAM: coresight: catu: Add support for scatter gather tables * UPSTREAM: coresight: Introduce support for Coresight Address Translation Unit drivers/hwtracing/coresight/Kconfig include/linux/coresight.h * UPSTREAM: coresight: Add helper device type include/linux/coresight.h * UPSTREAM: coresight: Cleanup device subtype struct include/linux/coresight.h UPSTREAM: coresight: Fix check in coresight_tmc_etr_buf_insert_barrier_packet UPSTREAM: coresight: include vmalloc.h for vmap/vunmap UPSTREAM: coresight: tmc: Add configuration support for trace buffer size UPSTREAM: coresight: tmc-etr buf: Add TMC scatter gather mode backend UPSTREAM: coresight: tmc-etr: Add transparent buffer management UPSTREAM: coresight: Add support for TMC ETR SG unit UPSTREAM: coresight: Add generic TMC sg table framework UPSTREAM: dts: bindings: Restrict coresight tmc-etr scatter-gather mode UPSTREAM: coresight: Add helper for inserting synchronization packets UPSTREAM: coresight: tmc-etr: Disallow perf mode UPSTREAM: coresight: tmc-etr: Do not clean trace buffer UPSTREAM: coresight: tmc: Hide trace buffer handling for file read UPSTREAM: coresight tmc etr: Fix uninitialised variable UPSTREAM: coresight tmc etr: Make memory check consistent in the same function UPSTREAM: coresight: use put_device() instead of kfree() * UPSTREAM: perf/core: Fix bad use of igrab() include/linux/perf_event.h kernel/events/core.c UPSTREAM: coresight: Use PTR_ERR_OR_ZERO() Linux 4.14.154 kvm: x86: mmu: Recovery of shattered NX large pages * kvm: Add helper function for creating VM worker threads include/linux/kvm_host.h kvm: mmu: ITLB_MULTIHIT mitigation KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active KVM: x86: add tracepoints around __direct_map and FNAME(fetch) KVM: x86: change kvm_mmu_page_get_gfn BUG_ON to WARN_ON KVM: x86: remove now unneeded hugepage gfn adjustment KVM: x86: make FNAME(fetch) and __direct_map more similar kvm: mmu: Do not release the page inside mmu_set_spte() * kvm: Convert kvm_lock to a mutex include/linux/kvm_host.h * kvm: x86, powerpc: do not allow clearing largepages debugfs entry include/linux/kvm_host.h Documentation: Add ITLB_MULTIHIT documentation * cpu/speculation: Uninline and export CPU mitigations helpers include/linux/cpu.h kernel/cpu.c x86/cpu: Add Tremont to the cpu vulnerability whitelist * x86/bugs: Add ITLB_MULTIHIT bug infrastructure drivers/base/cpu.c include/linux/cpu.h x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs x86/tsx: Add config options to set tsx=on|off|auto x86/speculation/taa: Add documentation for TSX Async Abort x86/tsx: Add "auto" option to the tsx= cmdline parameter kvm/x86: Export MDS_NO=0 to guests when TSX is enabled * x86/speculation/taa: Add sysfs reporting for TSX Async Abort drivers/base/cpu.c include/linux/cpu.h x86/speculation/taa: Add mitigation for TSX Async Abort x86/cpu: Add a "tsx=" cmdline option with TSX disabled by default x86/cpu: Add a helper function x86_read_arch_cap_msr() x86/msr: Add the IA32_TSX_CTRL MSR KVM: x86: use Intel speculation bugs and features as derived in generic x86 code drm/i915/cmdparser: Fix jump whitelist clearing drm/i915/gen8+: Add RC6 CTX corruption WA drm/i915: Lower RM timeout to avoid DSI hard hangs drm/i915/cmdparser: Ignore Length operands during command matching drm/i915/cmdparser: Add support for backward jumps drm/i915/cmdparser: Use explicit goto for error paths drm/i915: Add gen9 BCS cmdparsing drm/i915: Allow parsing of unsized batches drm/i915: Support ro ppgtt mapped cmdparser shadow buffers drm/i915: Add support for mandatory cmdparsing drm/i915: Remove Master tables from cmdparser drm/i915: Disable Secure Batches for gen6+ drm/i915: Rename gen7 cmdparser tables drm/i915: Move engine->needs_cmd_parser to engine->flags drm/i915: Don't use GPU relocations prior to cmdparser stalls drm/i915: Silence smatch for cmdparser drm/i915/cmdparser: Do not check past the cmd length. drm/i915/cmdparser: Check reg_table_count before derefencing. * drm/i915: Prevent writing into a read-only object via a GGTT mmap drivers/gpu/drm/drm_gem.c include/drm/drm_vma_manager.h drm/i915/gtt: Disable read-only support under GVT drm/i915/gtt: Read-only pages for insert_entries on bdw+ drm/i915/gtt: Add read only pages to gen8_pte_encode * net: prevent load/store tearing on sk->sk_stamp include/net/sock.h usbip: Fix free of unallocated memory in vhci tx * cgroup,writeback: don't switch wbs immediately on dead wbs if the memcg is dead fs/fs-writeback.c * mm/filemap.c: don't initiate writeback if mapping has no dirty pages mm/filemap.c can: flexcan: disable completely the ECC mechanism x86/apic/32: Avoid bogus LDR warnings x86/apic: Drop logical_smp_processor_id() inline x86/apic: Move pending interrupt check code into it's own function e1000: fix memory leaks igb: Fix constant media auto sense switching when no cable is connected net: ethernet: arc: add the missed clk_disable_unprepare NFSv4: Don't allow a cached open with a revoked delegation hv_netvsc: Fix error handling in netvsc_attach() net: hisilicon: Fix "Trying to free already-free IRQ" fjes: Handle workqueue allocation failure scsi: qla2xxx: stop timer in shutdown path RDMA/iw_cxgb4: Avoid freeing skb twice in arp failure case USB: ldusb: use unsigned size format specifiers * USB: Skip endpoints with 0 maxpacket length drivers/usb/core/config.c perf/x86/amd/ibs: Handle erratum #420 only on the affected CPU family (10h) perf/x86/amd/ibs: Fix reading of the IBS OpData register and thus precise RIP validity * usb: dwc3: remove the call trace of USBx_GFLADJ drivers/usb/dwc3/core.c * usb: gadget: configfs: fix concurrent issue between composite APIs drivers/usb/gadget/configfs.c * usb: gadget: composite: Fix possible double free memory bug drivers/usb/gadget/composite.c usb: gadget: udc: atmel: Fix interrupt storm in FIFO mode. usb: fsl: Check memory resource before releasing it macsec: fix refcnt leak in module exit routine * bonding: fix unexpected IFF_BONDING bit unset drivers/net/bonding/bond_main.c ipvs: move old_secure_tcp into struct netns_ipvs ipvs: don't ignore errors in case refcounting ip_vs module fails scsi: qla2xxx: Initialized mailbox to prevent driver load failure scsi: lpfc: Honor module parameter lpfc_use_adisc net: openvswitch: free vport unless register_netdevice() succeeds * RDMA/uverbs: Prevent potential underflow include/rdma/ib_verbs.h scsi: qla2xxx: fixup incorrect usage of host_byte net/mlx5: prevent memory leak in mlx5_fpga_conn_create_cq RDMA/qedr: Fix reported firmware version HID: intel-ish-hid: fix wrong error handling in ishtp_cl_alloc_tx_ring() dmaengine: xilinx_dma: Fix control reg update in vdma_channel_set_config PCI: tegra: Enable Relaxed Ordering only for Tegra20 & Tegra30 * usbip: Implement SG support to vhci-hcd and stub driver drivers/usb/usbip/Kconfig usbip: stub_rx: fix static checker warning on unnecessary checks usbip: Fix vhci_urb_enqueue() URB null transfer buffer error path * lib/scatterlist: Introduce sgl_alloc() and sgl_free() include/linux/scatterlist.h lib/Kconfig lib/scatterlist.c * sched/fair: Fix -Wunused-but-set-variable warnings kernel/sched/fair.c * sched/fair: Fix low cpu usage with high throttling by removing expiration of cpu-local slices kernel/sched/fair.c kernel/sched/sched.h ARM: dts: dra7: Disable USB metastability workaround for USB2 cpufreq: ti-cpufreq: add missing of_node_put() i2c: omap: Trigger bus recovery in lockup case ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()' ASoC: davinci: Kill BUG_ON() usage ASoC: davinci-mcasp: Handle return value of devm_kasprintf ASoC: tlv320dac31xx: mark expected switch fall-through * mailbox: reset txdone_method TXDONE_BY_POLL if client knows_txdone drivers/mailbox/mailbox.c misc: pci_endpoint_test: Fix BUG_ON error during pci_disable_msi() PCI: dra7xx: Add shutdown handler to cleanly turn off clocks misc: pci_endpoint_test: Prevent some integer overflows mtd: spi-nor: cadence-quadspi: add a delay in write sequence mtd: spi-nor: enable 4B opcodes for mx66l51235l ASoC: tlv320aic31xx: Handle inverted BCLK in non-DSP modes mfd: palmas: Assign the right powerhold mask for tps65917 * usb: dwc3: Allow disabling of metastability workaround drivers/usb/dwc3/core.c drivers/usb/dwc3/core.h drivers/usb/dwc3/gadget.c * configfs: fix a deadlock in configfs_symlink() fs/configfs/symlink.c * configfs: provide exclusion between IO and removals fs/configfs/dir.c fs/configfs/file.c * configfs: new object reprsenting tree fragments fs/configfs/configfs_internal.h fs/configfs/dir.c fs/configfs/file.c * configfs_register_group() shouldn't be (and isn't) called in rmdirable parts fs/configfs/dir.c * configfs: stash the data we need into configfs_buffer at open time fs/configfs/file.c * configfs: Fix bool initialization/comparison fs/configfs/file.c can: peak_usb: fix slab info leak can: mcba_usb: fix use-after-free on disconnect can: gs_usb: gs_can_open(): prevent memory leak can: rx-offload: can_rx_offload_queue_sorted(): fix error handling, avoid skb mem leak can: peak_usb: fix a potential out-of-sync while decoding packets can: c_can: c_can_poll(): only read status register after status IRQ can: usb_8dev: fix use-after-free on disconnect intel_th: pci: Add Jasper Lake PCH support intel_th: pci: Add Comet Lake PCH support netfilter: ipset: Fix an error code in ip_set_sockfn_get() netfilter: nf_tables: Align nft_expr private data to 64-bit iio: srf04: fix wrong limitation in distance measuring iio: imu: adis16480: make sure provided frequency is positive iio: adc: stm32-adc: fix stopping dma ceph: add missing check in d_revalidate snapdir handling ceph: fix use-after-free in __ceph_remove_cap() * arm64: Do not mask out PTE_RDONLY in pte_same() arch/arm64/include/asm/pgtable.h HID: wacom: generic: Treat serial number and related fields as unsigned drm/radeon: fix si_enable_smc_cac() failed issue perf tools: Fix time sorting tools: gpio: Use !building_out_of_srctree to determine srctree * dump_stack: avoid the livelock of the dump_lock lib/dump_stack.c * mm, vmstat: hide /proc/pagetypeinfo from normal users mm/vmstat.c * mm: thp: handle page cache THP correctly in PageTransCompoundMap include/linux/mm.h include/linux/mm_types.h include/linux/page-flags.h ALSA: hda/ca0132 - Fix possible workqueue stall ALSA: bebob: fix to detect configured source of sampling clock for Focusrite Saffire Pro i/o series * ALSA: timer: Fix incorrectly assigned timer instance sound/core/timer.c qede: fix NULL pointer deref in __qede_remove() NFC: st21nfca: fix double free nfc: netlink: fix double device reference drop NFC: fdp: fix incorrect free object net: usb: qmi_wwan: add support for DW5821e with eSIM support * net: qualcomm: rmnet: Fix potential UAF when unregistering drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c * net: fix data-race in neigh_event_send() include/net/neighbour.h net: ethernet: octeon_mgmt: Account for second possible VLAN header * ipv4: Fix table id reference in fib_sync_down_addr net/ipv4/fib_semantics.c * CDC-NCM: handle incomplete transfer of MTU drivers/net/usb/cdc_ncm.c * bonding: fix state transition issue in link monitoring drivers/net/bonding/bond_main.c include/net/bonding.h * ANDROID: nf: IDLETIMER: Fix possible use before initialization in idletimer_resume net/netfilter/xt_IDLETIMER.c Merge 4.14.153 into android-4.14 Linux 4.14.153 selftests/powerpc: Fix compile error on tlbie_test due to newer gcc selftests/powerpc: Add test case for tlbie vs mtpidr ordering issue powerpc/mm: Fixup tlbie vs mtpidr/mtlpidr ordering issue on POWER9 powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag powerpc/book3s64/mm: Don't do tlbie fixup for some hardware revisions powerpc/mm: Fixup tlbie vs store ordering issue on POWER9 iio: adc: stm32-adc: fix a race when using several adcs with dma and irq iio: adc: stm32-adc: move registers definitions platform/x86: pmc_atom: Add Siemens SIMATIC IPC227E to critclk_systems DMI table * kbuild: add -fcf-protection=none when using retpoline flags Makefile * kbuild: use -fmacro-prefix-map to make __FILE__ a relative path Makefile * sched/wake_q: Fix wakeup ordering for wake_q kernel/sched/core.c dmaengine: qcom: bam_dma: Fix resource leak * net/flow_dissector: switch to siphash include/linux/skbuff.h include/net/flow_dissector.h net/core/flow_dissector.c * inet: stop leaking jiffies on the wire net/ipv4/datagram.c net/ipv4/tcp_ipv4.c erspan: fix the tun_info options_len check for erspan vxlan: check tun_info options_len properly * net: use skb_queue_empty_lockless() in busy poll contexts net/core/datagram.c net/core/sock.c net/ipv4/tcp.c * net: use skb_queue_empty_lockless() in poll() handlers net/bluetooth/af_bluetooth.c net/core/datagram.c net/ipv4/tcp.c net/ipv4/udp.c net/unix/af_unix.c * udp: use skb_queue_empty_lockless() net/ipv4/udp.c * net: add skb_queue_empty_lockless() include/linux/skbuff.h net: bcmgenet: reset 40nm EPHY on energy detect net: dsa: fix switch tree list * r8152: add device id for Lenovo ThinkPad USB-C Dock Gen 2 drivers/net/usb/cdc_ether.c drivers/net/usb/r8152.c net: usb: lan78xx: Connect PHY before registering MAC net: dsa: b53: Do not clear existing mirrored port mask net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget * net: add READ_ONCE() annotation in __skb_wait_for_more_packets() net/core/datagram.c * udp: fix data-race in udp_set_dev_scratch() net/ipv4/udp.c selftests: net: reuseport_dualstack: fix uninitalized parameter * net: Zeroing the structure ethtool_wolinfo in ethtool_get_wol() net/core/ethtool.c net/mlx4_core: Dynamically set guaranteed amount of counters per VF net: hisilicon: Fix ping latency when deal with high throughput * net: fix sk_page_frag() recursion from memory reclaim include/linux/gfp.h include/net/sock.h net: ethernet: ftgmac100: Fix DMA coherency issue with SW checksum net: dsa: bcm_sf2: Fix IMP setup for port different than 8 * net: annotate lockless accesses to sk->sk_napi_id include/net/busy_poll.h * net: annotate accesses to sk->sk_incoming_cpu include/net/sock.h net/core/sock.c net/ipv4/inet_hashtables.c net/ipv4/udp.c net/ipv6/inet6_hashtables.c net/ipv6/udp.c dccp: do not leak jiffies on the wire cxgb4: fix panic when attaching to ULD fail nbd: handle racing with error'ed out commands cifs: Fix cifsInodeInfo lock_sem deadlock when reconnect occurs i2c: stm32f7: remove warning when compiling with W=1 MIPS: bmips: mark exception vectors as char arrays of: unittest: fix memory leak in unittest_data_add ARM: 8926/1: v7m: remove register save to stack before svc scsi: target: core: Do not overwrite CDB byte 1 ARM: davinci: dm365: Fix McBSP dma_slave_map entry perf kmem: Fix memory leak in compact_gfp_flags() perf c2c: Fix memory leak in build_cl_output() ARM: dts: imx7s: Correct GPT's ipg clock source * scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE drivers/scsi/Kconfig scsi: sni_53c710: fix compilation error scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions ARM: mm: fix alignment handler faults under memory pressure pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable() ARM: dts: logicpd-torpedo-som: Remove twl_keypad ASoc: rockchip: i2s: Fix RPM imbalance ASoC: wm_adsp: Don't generate kcontrols without READ flags regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone arm64: dts: Fix gpio to pinmux mapping UPSTREAM: HID: steam: fix deadlock with input devices. UPSTREAM: HID: steam: fix boot loop with bluetooth firmware UPSTREAM: HID: steam: remove input device when a hid client is running. UPSTREAM: HID: steam: use hid_device.driver_data instead of hid_set_drvdata() UPSTREAM: HID: steam: add missing fields in client initialization UPSTREAM: HID: steam: add battery device. * UPSTREAM: HID: add driver for Valve Steam Controller drivers/hid/Kconfig drivers/hid/Makefile drivers/hid/hid-core.c drivers/hid/hid-ids.h include/linux/hid.h * ANDROID: overlayfs: fix printk format fs/overlayfs/inode.c fs/overlayfs/namei.c * BACKPORT: ANDROID: overlayfs: internal getxattr operations without sepolicy checking fs/overlayfs/inode.c fs/overlayfs/namei.c fs/overlayfs/overlayfs.h fs/overlayfs/util.c * ANDROID: overlayfs: add __get xattr method fs/overlayfs/inode.c fs/overlayfs/overlayfs.h fs/overlayfs/super.c * ANDROID: Add optional __get xattr method paired to __vfs_getxattr fs/xattr.c include/linux/xattr.h * ANDROID: regression introduced override_creds=off fs/overlayfs/dir.c Merge 4.14.152 into android-4.14 Linux 4.14.152 Revert "ALSA: hda: Flush interrupts on disabling" * ALSA: timer: Fix mutex deadlock at releasing card sound/core/timer.c * ALSA: timer: Simplify error path in snd_timer_open() sound/core/timer.c xfs: Correctly invert xfs_buftarg LRU isolation logic sctp: not bind the socket in sctp_connect * sctp: fix the issue that flags are ignored when using kernel_connect include/net/sctp/sctp.h * sch_netem: fix rcu splat in netem_enqueue() include/net/sch_generic.h net/sched/sch_netem.c net: usb: sr9800: fix uninitialized local variable * bonding: fix potential NULL deref in bond_update_slave_arr drivers/net/bonding/bond_main.c NFC: pn533: fix use-after-free and memleaks rxrpc: Fix call ref leak llc: fix sk_buff leak in llc_conn_service() llc: fix sk_buff leak in llc_sap_state_process() dmaengine: cppi41: Fix cppi41_dma_prep_slave_sg() when idle rtlwifi: Fix potential overflow on P2P code * arm64: Ensure VM_WRITE|VM_SHARED ptes are clean by default arch/arm64/include/asm/pgtable-prot.h s390/idle: fix cpu idle time calculation s390/cmm: fix information leak in cmm_timeout_handler() * nl80211: fix validation of mesh path nexthop net/wireless/nl80211.c * HID: fix error message in hid_open_report() drivers/hid/hid-core.c * HID: Fix assumption that devices have inputs drivers/hid/hid-dr.c drivers/hid/hid-gaff.c drivers/hid/hid-sony.c HID: i2c-hid: add Trekstor Primebook C11B to descriptor override scsi: target: cxgbit: Fix cxgbit_fw4_ack() USB: serial: whiteheat: fix line-speed endianness USB: serial: whiteheat: fix potential slab corruption USB: ldusb: fix control-message timeout USB: ldusb: fix ring-buffer locking * usb-storage: Revert commit 747668dbc061 ("usb-storage: Set virt_boundary_mask to avoid SG overflows") drivers/usb/storage/scsiglue.c * USB: gadget: Reject endpoints with 0 maxpacket value drivers/usb/gadget/udc/core.c UAS: Revert commit 3ae62a42090f ("UAS: fix alignment of scatter/gather segments") ALSA: hda/realtek - Add support for ALC623 ALSA: hda/realtek - Fix 2 front mics of codec 0x623 ALSA: bebob: Fix prototype of helper function to return negative value * fuse: truncate pending writes on O_TRUNC fs/fuse/file.c * fuse: flush dirty data/metadata before non-truncate setattr fs/fuse/dir.c ath6kl: fix a NULL-ptr-deref bug in ath6kl_usb_alloc_urb_from_pipe() thunderbolt: Use 32-bit writes when writing ring producer/consumer * net_sched: check cops->tcf_block in tc_bind_tclass() net/sched/sch_api.c USB: legousbtower: fix a signedness bug in tower_probe() nbd: verify socket is supported during setup * tracing: Initialize iter->seq after zeroing in tracing_read_pipe() kernel/trace/trace.c s390/uaccess: avoid (false positive) compiler warnings NFSv4: Fix leak of clp->cl_acceptor string nbd: fix possible sysfs duplicate warning MIPS: fw: sni: Fix out of bounds init of o32 stack MIPS: include: Mark __xchg as __always_inline perf/x86/amd: Change/fix NMI latency mitigation to use a timestamp * sched/vtime: Fix guest/system mis-accounting on task switch kernel/sched/cputime.c fs: ocfs2: fix a possible null-pointer dereference in ocfs2_info_scan_inode_alloc() fs: ocfs2: fix a possible null-pointer dereference in ocfs2_write_end_nolock() fs: ocfs2: fix possible null-pointer dereferences in ocfs2_xa_prepare_entry() ocfs2: clear zero in unaligned direct IO x86/xen: Return from panic notifier MIPS: include: Mark __cmpxchg as __always_inline efi/x86: Do not clean dummy variable in kexec path efi/cper: Fix endianness of PCIe class code serial: mctrl_gpio: Check for NULL pointer fs: cifs: mute -Wunused-const-variable message gpio: max77620: Use correct unit for debounce times tty: n_hdlc: fix build on SPARC tty: serial: owl: Fix the link time qualifier of 'owl_uart_exit()' arm64: ftrace: Ensure synchronisation in PLT setup for Neoverse-N1 #1542419 nfs: Fix nfsi->nrequests count error on nfs_inode_remove_request HID: hyperv: Use in-place iterator API in the channel callback RDMA/iwcm: Fix a lock inversion issue RDMA/hfi1: Prevent memory leak in sdma_init staging: rtl8188eu: fix null dereference when kzalloc fails perf jevents: Fix period for Intel fixed counters perf map: Fix overlapped map handling perf tests: Avoid raising SEGV using an obvious NULL dereference libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature iio: fix center temperature of bmc150-accel-core iio: adc: meson_saradc: Fix memory allocation order power: supply: max14656: fix potential use-after-free PCI/PME: Fix possible use-after-free on remove * exec: load_script: Do not exec truncated interpreter path fs/binfmt_script.c media: vimc: Remove unused but set variables ALSA: hda/realtek - Apply ALC294 hp init also for S4 resume mlxsw: spectrum: Set LAG port collector only when active rtc: pcf8523: set xtal load capacitance from DT * usb: handle warm-reset port requests on hub resume drivers/usb/core/hub.c * HID: Add ASUS T100CHI keyboard dock battery quirks drivers/hid/hid-input.c * scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks scripts/setlocalversion clk: boston: unregister clks on failure in clk_boston_setup() HID: i2c-hid: Add Odys Winbook 13 to descriptor override x86/cpu: Add Atom Tremont (Jacobsville) HID: i2c-hid: add Direkt-Tek DTLAPY133-1 to descriptor override powerpc/powernv: hold device_hotplug_lock when calling memtrace_offline_pages() sc16is7xx: Fix for "Unexpected interrupt: 8" scsi: lpfc: Fix a duplicate 0711 log message number. * f2fs: flush quota blocks after turnning it off fs/f2fs/super.c * dm: Use kzalloc for all structs with embedded biosets/mempools drivers/md/dm-io.c drivers/md/dm-kcopyd.c drivers/md/dm-snap.c * dm snapshot: rework COW throttling to fix deadlock drivers/md/dm-snap.c * dm snapshot: introduce account_start_copy() and account_end_copy() drivers/md/dm-snap.c * dm snapshot: use mutex instead of rw_semaphore drivers/md/dm-snap.c * zram: fix race between backing_dev_show and backing_dev_store drivers/block/zram/zram_drv.c * ANDROID: don't enable TOOLS_SUPPORT_RELR in all{mod,yes}config init/Kconfig * BACKPORT: dm bufio: introduce a global cache replacement drivers/md/dm-bufio.c * BACKPORT: dm bufio: remove old-style buffer cleanup drivers/md/dm-bufio.c * BACKPORT: dm bufio: introduce a global queue drivers/md/dm-bufio.c * BACKPORT: dm bufio: refactor adjust_total_allocated drivers/md/dm-bufio.c * BACKPORT: dm bufio: call adjust_total_allocated from __link_buffer and __unlink_buffer drivers/md/dm-bufio.c Merge 4.14.151 into android-4.14 Linux 4.14.151 RDMA/cxgb4: Do not dma memory off of the stack kvm: vmx: Basic APIC virtualization controls have three settings kvm: apic: Flush TLB after APIC mode/address change if VPIDs are in use kvm: vmx: Introduce lapic_mode enumeration KVM: X86: introduce invalidate_gpa argument to tlb flush * PCI: PM: Fix pci_power_up() drivers/pci/pci.c xen/netback: fix error path of xenvif_connect_data() * cpufreq: Avoid cpufreq_suspend() deadlock on system shutdown drivers/base/core.c drivers/cpufreq/cpufreq.c memstick: jmb38x_ms: Fix an error handling path in 'jmb38x_ms_probe()' btrfs: block-group: Fix a memory leak due to missing btrfs_put_block_group() pinctrl: armada-37xx: swap polarity on LED group pinctrl: armada-37xx: fix control of pins 32 and up x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area CIFS: avoid using MID 0xFFFF parisc: Fix vmap memory leak in ioremap()/iounmap() xtensa: drop EXPORT_SYMBOL for outs*/ins* hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic() mm/page_owner: don't access uninitialized memmaps when reading /proc/pagetypeinfo * mm/slub: fix a deadlock in show_slab_objects() mm/slub.c scsi: zfcp: fix reaction on bit error threshold notification * fs/proc/page.c: don't access uninitialized memmaps in fs/proc/page.c fs/proc/page.c drivers/base/memory.c: don't access uninitialized memmaps in soft_offline_page_store() drm/amdgpu: Bail earlier when amdgpu.cik_/si_support is not set to 1 * drm/edid: Add 6 bpc quirk for SDC panel in Lenovo G50 drivers/gpu/drm/drm_edid.c mac80211: Reject malformed SSID elements cfg80211: wext: avoid copying malformed SSIDs ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting Input: synaptics-rmi4 - avoid processing unknown IRQs Input: da9063 - fix capability and drop KEY_SLEEP scsi: ch: Make it possible to open a ch device multiple times again * scsi: core: try to get module before removing device drivers/scsi/scsi_sysfs.c * scsi: core: save/restore command resid for error handling drivers/scsi/scsi_error.c include/scsi/scsi_eh.h * scsi: sd: Ignore a failure to sync cache due to lack of authorization drivers/scsi/sd.c staging: wlan-ng: fix exit return when sme->key_idx >= NUM_WEPKEYS MIPS: tlbex: Fix build_restore_pagemask KScratch restore * arm64/speculation: Support 'mitigations=' cmdline option arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c * arm64: Use firmware to detect CPUs that are not affected by Spectre-v2 arch/arm64/kernel/cpu_errata.c * arm64: Force SSBS on context switch arch/arm64/include/asm/processor.h arch/arm64/kernel/process.c * arm64: ssbs: Don't treat CPUs with SSBS as unaffected by SSB arch/arm64/kernel/cpu_errata.c * arm64: add sysfs vulnerability show for speculative store bypass arch/arm64/kernel/cpu_errata.c * arm64: add sysfs vulnerability show for spectre-v2 arch/arm64/kernel/cpu_errata.c * arm64: Always enable spectre-v2 vulnerability detection arch/arm64/kernel/cpu_errata.c * arm64: Advertise mitigation of Spectre-v2, or lack thereof arch/arm64/kernel/cpu_errata.c * arm64: Provide a command line to disable spectre_v2 mitigation arch/arm64/kernel/cpu_errata.c * arm64: Always enable ssb vulnerability detection arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c * arm64: enable generic CPU vulnerabilites support arch/arm64/Kconfig * arm64: add sysfs vulnerability show for meltdown arch/arm64/kernel/cpufeature.c * arm64: Add sysfs vulnerability show for spectre-v1 arch/arm64/kernel/cpu_errata.c * arm64: fix SSBS sanitization arch/arm64/kernel/ptrace.c * KVM: arm64: Set SCTLR_EL2.DSSBS if SSBD is forcefully disabled and !vhe arch/arm64/include/asm/kvm_host.h * arm64: ssbd: Add support for PSTATE.SSBS rather than trapping to EL3 arch/arm64/include/asm/processor.h arch/arm64/include/asm/ptrace.h arch/arm64/include/asm/sysreg.h arch/arm64/include/uapi/asm/ptrace.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c arch/arm64/kernel/process.c * arm64: cpufeature: Detect SSBS and advertise to userspace arch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/sysreg.h arch/arm64/include/uapi/asm/hwcap.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpuinfo.c * arm64: Get rid of __smccc_workaround_1_hvc_* arch/arm64/kernel/cpu_errata.c * arm64: don't zero DIT on signal return arch/arm64/kernel/ptrace.c * arm64: KVM: Use SMCCC_ARCH_WORKAROUND_1 for Falkor BP hardening arch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/kvm_asm.h arch/arm64/kernel/cpu_errata.c * arm64: capabilities: Add support for checks based on a list of MIDRs arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/cputype.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c * arm64: Add MIDR encoding for Arm Cortex-A55 and Cortex-A35 arch/arm64/include/asm/cputype.h * arm64: Add helpers for checking CPU MIDR against a range arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/cputype.h arch/arm64/kernel/cpu_errata.c * arm64: capabilities: Clean up midr range helpers arch/arm64/kernel/cpu_errata.c * arm64: capabilities: Change scope of VHE to Boot CPU feature arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/virt.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/smp.c * arm64: capabilities: Add support for features enabled early arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c * arm64: capabilities: Restrict KPTI detection to boot-time CPUs arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c * arm64: capabilities: Introduce weak features based on local CPU arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c * arm64: capabilities: Group handling of features and errata workarounds arch/arm64/kernel/cpufeature.c * arm64: capabilities: Allow features based on local CPU scope arch/arm64/kernel/cpufeature.c * arm64: capabilities: Split the processing of errata work arounds arch/arm64/kernel/cpufeature.c * arm64: capabilities: Prepare for grouping features and errata work arounds arch/arm64/kernel/cpufeature.c * arm64: capabilities: Filter the entries based on a given mask arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpufeature.c * arm64: capabilities: Unify the verification arch/arm64/kernel/cpufeature.c * arm64: capabilities: Add flags to handle the conflicts on late CPU arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c * arm64: capabilities: Prepare for fine grained capabilities arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c * arm64: capabilities: Move errata processing code arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c * arm64: capabilities: Move errata work around check on boot CPU arch/arm64/kernel/cpufeature.c arch/arm64/kernel/smp.c * arm64: capabilities: Update prototype for enable call back arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/processor.h arch/arm64/kernel/cpu_errata.c arch/arm64/kernel/cpufeature.c arch/arm64/kernel/fpsimd.c arch/arm64/kernel/traps.c arch/arm64/mm/fault.c * arm64: Introduce sysreg_clear_set() arch/arm64/include/asm/sysreg.h * arm64: add PSR_AA32_* definitions arch/arm64/include/asm/ptrace.h * arm64: move SCTLR_EL{1,2} assertions to <asm/sysreg.h> arch/arm64/include/asm/sysreg.h * arm64: Expose Arm v8.4 features arch/arm64/include/asm/sysreg.h arch/arm64/include/uapi/asm/hwcap.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpuinfo.c arm64: Documentation: cpu-feature-registers: Remove RES0 fields * arm64: v8.4: Support for new floating point multiplication instructions arch/arm64/include/asm/sysreg.h arch/arm64/include/uapi/asm/hwcap.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpuinfo.c * arm64: Fix the feature type for ID register fields arch/arm64/kernel/cpufeature.c * arm64: Expose support for optional ARMv8-A features arch/arm64/include/asm/sysreg.h arch/arm64/include/uapi/asm/hwcap.h arch/arm64/kernel/cpufeature.c arch/arm64/kernel/cpuinfo.c * arm64: sysreg: Move to use definitions for all the SCTLR bits arch/arm64/include/asm/sysreg.h arch/arm64/kernel/head.S arch/arm64/mm/proc.S USB: ldusb: fix read info leaks USB: usblp: fix use-after-free on disconnect USB: ldusb: fix memleak on disconnect USB: serial: ti_usb_3410_5052: fix port-close races usb: udc: lpc32xx: fix bad bit shift operation ALSA: hda/realtek - Add support for ALC711 USB: legousbtower: fix memleak on disconnect * memfd: Fix locking when tagging pins mm/shmem.c * loop: Add LOOP_SET_DIRECT_IO to compat ioctl drivers/block/loop.c * net: avoid potential infinite loop in tc_ctl_action() net/sched/act_api.c sctp: change sctp_prot .no_autobind with true net: stmmac: disable/enable ptp_ref_clk in suspend/resume flow net: i82596: fix dma_alloc_attr for sni_82596 net: bcmgenet: Set phydev->dev_flags only for internal PHYs net: bcmgenet: Fix RGMII_MODE_EN value for GENET v1/2/3 * ipv4: Return -ENETUNREACH if we can't create route but saddr is valid net/ipv4/route.c ocfs2: fix panic due to ocfs2_wq is null Revert "drm/radeon: Fix EEH during kexec" md/raid0: fix warning message for parameter default_layout namespace: fix namespace.pl script to support relative paths * r8152: Set macpassthru in reset_resume callback drivers/net/usb/r8152.c net: hisilicon: Fix usage of uninitialized variable in function mdio_sc_cfg_reg_write() mips: Loongson: Fix the link time qualifier of 'serial_exit()' mac80211: fix txq null pointer dereference * nl80211: fix null pointer dereference net/wireless/nl80211.c xen/efi: Set nonblocking callbacks MIPS: dts: ar9331: fix interrupt-controller size net: dsa: qca8k: Use up to 7 ports for all operations ARM: dts: am4372: Set memory bandwidth limit for DISPC ieee802154: ca8210: prevent memory leak ARM: OMAP2+: Fix missing reset done flag for am3 and am43 scsi: qla2xxx: Fix unbound sleep in fcport delete path. scsi: megaraid: disable device when probe failed after enabled device * scsi: ufs: skip shutdown if hba is not powered drivers/scsi/ufs/ufshcd.c ANDROID: virtio: virtio_input: Set the amount of multitouch slots in virtio input ANDROID: dummy_cpufreq: Implement get() rtlwifi: Fix potential overflow on P2P code * ANDROID: cpufreq: create dummy cpufreq driver drivers/cpufreq/Kconfig drivers/cpufreq/Makefile * ANDROID: Allow DRM_IOCTL_MODE_*_DUMB for render clients. drivers/gpu/drm/drm_ioctl.c * ANDROID: sdcardfs: evict dentries on fscrypt key removal fs/sdcardfs/main.c fs/sdcardfs/sdcardfs.h fs/sdcardfs/super.c * ANDROID: fscrypt: add key removal notifier chain fs/crypto/keyring.c include/linux/fscrypt.h ANDROID: Move from clang r353983c to r365631c * ANDROID: move up spin_unlock_bh() ahead of remove_proc_entry() net/netfilter/xt_quota2.c * BACKPORT: arm64: tags: Preserve tags for addresses translated via TTBR1 arch/arm64/include/asm/asm-uaccess.h arch/arm64/include/asm/memory.h arch/arm64/kernel/entry.S * UPSTREAM: arm64: memory: Implement __tag_set() as common function arch/arm64/include/asm/memory.h * UPSTREAM: arm64/mm: fix variable 'tag' set but not used arch/arm64/include/asm/memory.h * UPSTREAM: arm64: avoid clang warning about self-assignment arch/arm64/include/asm/memory.h ANDROID: refactor build.config files to remove duplication Change-Id: I00fe683a3bdc712d617c8836e8fe02165e8be668 Signed-off-by: lucaswei <lucaswei@google.com>	2019-12-17 13:23:58 +08:00
Brian Norris	37ce64502d	scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks ... [ Upstream commit ff64dd4857303dd5550faed9fd598ac90f0f2238 ] git-diff-index does not refresh the index for you, so using it for a "-dirty" check can give misleading results. Commit 6147b1cf19651 ("scripts/setlocalversion: git: Make -dirty check more robust") tried to fix this by switching to git-status, but it overlooked the fact that git-status also writes to the .git directory of the source tree, which is definitely not kosher for an out-of-tree (O=) build. That is getting reverted. Fortunately, git-status now supports avoiding writing to the index via the --no-optional-locks flag, as of git 2.14. It still calculates an up-to-date index, but it avoids writing it out to the .git directory. So, let's retry the solution from commit 6147b1cf19651 using this new flag first, and if it fails, we assume this is an older version of git and just use the old git-diff-index method. It's hairy to get the 'grep -vq' (inverted matching) correct by stashing the output of git-status (you have to be careful about the difference betwen "empty stdin" and "blank line on stdin"), so just pipe the output directly to grep and use a regex that's good enough for both the git-status and git-diff-index version. Cc: Christian Kujau <lists@nerdbynature.de> Cc: Guenter Roeck <linux@roeck-us.net> Suggested-by: Alexander Kapshuk <alexander.kapshuk@gmail.com> Signed-off-by: Brian Norris <briannorris@chromium.org> Tested-by: Genki Sky <sky@genki.is> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Sasha Levin <sashal@kernel.org>	2019-11-06 12:42:55 +01:00
Alexey Polyudov	af9927cee7	scripts: sort .git projects alphabetically ... Change-Id: I2ee501ea3bc15b9097eef9a0151e1bf80d593630 Signed-off-by: Alexey Polyudov <apolyudov@google.com> (cherry picked from commit f7c53514efb4095dcac39b2701ee94a7ac46504b)	2018-09-01 15:09:47 -07:00
Alexey Polyudov	11a2932607	scripts: collect version info from all git projects in the tree ... Change-Id: I557359de0ca66114442a296d637489f5ae059927 Signed-off-by: Alexey Polyudov <apolyudov@google.com> (cherry picked from commit e21b987469d735248efbcfc3afc44932471d8d90)	2018-09-01 15:09:46 -07:00
Greg Kroah-Hartman	b24413180f	License cleanup: add SPDX GPL-2.0 license identifier to files with no license ... Many source files in the tree are missing licensing information, which makes it harder for compliance tools to determine the correct license. By default all files without license information are under the default license of the kernel, which is GPL version 2. Update the files which contain no license information with the 'GPL-2.0' SPDX license identifier. The SPDX identifier is a legally binding shorthand, which can be used instead of the full boiler plate text. This patch is based on work done by Thomas Gleixner and Kate Stewart and Philippe Ombredanne. How this work was done: Patches were generated and checked against linux-4.14-rc6 for a subset of the use cases: - file had no licensing information it it. - file was a */uapi/* one with no licensing information in it, - file was a */uapi/* one with existing licensing information, Further patches will be generated in subsequent months to fix up cases where non-standard license headers were used, and references to license had to be inferred by heuristics based on keywords. The analysis to determine which SPDX License Identifier to be applied to a file was done in a spreadsheet of side by side results from of the output of two independent scanners (ScanCode & Windriver) producing SPDX tag:value files created by Philippe Ombredanne. Philippe prepared the base worksheet, and did an initial spot review of a few 1000 files. The 4.13 kernel was the starting point of the analysis with 60,537 files assessed. Kate Stewart did a file by file comparison of the scanner results in the spreadsheet to determine which SPDX license identifier(s) to be applied to the file. She confirmed any determination that was not immediately clear with lawyers working with the Linux Foundation. Criteria used to select files for SPDX license identifier tagging was: - Files considered eligible had to be source code files. - Make and config files were included as candidates if they contained >5 lines of source - File already had some variant of a license header in it (even if <5 lines). All documentation files were explicitly excluded. The following heuristics were used to determine which SPDX license identifiers to apply. - when both scanners couldn't find any license traces, file was considered to have no license information in it, and the top level COPYING file license applied. For non */uapi/* files that summary was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 11139 and resulted in the first patch in this series. If that file was a */uapi/* path one, it was "GPL-2.0 WITH Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was: SPDX license identifier # files ---------------------------------------------------|------- GPL-2.0 WITH Linux-syscall-note 930 and resulted in the second patch in this series. - if a file had some form of licensing information in it, and was one of the */uapi/* ones, it was denoted with the Linux-syscall-note if any GPL family license was found in the file or had no licensing in it (per prior point). Results summary: SPDX license identifier # files ---------------------------------------------------|------ GPL-2.0 WITH Linux-syscall-note 270 GPL-2.0+ WITH Linux-syscall-note 169 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21 ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17 LGPL-2.1+ WITH Linux-syscall-note 15 GPL-1.0+ WITH Linux-syscall-note 14 ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5 LGPL-2.0+ WITH Linux-syscall-note 4 LGPL-2.1 WITH Linux-syscall-note 3 ((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3 ((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1 and that resulted in the third patch in this series. - when the two scanners agreed on the detected license(s), that became the concluded license(s). - when there was disagreement between the two scanners (one detected a license but the other didn't, or they both detected different licenses) a manual inspection of the file occurred. - In most cases a manual inspection of the information in the file resulted in a clear resolution of the license that should apply (and which scanner probably needed to revisit its heuristics). - When it was not immediately clear, the license identifier was confirmed with lawyers working with the Linux Foundation. - If there was any question as to the appropriate license identifier, the file was flagged for further research and to be revisited later in time. In total, over 70 hours of logged manual review was done on the spreadsheet to determine the SPDX license identifiers to apply to the source files by Kate, Philippe, Thomas and, in some cases, confirmation by lawyers working with the Linux Foundation. Kate also obtained a third independent scan of the 4.13 code base from FOSSology, and compared selected files where the other two scanners disagreed against that SPDX file, to see if there was new insights. The Windriver scanner is based on an older version of FOSSology in part, so they are related. Thomas did random spot checks in about 500 files from the spreadsheets for the uapi headers and agreed with SPDX license identifier in the files he inspected. For the non-uapi files Thomas did random spot checks in about 15000 files. In initial set of patches against 4.14-rc6, 3 files were found to have copy/paste license identifier errors, and have been fixed to reflect the correct identifier. Additionally Philippe spent 10 hours this week doing a detailed manual inspection and review of the 12,461 patched files from the initial patch version early this week with: - a full scancode scan run, collecting the matched texts, detected license ids and scores - reviewing anything where there was a license detected (about 500+ files) to ensure that the applied SPDX license was correct - reviewing anything where there was no detection but the patch license was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied SPDX license was correct This produced a worksheet with 20 files needing minor correction. This worksheet was then exported into 3 different .csv files for the different types of files to be modified. These .csv files were then reviewed by Greg. Thomas wrote a script to parse the csv files and add the proper SPDX tag to the file, in the format that the file expected. This script was further refined by Greg based on the output to detect more types of files automatically and to distinguish between header and source .c files (which need different comment types.) Finally Greg ran the script using the .csv files to generate the patches. Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org> Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>	2017-11-02 11:10:55 +01:00
Wolfram Sang	78283edf2c	kbuild: setlocalversion: print error to STDERR ... I tried to use 'make O=...' from an unclean source tree. This triggered the error path of setlocalversion. But by printing to STDOUT, it created a broken localversion which then caused another (unrelated) error: "4.7.0-rc2Error: kernelrelease not valid - run make prepare to update it" exceeds 64 characters After printing to STDERR, the true build error gets displayed later: /home/wsa/Kernel/linux is not clean, please run 'make mrproper' in the '/home/wsa/Kernel/linux' directory. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Signed-off-by: Michal Marek <mmarek@suse.com>	2016-06-20 17:37:45 +02:00
Franck Bui-Huu	7593e0902b	Fix detectition of kernel git repository in setlocalversion script [take #2] ... setlocalversion script was testing the presence of .git directory in order to find out if git is used as SCM to track the current kernel project. However in some cases, .git is not a directory but can be a file: when the kernel is a git submodule part of a git super project for example. This patch just fixes this by using 'git rev-parse --show-cdup' to check that the current directory is the kernel git topdir. This has the advantage to not test and rely on git internal infrastructure directly. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>	2014-01-03 14:48:42 +01:00
Christian Kujau	cdf2bc632e	scripts/setlocalversion on write-protected source tree ... I just stumbled across another[0] issue when scripts/setlocalversion operates on a write-protected source tree. Back then[0] the source tree was on an read-only NFS share, so "test -w" was introduced before "git update-index" was run. This time, the source tree is on read/write NFS share, but the permissions are world-readable and only a specific user (or root) can write. Thus, "test -w ." returns "0" and then runs "git update-index", producing the following message (on a dirty tree): fatal: Unable to create '/usr/local/src/linux-git/.git/index.lock': Permission denied While it says "fatal", compilation continues just fine. However, I don't think a kernel compilation should alter the source tree (or the .git directory) in any way and I don't see how removing "git update-index" could do any harm. The Mercurial and SVN routines in scripts/setlocalversion don't have any tree-modifying commands, AFAICS. So, maybe the patch below would be acceptable. [0] https://patchwork.kernel.org/patch/29718/ Signed-off-by: Christian Kujau <lists@nerdbynature.de> Cc: Nico Schottelius <nico-linuxsetlocalversion@schottelius.org> Signed-off-by: Michal Marek <mmarek@suse.cz>	2013-06-24 00:08:01 +02:00
Christophe Leroy	f893bfb615	kbuild: Unset language specific variables in setlocalversion script ... This patch allows the use of setlocalversion script regardless of the language parameters. Otherwise, the `svn info 2>/dev/null | grep '^Last Changed Rev'` returns nothing because for instance, in French the text 'Last Changed Rev' is replaced by 'Révision de la dernière modification' Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michal Marek <mmarek@suse.cz>	2013-02-22 14:18:30 +01:00
Roland Dreier	7f3bd6c9cb	setlocalversion: Use "grep -q" instead of piping output to "read dummy" ... In some circumstances (eg when running a build in an emacs shell buffer), I get a spew of messages like grep: writing output: Broken pipe from setlocalversion, because the "read" subshell apparently exits as soon as it reads one line and gives EPIPE to grep. It's not clear to me why this way of writing the check was used instead of just using grep -q to suppress output, but unless there is some deep reason I don't know, this way looks cleaner to me anyway, and gets rid of the ugly message spew. (I double checked at http://pubs.opengroup.org/onlinepubs/009604499/utilities/grep.html and "grep -q" is specified in POSIX / SuS, so hopefully even people cross-compiling the kernel on some bizarre host OS can't complain about this change) Signed-off-by: Roland Dreier <roland@purestorage.com> Signed-off-by: Michal Marek <mmarek@suse.cz>	2012-03-26 22:54:00 +02:00
Mike Crowe	38b3439d84	setlocalversion: update mercurial tag parsing ... The tag output of hg doesn't quite match what setlocalversion currently expects, so update it to handle the latest format. Signed-off-by: Mike Crowe <mcrowe@zipitwireless.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Michal Marek <mmarek@suse.cz>	2011-01-15 00:40:44 +01:00
Linus Torvalds	c9e2a72ff1	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: initramfs: Fix build break on symbol-prefixed archs initramfs: fix initramfs size calculation initramfs: generalize initramfs_data.xxx.S variants scripts/kallsyms: Enable error messages while hush up unnecessary warnings scripts/setlocalversion: update comment kbuild: Use a single clean rule for kernel and external modules kbuild: Do not run make clean in $(srctree) scripts/mod/modpost.c: fix commentary accordingly to last changes kbuild: Really don't clean bounds.h and asm-offsets.h	2010-10-28 15:13:55 -07:00
Michael Prokop	c3e2f196f9	scripts/setlocalversion: update comment ... A tagged repository state isn't enough, git describe only looks at signed or annotated tags (git tag -a/-s). This documentation update makes sure the comment matches the current behaviour. Signed-off-by: Michael Prokop <mika@grml.org> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-09-06 13:26:30 +02:00
Michal Marek	8558f59edf	setlocalversion: Ignote SCMs above the linux source tree ... Dan McGee <dpmcgee@gmail.com> writes: > Note that when in git, you get the appended "+" sign. If > LOCALVERSION_AUTO is set, you will get something like > "eee-gb01b08c-dirty" (whereas the copy of the tree in /tmp still > returns "eee"). It doesn't matter whether the working tree is dirty or > clean. > > Is there a way to disable this? I'm building from a clean tarball that > just happens to be unpacked inside a git repository. One would think > setting LOCALVERSION_AUTO to false would do it, but no such luck... Fix this by checking if the kernel source tree is the root of the git or hg repository. No fix for svn: If the kernel source is not tracked in the svn repository, it works as expected, otherwise determining the 'repository root' is not really a defined task. Reported-and-tested-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-08-21 15:14:59 +02:00
Milton Miller	55c640c3ab	setlocalversion: fix version for untaged nontip mercurial revs ... The manpage for cut says it will return all lines without the delimiter unless -s is specified. When I backed up my mecurial tree to generate modules, I found that the scm part of localversion was turning up blank. Signed-off-by: Milton Miller <miltonm@bga.com> Cc: Michal Marek <mmarek@suse.cz> Cc: "Michał Górny" <gentoo@mgorny.alt.pl> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-08-13 00:52:14 +02:00
Michal Marek	b003afe32f	kbuild: Fix make rpm ... make rpm was broken by commit 0915512: make clean set -e; cd ..; ln -sf /usr/src/iwlwifi-2.6 kernel-2.6.35rc4wl /bin/sh /usr/src/iwlwifi-2.6/scripts/setlocalversion --scm-only > /usr/src/iwlwifi-2.6/.scmversion cat: .scmversion: input file is output file make[1]: *** [rpm] Error 1 Reported-and-tested-by: "Zheng, Jiajia" <jiajia.zheng@intel.com> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-07-21 16:06:05 +02:00
Michał Górny	6dc0c2f338	kbuild: Make the setlocalversion script POSIX-compliant ... The 'source' builtin is a bash alias to the '.' (dot) builtin. While the former is supported only by bash, the latter is specified in POSIX and works fine with all POSIX-compliant shells I am aware of. The '$_' special parameter is specific to bash. It is partially supported in dash too but it always evaluates to the current script path (which causes the script to enter a loop recursively re-executing itself). This is why I have replaced the two occurences of '$_' with the explicit parameter. The 'local' builtin is another example of bash-specific code. Although it is supported by all POSIX-compliant shells I am aware of, it is not part of POSIX specification and thus the code should not rely on it assigning a specific value to the local variable. Moreover, the 'posh' shell has a limited version of 'local' builtin not supporting direct variable assignments. Thus, I have broken one of the 'local' declarations down into a (non-POSIX) 'local' declaration and a plain (POSIX-compliant) variable assignment. Signed-off-by: Michał Górny <gentoo@mgorny.alt.pl> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-07-20 15:43:27 +02:00
Michal Marek	09155120cf	kbuild: Clean up and speed up the localversion logic ... Now that we run scripts/setlocalversion during every build, it makes sense to move all the localversion logic there. This cleans up the toplevel Makefile and also makes sure that the script is called only once in 'make prepare' (previously, it would be called every time due to a variable expansion in an ifneq statement). No user-visible change is intended, unless one runs the setlocalversion script directly. Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: David Rientjes <rientjes@google.com> Cc: Greg Thelen <gthelen@google.com> Cc: Nico Schottelius <nico-linuxsetlocalversion@schottelius.org> Signed-off-by: Michal Marek <mmarek@suse.cz>	2010-06-18 14:23:21 +02:00
Nico Schottelius	a2bb90a08c	kbuild: fix delay in setlocalversion on readonly source ... Do not update index on read only media. Idea published by Christian Kujau <lists@nerdbynature.de>. Cc: Nico Schottelius <nico@ikn.schottelius.org> Cc: Christian Kujau <lists@nerdbynature.de>	2009-06-14 22:26:00 +02:00
Nico Schottelius	33252572e7	Fix scripts/setlocalversion with tagged git commit ... Produce correct output for - tagged commit (v2.6.30-rc6) - past tagged commit (v2.6.30-rc5-299-g7c7327d) - no tag Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2009-05-19 14:11:34 -07:00
Nico Schottelius	a182ad3d0f	kbuild: fix scripts/setlocalversion with git ... When using trees like wireless-testing, which have untagged tags, scripts/setlocalversion does not display any git indication for localversion. This patch fixes it: If git is available, but no usable tag is found, it uses -g${head}. It skips the detection of unanottated tags via git name-rev. Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2009-05-01 10:54:04 +02:00
Peter Korsgaard	4774bb1ced	kbuild: use git svn instead of git-svn in setlocalversion ... Use the correct git <subcmd> syntax instead of the deprecated git-<subcmd>. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2009-04-11 08:18:08 +02:00
Mike Frysinger	d21d52d4a1	kbuild,setlocalversion: shorten the make time when using svn ... Don't bother doing `svn st` as it takes a retarded amount of time when the source is cold Signed-off-by: Mike Frysinger <vapier.adi@gmail.com> Signed-off-by: Bryan Wu <cooloney@kernel.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2009-02-15 12:50:07 +01:00
Peter Korsgaard	ff80aa97c9	setlocalversion: add git-svn support ... Print svn revision in addition to git info on git-svn repos. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-12-03 22:58:30 +01:00
Peter Korsgaard	167d6a02c1	setlocalversion: print correct subversion revision ... Output svn revision of latest change, instead of repo revision as thats what we're interested in (especially when working on a branch/tag). Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-12-03 22:58:29 +01:00
Trent Piepho	f03b283f08	kbuild: tag with git revision when git describe is missing ... setlocalversion used to use an abbreviated git commit sha1 to generate the tag. This was changed in commit d882421f4e "kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format" to use git describe to come up with a tag. Which is nice, but git describe sometimes can't describe the revision. Commit 56b2f0706d ("setlocalversion: do not describe if there is nothing to describe") addressed this, but there is still no tag generated. So, generate a plain abbreviated sha1 tag like setlocalversion used to when git describe comes up short. Signed-off-by: Trent Piepho <tpiepho@freescale.com> CC: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-10-29 22:25:36 +01:00
Mike Frysinger	e3da2fb712	kbuild: setlocalversion: dont include svn change count ... The number of pending changes is pretty useless, so encoding it into the version is just annoying by the constant shuffle in corresponding modules. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-10-29 22:02:07 +01:00
Sebastian Siewior	56b2f0706d	setlocalversion: do not describe if there is nothing to describe ... Jan Engelhardt wrote: > Just a note that when you run git-describe, you should probably quiten it. > > fatal: cannot describe 'bd7364a0fd5a4a2878fe4a224be1b142a4e6698e' > > This happens when tags are not present, which can happen if Linus's tree > is sent upwards again, IOW: > > machine1$ git-clone torvalds/linux-2.6.git > machine1$ git push elsewhere master > > machine2$ git-clone elsewhere:/linux > machine2$ git-describe HEAD > fatal: cannot describe that Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc> Acked-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-07-25 22:12:53 +02:00
Bryan Wu	ba3d05fb63	kbuild: add svn revision information to setlocalversion ... follow git and mercurial style, include uncommitted changes detect Cc: Frans Pop <elendil@planet.nl> Signed-off-by: Bryan Wu <bryan.wu@analog.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-02-03 08:59:50 +01:00
Theodore Ts'o	b052ce4c84	kbuild: fix false positive -dirty tag caused by make-kpkg ... make-kpkg modifies scripts/package/Makefile and deletes scripts/package/builddeb as part of its build process. Ignore these changes so the tree isn't marked as -dirty, when it is just an artifact of make-kpkg. (make-kpkg clean restores the files to their original state, and these helper scripts won't affect the final compiled kernel in any way.) Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-01-28 23:14:37 +01:00
Theodore Ts'o	4e7434ff02	kbuild: fix scripts/setlocalversion to avoid erroneous -dirty tag ... If git's index file is out of date, and some files have been touched such that their timestamp doesn't what is in the index, "git diff-index HEAD" may show that a particular file is dirty, when in fact it really isn't. Running "git update-index" will update the index to avoid these false positives. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-01-28 23:14:37 +01:00
Theodore Ts'o	d882421f4e	kbuild: change CONFIG_LOCALVERSION_AUTO to use a git-describe-ish format ... Change the automatic local version to have the form -nnnnn-gSHA1SUMID, where 'nnnnn' is the number of commits since the last tag (i.e., 2.6.21-rc7). This makes it much more likely that the package names created for the kernel will look "newer" to a package manager. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-01-28 23:14:37 +01:00
Aron Griffis	3dce174cfc	kbuild: support mercurial in setlocalversion ... This represents mercurial changesets similarly to git. For untagged revisions, append the changeset id. If there are uncommitted changes, append -dirty. For example, -hgc60016ba6237-dirty Signed-off-by: Aron Griffis <aron@hp.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2008-01-28 23:14:36 +01:00
Uwe Zeisberger	216b2f1f71	kbuild: append -dirty for updated but uncommited changes ... Compare the working copy with the last commit, instead of the index. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Acked-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2006-06-17 00:08:17 +02:00
Uwe Zeisberger	29b0c89953	kbuild: append git revision for all untagged commits ... adds revision suffix for untagged commits that are reachable from a tag I'm bisecting and don't get the -g...... suffix. The reason is, that git name-rev --tags HEAD returns e.g. HEAD tags/v2.6.17-rc1^0~1067 which is currently good enough for setlocalversion to skip the suffix. This introduces a dependecy to grep -E, which should be fine. Signed-off-by: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de> Acked-By: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2006-06-17 00:08:17 +02:00
Ryan Anderson	24d49756aa	kbuild: In setlocalversion change -git_dirty to just -dirty ... When building Debian packages directly from the git tree, the appended "git_dirty" is a problem due to the underscore. In order to cause the least problems, change that just to "dirty". Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2006-01-08 18:44:01 +01:00
Rene Scharfe	117a93db1d	kbuild: Use git in scripts/setlocalversion ... Currently scripts/setlocalversion is a Perl script that tries to figure out the current git commit ID of a repo without using git. It also imports Digest::MD5 without using it and generally is too big for the small task it does. :] And it always reports a git ID, even when the HEAD is tagged -- this is a bug. This patch replaces it with a Bourne Shell script that uses git commands to do the same. I can't come up with a scenario where someone would use a git repo and refuse to install git core at the same time, so I think it's reasonable to assume git is available. The new script also reports uncommitted changes by adding -git_dirty to the version string. Obviously you can't see from that _what_ has been changed from the last commit, so it's more of a reminder that you forgot to commit something. The script is easily extensible: simply add a check for Mercurial (or whatever) below the git check. Note: the script doesn't print a newline char anymore. That's only because it was easier to implement it that way, not a feature (or bug). 'make kernelrelease' doesn't care. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2006-01-06 20:46:21 +01:00
Ryan Anderson	aaebf43320	[PATCH] kbuild: automatically append a short string to the version based upon the git commit ... If CONFIG_AUTO_LOCALVERSION is set, the user is using a git-based tree, and the current HEAD is not referred to by any tags in .git/refs/tags/, append -g and the first 8 characters of the commit to the version string. This makes it easier to use git-bisect, and/or to do a daily build, without trampling on your older, working builds, or accidentally setting up conflicting sets of modules. Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>	2005-08-10 21:11:23 +02:00