mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge tag 'android11-5.4.197_r00' into 'android11-5.4'
This is the merge of the upstream LTS release of 5.4.197 into the android11-5.4 branch. It contains the following commits:9eae8fc396Merge 5.4.197 into android11-5.4-lts35c6471fd2Linux 5.4.197e00c2f22fbbpf: Enlarge offset check value to INT_MAX in bpf_skb_{load,store}_bytesa2235bc65aNFSD: Fix possible sleep during nfsd4_release_lockowner()f5b6bc69a7NFS: Memory allocation failures are not server fatal errors0490cd2aeedocs: submitting-patches: Fix crossref to 'The canonical patch format'72ef5d01fetpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()7ecd237e50tpm: Fix buffer access in tpm2_get_tpm_pt()396d1f5176HID: multitouch: Add support for Google Whiskers Touchpad25f0e9459fraid5: introduce MD_BROKENfd2f7e9984dm verity: set DM_TARGET_IMMUTABLE feature flagf005973502dm stats: add cond_resched when looping over entries65e6282f0ddm crypt: make printing of the key constant-timea4415f39e3dm integrity: fix error code in dm_integrity_ctr()fc658c0839zsmalloc: fix races between asynchronous zspage free and page migration7632451ad9crypto: ecrdsa - Fix incorrect use of vli_cmpb16bb37398netfilter: conntrack: re-fetch conntrack after insertion1fe82bfd9eexec: Force single empty string when argv is empty241b566e04drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()3dbab9e37ccfg80211: set custom regdomain after wiphy registration039fa25d95assoc_array: Fix BUG_ON during garbage collect8c668da61bdrivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllersfdcbdb3d08i2c: ismt: Provide a DMA buffer for Interrupt Cause Logging827980029dnet: ftgmac100: Disable hardware checksum on AST2600e619506ed0net: af_key: check encryption module availability consistencyfa77d2a3a7pinctrl: sunxi: fix f1c100s uart2 function2208c31d86ACPI: sysfs: Fix BERT error region memory mapping92d4b5e148ACPI: sysfs: Make sparse happy about address space in use5a73bd4f47media: vim2m: initialize the media device earlierb7248281afmedia: vim2m: Register video device after setting up internalsab5b00cfe0secure_seq: use the 64 bits of the siphash for port offset calculation80cca53a48tcp: change source port randomizarion at connect() time9ce35dad5aInput: goodix - fix spurious key release eventsbdbc7ef3ebstaging: rtl8723bs: prevent ->Ssid overflow in rtw_wx_set_scan()4f07508394x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests8bb828229dlockdown: also lock down previous kgdb use0cf7a2be06Merge 5.4.196 into android11-5.4-lts04b092e4a0Linux 5.4.196dba1941f5bafs: Fix afs_getattr() to refetch file status if callback break occurredef5374d532i2c: mt7621: fix missing clk_disable_unprepare() on error in mtk_i2c_probe()10a221e2d3x86/xen: Mark cpu_bringup_and_idle() as dead_end_functiona12884ff43x86/xen: fix booting 32-bit pv guestb2f140a9f9Reinstate some of "swiotlb: rework "fix info leak with DMA_FROM_DEVICE""060f38b1dfARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clkb38cf3cb17firmware_loader: use kernel credentials when reading firmwaree14e3856e9net: stmmac: disable Split Header (SPH) for Intel platforms9ea8e6a832block: return ELEVATOR_DISCARD_MERGE if possible36ac6caf74Input: ili210x - fix reset timing1c450bdf2enet: atlantic: verify hw_head_ lies within TX buffer ringe5307704c4net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()91d8d7edf1ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()dd5de66f5cselftests: add ping test with ping_group_range tuned9919585e5fmac80211: fix rx reordering with non explicit / psmp ack policy19e2cd737cscsi: qla2xxx: Fix missed DMA unmap for aborted commands74168c2207perf bench numa: Address compiler error on s390d1915d9c9fgpio: mvebu/pwm: Refuse requests with inverted polarity3fdd67e83cgpio: gpio-vf610: do not touch other bits when set the target bit1fe6dc5f5dnet: bridge: Clear offload_fwd_mark when passing frame up bridge interface.622be11fa3igb: skip phy status check where unavailableeb92a8ecceARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2463a7b957dARM: 9196/1: spectre-bhb: enable for Cortex-A151b93631c77net: af_key: add check for pfkey_broadcast in function pfkey_processc0be5fec78net/mlx5e: Properly block LRO when XDP is enabled3277789f33NFC: nci: fix sleep in atomic context bugs caused by nci_skb_allocb368e07fb4net/qla3xxx: Fix a test in ql_reset_work()d672eee9e4clk: at91: generated: consider range when calculating best rate8cb1a05fe3ice: fix possible under reporting of ethtool Tx and Rx statisticsdc64e8874enet: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()32f779e6fbnet: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()1eb2d78581net/sched: act_pedit: sanitize shift argument before usage50f70ee302net: macb: Increment rx bd head after allocating skb and buffera42ffe8833ARM: dts: aspeed-g6: fix SPI1/SPI2 quad pin group6493ff94c0ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsife2a9469ecdma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace8cf6c24ed4drm/dp/mst: fix a possible memory leak in fetch_monitor_name()8be06f62b4crypto: qcom-rng - fix infinite loop on requests not multiple of WORD_SZf4a093215bKVM: x86/mmu: Update number of zapped pages even if page list is stablede87451827PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold3a12b2c413Fix double fget() in vhost_net_set_backend()dd0ea88b0aperf: Fix sys_perf_event_open() race against selfc8a5e14cb4ALSA: wavefront: Proper check of get_user() error2f8f6c393bSUNRPC: Ensure we flush any closed sockets before xs_xprt_free()975a0f14d5SUNRPC: Don't call connect() more than once on a TCP socketaa4d71edd6SUNRPC: Prevent immediate close+reconnect2d6f096476SUNRPC: Clean up scheduling of autoclosef3fe8d13acmmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()def047ae12mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSDf10260f359mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC1e93f93992nilfs2: fix lockdep warnings during disk space reclamation307d021b1anilfs2: fix lockdep warnings in page operations for btree nodes77b71a4c87ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()54f7358be1platform/chrome: cros_ec_debugfs: detach log reader wq from devm232128f6e6drbd: remove usage of list iterator variable after loop83abb076f4MIPS: lantiq: check the return value of kzalloc()e7947c031frtc: mc146818-lib: Fix the AltCentury for AMD platforms7be785032cnvme-multipath: fix hang when disk goes live over reconnectee0323cc8bALSA: hda/realtek: Enable headset mic on Lenovo P360c0d86f2a3ccrypto: x86/chacha20 - Avoid spurious jumps to other functionsf021389433crypto: stm32 - fix reference leak in stm32_crc_remove8c015cd524Input: stmfts - fix reference leak in stmfts_input_openbb83a744bcInput: add bounds checking to input_set_capability()4fd3966956um: Cleanup syscall_handler_t definition/cast, fix warning0c319b9988rtc: fix use-after-free on device removal05df3bdbc2x86/xen: Make the secondary CPU idle tasks reliable0d3817cb4ex86/xen: Make the boot CPU idle task reliable67e2b62461floppy: use a statically allocated error counterabcfb6abb7Merge 5.4.195 into android11-5.4-ltse44bd11b47Merge 5.4.194 into android11-5.4-ltsc336f131c4ANDROID: fix up abi issue with struct snd_pcm_runtime0187300e6aLinux 5.4.1958fcefb43ectty/serial: digicolor: fix possible null-ptr-deref in digicolor_uart_probe()6d80857c4fping: fix address binding wrt vrf7845532adbarm[64]/memremap: don't abuse pfn_valid() to ensure presence of linear mapc0b735fef2net: phy: Fix race condition on link status changea60def7568MIPS: fix build with gcc-12a3112d5da1drm/vmwgfx: Initialize drm_mode_fb_cmd2463c743149cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()f25145c37ci40e: i40e_main: fix a missing check on list iterator17c744716adrm/nouveau/tegra: Stop using iommu_present()c8f567c465serial: 8250_mtk: Fix register address for XON/XOFF characteraa3ea7451bserial: 8250_mtk: Fix UART_EFR register address031fda28d0slimbus: qcom: Fix IRQ check in qcom_slim_probe7de6f30596USB: serial: option: add Fibocom MA510 modem65732f62f7USB: serial: option: add Fibocom L610 modem6c78537f3eUSB: serial: qcserial: add support for Sierra Wireless EM7590e40d004947USB: serial: pl2303: add device id for HP LM930 Display056a56f8fbusb: typec: tcpci: Don't skip cleanup in .remove() on error457d9401b8usb: cdc-wdm: fix reading stuck on device close4d93303fd8tty: n_gsm: fix mux activation issues in gsm_config()6e34ee5b5btcp: resalt the secret every 10 seconds39c26fe93cnet: emaclite: Don't advertise 1000BASE-T and do auto negotiation638bfbc84cs390: disable -Warray-boundsf66d3fa508ASoC: ops: Validate input values in snd_soc_put_volsw_range()13b850a6ccASoC: max98090: Generate notifications on changes for custom control5c766c000aASoC: max98090: Reject invalid values in custom control put()22f6c68b49hwmon: (f71882fg) Fix negative temperature208200e573gfs2: Fix filesystem block deallocation for short writes42daae7d84net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()e038c457bdnet/smc: non blocking recvmsg() return -EAGAIN when no data and signal_pending2ec2dd7d51net/sched: act_pedit: really ensure the skb is writable48c6a40e2fs390/lcs: fix variable dereferenced before check467ddbbe7es390/ctcm: fix potential memory leak2cbce01100s390/ctcm: fix variable dereferenced before check1c40e85d0ahwmon: (ltq-cputemp) restrict it to SOC_XWAY0a778db931dim: initialize all struct fields522986cc39mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection0729594cb7netlink: do not reset transport header in netlink_recvmsg()33ce32587cdrm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name()5809a1c530ipv4: drop dst in multicast routing pathc9d75e87f4net: Fix features skip in for_each_netdev_feature()5c90576705mac80211: Reset MBSSID parameters upon connectioncfe74fd41fhwmon: (tmp401) Add OF device ID table3915341a93batman-adv: Don't skb_split skbuffs with frag_list00c4652b41Merge 5.4.193 into android11-5.4-lts9065948757Linux 5.4.1942f4e0bf651mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic()e4db0c3ce0mm: hugetlb: fix missing cache flush in copy_huge_page_from_user()ea9cad1c5dmm: fix missing cache flush for all tail pages of compound page45c05171d6Bluetooth: Fix the creation of hdev->namef52c4c067aKVM: x86/svm: Account for family 17h event renumberings in amd_pmc_perf_hw_idc1bdf1e6e7x86: kprobes: Prohibit probing on instruction which has emulate prefix6af6427a96x86: xen: insn: Decode Xen and KVM emulate-prefix signaturec67a4a91f5x86: xen: kvm: Gather the definition of emulate prefixes4c39e1ace3x86/asm: Allow to pass macros to __ASM_FORM()29afcd5af0KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id()ea65a7d76carm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL5755f946a8can: grcan: only use the NAPI poll budget for RXcaba5c13a8can: grcan: grcan_probe(): fix broken system id check for errata workaround needs76b64c690fnfp: bpf: silence bitwise vs. logical OR warning86ccefb83edrm/i915: Cast remain to unsigned long in eb_relocate_vmade542bd765drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} typese6ff94d31cblock: drbd: drbd_nl: Make conversion to 'enum drbd_ret_code' explicitf668da98adMIPS: Use address-of operator on section symbols44a1f2e6dcANDROID: GKI: update the abi .xml file52509afdedRevert "tcp: ensure to use the most recently sent skb when filling the rate sample"01565c91b7Linux 5.4.1938a7f92053dmmc: rtsx: add 74 Clocks in power on flowd789b98917PCI: aardvark: Fix reading MSI interrupt number253bc43ca5PCI: aardvark: Clear all MSIs at setup786dc86c84dm: interlock pending dm_io and dm_wait_for_bios_completionad1393b92edm: fix mempool NULL pointer race when completing IO40bcd39a00tcp: make sure treq->af_specific is initialized9661bf674dALSA: pcm: Fix potential AB/BA lock with buffer_mutex and mmap_lock37b12c16beALSA: pcm: Fix races among concurrent prealloc proc writes2a559eec81ALSA: pcm: Fix races among concurrent prepare and hw_params/hw_free calls08d1807f09ALSA: pcm: Fix races among concurrent read/write and buffer changesfbeb492694ALSA: pcm: Fix races among concurrent hw_params and hw_free callsf098f8b982mm: fix unexpected zeroed page mapping with zram swapc7337efd1dblock-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern9588ac2eddnet: ipv6: ensure we call ipv6_mc_down() at most once367b49086bKVM: LAPIC: Enable timer posted-interrupt only when mwait/hlt is advertisedc2fadf2d0ax86/kvm: Preserve BSP MSR_KVM_POLL_CONTROL across suspend/resume8b78939f4bkvm: x86/cpuid: Only provide CPUID leaf 0xA if host has architectural PMUf455c8e657NFSv4: Don't invalidate inode attributes on delegation return89e7a625ecdrm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu1d14c1c7a3net: igmp: respect RCU rules in ip_mc_source() and ip_mc_msfilter()2b99ff4c3ebtrfs: always log symlinks in full modedc47844894smsc911x: allow using IRQ0cff6cb162fbnxt_en: Fix possible bnxt_open() failure caused by wrong RFS flag64ece01adbselftests: mirror_gre_bridge_1q: Avoid changing PVID while interface is operational52401926c8net: emaclite: Add error handling for of_address_to_resource()354cac1e39net: stmmac: dwmac-sun8i: add missing of_node_put() in sun8i_dwmac_register_mdio_mux()0510b6ccfbnet: ethernet: mediatek: add missing of_node_put() in mtk_sgmii_init()102986592fRDMA/siw: Fix a condition race issue in MPA request processinge6ae21eb94ASoC: dmaengine: Restore NULL prepare_slave_config() callbackdf3ea6cc1ahwmon: (adt7470) Fix warning on module removal01d4363dd7NFC: netlink: fix sleep in atomic bug when firmware download timeout33d3e76fc7nfc: nfcmrvl: main: reorder destructive operations in nfcmrvl_nci_unregister_dev to avoid bugs85aecdef77nfc: replace improper check device_is_registered() in netlink related functionsda9eb43b9acan: grcan: use ofdev->dev when allocating DMA memory8b451b7d7ecan: grcan: grcan_close(): fix deadlock8f4246450as390/dasd: Fix read inconsistency for ESE DASD devices91193a2c2fs390/dasd: Fix read for ESE with blksize < 4k1aa75808eds390/dasd: prevent double format of tracks for ESE devices061a424dd1s390/dasd: fix data corruption for ESE devices860db6cdc5ASoC: meson: Fix event generation for G12A tohdmi muxd4864e8c4bASoC: wm8958: Fix change notifications for DSP controls6723ab2ed8ASoC: da7219: Fix change notifications for tone generator frequencyac5894fb86genirq: Synchronize interrupt thread startup8624e2c5afACPICA: Always create namespace nodes using acpi_ns_create_node()27183539cffirewire: core: extend card->lock in fw_core_handle_bus_reset2fefc62598firewire: remove check of list iterator against head past the loop body34b9b91829firewire: fix potential uaf in outbound_phy_packet_callback()f6b6e93369Revert "SUNRPC: attempt AF_LOCAL connect on setup"d403ff32e5gpiolib: of: fix bounds check for 'gpio-reserved-ranges'94842485b4ALSA: fireworks: fix wrong return count shorter than expected by 4 bytes73ce49fa59parisc: Merge model and model name into one line in /proc/cpuinfo0d5bb59858MIPS: Fix CP0 counter erratum detection for R4k CPUsaa172204d5Merge 5.4.192 into android11-5.4-lts1d72b776f6Linux 5.4.192aa2a047b58mm, hugetlb: allow for "high" userspace addresses6a79b2433ehugetlbfs: get unmapped area below TASK_UNMAPPED_BASE for hugetlbfsb69e60f6fctty: n_gsm: fix incorrect UA handling0f4be29febtty: n_gsm: fix wrong command frame length field encoding21cc640385tty: n_gsm: fix wrong command retry handling49c40febd4tty: n_gsm: fix missing explicit ldisc flush85522dcf00tty: n_gsm: fix insufficient txframe size563bb0f794netfilter: nft_socket: only do sk lookups when indev is availablefae2095210tty: n_gsm: fix malformed counter for out of frame datacec2d0782atty: n_gsm: fix wrong signal octet encoding in convergence layer type 2a6d9847a4fx86/cpu: Load microcode during restore_processor_state()9e9d12b81dnet: ethernet: stmmac: fix write to sgmii_adapter_base10ba1ac9a2drivers: net: hippi: Fix deadlock in rr_close()a827521975cifs: destage any unwritten data to the server before calling copychunk_write5335370366x86: __memcpy_flushcache: fix wrong alignment if size > 2^320ecc5304e8ip6_gre: Avoid updating tunnel->tun_hlen in __gre6_xmit()7815710349ASoC: wm8731: Disable the regulator when probing failsa71df406a6tcp: fix F-RTO may not work correctly when receiving DSACKa4ed61e30eixgbe: ensure IPsec VF<->PF compatibility406aaef0febnx2x: fix napi API usage sequencec3e7ea5860tls: Skip tls_append_frag on zero copy sizecd5cec3a0cdrm/amd/display: Fix memory leak in dcn21_clock_source_createffce11a391net: dsa: lantiq_gswip: Don't set GSWIP_MII_CFG_RMII_CLK3a179538bfnet: bcmgenet: hide status block before TX timestamping8ef6d60aa2clk: sunxi: sun9i-mmc: check return value after calling platform_get_resource()194f474ad9bus: sunxi-rsb: Fix the return value of sunxi_rsb_device_create()e80054ea0ctcp: fix potential xmit stalls caused by TCP_NOTSENT_LOWAT685ff7d244ip_gre: Make o_seqno start from 0 in native mode69555bb27bnet/smc: sync err code when tcp connection was refuseddaca23846enet: hns3: add validity check for message data length7763a79566cpufreq: fix memory leak in sun50i_cpufreq_nvmem_probef5bb5940d7pinctrl: pistachio: fix use of irq_of_parse_and_map()d22fc60369arm64: dts: imx8mn-ddr4-evk: Describe the 32.768 kHz PMIC clock68f5200a1fARM: dts: imx6ull-colibri: fix vqmmc regulatorc45180375asctp: check asoc strreset_chunk in sctp_generate_reconf_event2cba635570tcp: ensure to use the most recently sent skb when filling the rate sample3ea6190be9tcp: md5: incorrect tcp_header_len for incoming connections2b9a13d98dbpf, lwt: Fix crash when using bpf_skb_set_tunnel_key() from bpf_xmit lwt hook2e7f70d324mtd: rawnand: Fix return value check of wait_for_completion_timeout2a36ba067bipvs: correctly print the memory size of ip_vs_conn_tababe86a10dcARM: dts: logicpd-som-lv: Fix wrong pinmuxing on OMAP3554212850e3ARM: dts: am3517-evm: Fix misc pinmuxingbba67fe6b0ARM: dts: Fix mmc order for omap3-gta04416e0f8907phy: ti: Add missing pm_runtime_disable() in serdes_am654_probe6ff7c1b827phy: mapphone-mdm6600: Fix PM error handling in phy_mdm6600_probe59bdaed5ddARM: dts: at91: Map MCLK for wm8731 on at91sam9g20ekdbce8fc16aphy: ti: omap-usb2: Fix error handling in omap_usb2_enable_clocksb7fc45354bARM: OMAP2+: Fix refcount leak in omap_gic_of_initdd99939b70phy: samsung: exynos5250-sata: fix missing device put in probe error paths6331b77fdcphy: samsung: Fix missing of_node_put() in exynos_sata_phy_probefccbc3168eARM: dts: imx6qdl-apalis: Fix sgtl5000 detection issueb8f0c19d48USB: Fix xhci event ring dequeue pointer ERDP update issue1f47c26257mtd: rawnand: fix ecc parameters for mt76220405bd7f18arm64: dts: meson: remove CPU opps below 1GHz for SM1 boards5f80b5c5f4arm64: dts: meson: remove CPU opps below 1GHz for G12B boardsf6db63819dvideo: fbdev: udlfb: properly check endpoint typec00f3892f4hex2bin: fix access beyond string end15b78a8e38hex2bin: make the function hex_to_bin constant-time73f4668ee8arch_topology: Do not set llc_sibling if llc_id is invalida3cdd33ca1serial: 8250: Correct the clock for EndRun PTP/1588 PCIe device89a5728b05serial: 8250: Also set sticky MCR bits in console restoration42f749f223serial: imx: fix overrun interrupts in DMA moded29c197df7usb: dwc3: gadget: Return proper request status0f3d081315usb: dwc3: core: Fix tx/rx threshold settingse2ec7b1f6ausb: gadget: configfs: clear deactivation flag in configfs_composite_unbind()debb276670usb: gadget: uvc: Fix crash when encoding data for usb request324e67c3b2usb: typec: ucsi: Fix role swapping0366beb402usb: misc: fix improper handling of refcount in uss720_probe()2c97a2b5efiio: magnetometer: ak8975: Fix the error handling in ak8975_power_on()e82c726c94iio: dac: ad5446: Fix read_raw not returning set value1aea30f87ciio: dac: ad5592r: Fix the missing return value.1e8716a5c0xhci: increase usb U3 -> U0 link resume timeout from 100ms to 500msb8d3a4681fxhci: stop polling roothubs after shutdownc8fbc2f875USB: serial: option: add Telit 0x1057, 0x1058, 0x1075 compositions68088dec9bUSB: serial: option: add support for Cinterion MV32-WA/MV32-WB56cbdb9d95USB: serial: cp210x: add PIDs for Kamstrup USB Meter Reader6b10dd966cUSB: serial: whiteheat: fix heap overflow in WHITEHEAT_GET_DTR_RTS890fc65448USB: quirks: add STRING quirk for VCOM devicec4b31d41f5USB: quirks: add a Realtek card reader5666334ce3usb: mtu3: fix USB 3.0 dual-role-switch from device to hostb258964700lightnvm: disable the subsystemc9af90f0c6hamradio: remove needs_free_netdev to avoid UAF7361a35bf3hamradio: defer 6pack kfree after unregister_netdev7dea591300floppy: disable FDRAWCMD by default Update the .xml file with the following needed changes that came in from the -lts branch to handle ABI issues with LTS security fixes: Leaf changes summary: 2 artifacts changed Changed leaf types summary: 1 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 1 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 1 function with some sub-type change: [C] 'function int hex_to_bin(char)' at hexdump.c:52:1 has some sub-type changes: parameter 1 of type 'char' changed: type name changed from 'char' to 'unsigned char' type size hasn't changed 'struct snd_pcm_runtime at pcm.h:342:1' changed: type size changed from 6336 to 6400 (in bits) 1 data member insertion: 'atomic_t buffer_accessing', at offset 6336 (in bits) at pcm.h:429:1 107 impacted interfaces Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: I2cc9bdcc4c587e34362082b93990bf9837241a37
This commit is contained in:
Greg Kroah-Hartman
commit
6b9c39b935
350 changed files with 97090 additions and 99237 deletions
|
|
@ -39,6 +39,22 @@ config BLK_DEV_FD
|
|||
To compile this driver as a module, choose M here: the
|
||||
module will be called floppy.
|
||||
|
||||
config BLK_DEV_FD_RAWCMD
|
||||
bool "Support for raw floppy disk commands (DEPRECATED)"
|
||||
depends on BLK_DEV_FD
|
||||
help
|
||||
If you want to use actual physical floppies and expect to do
|
||||
special low-level hardware accesses to them (access and use
|
||||
non-standard formats, for example), then enable this.
|
||||
|
||||
Note that the code enabled by this option is rarely used and
|
||||
might be unstable or insecure, and distros should not enable it.
|
||||
|
||||
Note: FDRAWCMD is deprecated and will be removed from the kernel
|
||||
in the near future.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config AMIGA_FLOPPY
|
||||
tristate "Amiga floppy support"
|
||||
depends on AMIGA
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ void tl_release(struct drbd_connection *connection, unsigned int barrier_nr,
|
|||
unsigned int set_size)
|
||||
{
|
||||
struct drbd_request *r;
|
||||
struct drbd_request *req = NULL;
|
||||
struct drbd_request *req = NULL, *tmp = NULL;
|
||||
int expect_epoch = 0;
|
||||
int expect_size = 0;
|
||||
|
||||
|
|
@ -237,8 +237,11 @@ void tl_release(struct drbd_connection *connection, unsigned int barrier_nr,
|
|||
* to catch requests being barrier-acked "unexpectedly".
|
||||
* It usually should find the same req again, or some READ preceding it. */
|
||||
list_for_each_entry(req, &connection->transfer_log, tl_requests)
|
||||
if (req->epoch == expect_epoch)
|
||||
if (req->epoch == expect_epoch) {
|
||||
tmp = req;
|
||||
break;
|
||||
}
|
||||
req = list_prepare_entry(tmp, &connection->transfer_log, tl_requests);
|
||||
list_for_each_entry_safe_from(req, r, &connection->transfer_log, tl_requests) {
|
||||
if (req->epoch != expect_epoch)
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -791,9 +791,11 @@ int drbd_adm_set_role(struct sk_buff *skb, struct genl_info *info)
|
|||
mutex_lock(&adm_ctx.resource->adm_mutex);
|
||||
|
||||
if (info->genlhdr->cmd == DRBD_ADM_PRIMARY)
|
||||
retcode = drbd_set_role(adm_ctx.device, R_PRIMARY, parms.assume_uptodate);
|
||||
retcode = (enum drbd_ret_code)drbd_set_role(adm_ctx.device,
|
||||
R_PRIMARY, parms.assume_uptodate);
|
||||
else
|
||||
retcode = drbd_set_role(adm_ctx.device, R_SECONDARY, 0);
|
||||
retcode = (enum drbd_ret_code)drbd_set_role(adm_ctx.device,
|
||||
R_SECONDARY, 0);
|
||||
|
||||
mutex_unlock(&adm_ctx.resource->adm_mutex);
|
||||
genl_lock();
|
||||
|
|
@ -1971,7 +1973,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
|
|||
drbd_flush_workqueue(&connection->sender_work);
|
||||
|
||||
rv = _drbd_request_state(device, NS(disk, D_ATTACHING), CS_VERBOSE);
|
||||
retcode = rv; /* FIXME: Type mismatch. */
|
||||
retcode = (enum drbd_ret_code)rv;
|
||||
drbd_resume_io(device);
|
||||
if (rv < SS_SUCCESS)
|
||||
goto fail;
|
||||
|
|
@ -2696,7 +2698,8 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
|
|||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
retcode = conn_request_state(connection, NS(conn, C_UNCONNECTED), CS_VERBOSE);
|
||||
retcode = (enum drbd_ret_code)conn_request_state(connection,
|
||||
NS(conn, C_UNCONNECTED), CS_VERBOSE);
|
||||
|
||||
conn_reconfig_done(connection);
|
||||
mutex_unlock(&adm_ctx.resource->adm_mutex);
|
||||
|
|
@ -2809,7 +2812,7 @@ int drbd_adm_disconnect(struct sk_buff *skb, struct genl_info *info)
|
|||
mutex_lock(&adm_ctx.resource->adm_mutex);
|
||||
rv = conn_try_disconnect(connection, parms.force_disconnect);
|
||||
if (rv < SS_SUCCESS)
|
||||
retcode = rv; /* FIXME: Type mismatch. */
|
||||
retcode = (enum drbd_ret_code)rv;
|
||||
else
|
||||
retcode = NO_ERROR;
|
||||
mutex_unlock(&adm_ctx.resource->adm_mutex);
|
||||
|
|
|
|||
|
|
@ -521,8 +521,8 @@ static unsigned long fdc_busy;
|
|||
static DECLARE_WAIT_QUEUE_HEAD(fdc_wait);
|
||||
static DECLARE_WAIT_QUEUE_HEAD(command_done);
|
||||
|
||||
/* Errors during formatting are counted here. */
|
||||
static int format_errors;
|
||||
/* errors encountered on the current (or last) request */
|
||||
static int floppy_errors;
|
||||
|
||||
/* Format request descriptor. */
|
||||
static struct format_descr format_req;
|
||||
|
|
@ -542,7 +542,6 @@ static struct format_descr format_req;
|
|||
static char *floppy_track_buffer;
|
||||
static int max_buffer_sectors;
|
||||
|
||||
static int *errors;
|
||||
typedef void (*done_f)(int);
|
||||
static const struct cont_t {
|
||||
void (*interrupt)(void);
|
||||
|
|
@ -1435,7 +1434,7 @@ static int interpret_errors(void)
|
|||
if (DP->flags & FTD_MSG)
|
||||
DPRINT("Over/Underrun - retrying\n");
|
||||
bad = 0;
|
||||
} else if (*errors >= DP->max_errors.reporting) {
|
||||
} else if (floppy_errors >= DP->max_errors.reporting) {
|
||||
print_errors();
|
||||
}
|
||||
if (ST2 & ST2_WC || ST2 & ST2_BC)
|
||||
|
|
@ -2055,7 +2054,7 @@ static void bad_flp_intr(void)
|
|||
if (!next_valid_format())
|
||||
return;
|
||||
}
|
||||
err_count = ++(*errors);
|
||||
err_count = ++floppy_errors;
|
||||
INFBOUND(DRWE->badness, err_count);
|
||||
if (err_count > DP->max_errors.abort)
|
||||
cont->done(0);
|
||||
|
|
@ -2200,9 +2199,8 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
|
|||
return -EINVAL;
|
||||
}
|
||||
format_req = *tmp_format_req;
|
||||
format_errors = 0;
|
||||
cont = &format_cont;
|
||||
errors = &format_errors;
|
||||
floppy_errors = 0;
|
||||
ret = wait_til_done(redo_format, true);
|
||||
if (ret == -EINTR)
|
||||
return -EINTR;
|
||||
|
|
@ -2677,7 +2675,7 @@ static int make_raw_rw_request(void)
|
|||
*/
|
||||
if (!direct ||
|
||||
(indirect * 2 > direct * 3 &&
|
||||
*errors < DP->max_errors.read_track &&
|
||||
floppy_errors < DP->max_errors.read_track &&
|
||||
((!probing ||
|
||||
(DP->read_track & (1 << DRS->probed_format)))))) {
|
||||
max_size = blk_rq_sectors(current_req);
|
||||
|
|
@ -2801,10 +2799,11 @@ static int set_next_request(void)
|
|||
current_req = list_first_entry_or_null(&floppy_reqs, struct request,
|
||||
queuelist);
|
||||
if (current_req) {
|
||||
current_req->error_count = 0;
|
||||
floppy_errors = 0;
|
||||
list_del_init(¤t_req->queuelist);
|
||||
return 1;
|
||||
}
|
||||
return current_req != NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void redo_fd_request(void)
|
||||
|
|
@ -2860,7 +2859,6 @@ do_request:
|
|||
_floppy = floppy_type + DP->autodetect[DRS->probed_format];
|
||||
} else
|
||||
probing = 0;
|
||||
errors = &(current_req->error_count);
|
||||
tmp = make_raw_rw_request();
|
||||
if (tmp < 2) {
|
||||
request_done(tmp);
|
||||
|
|
@ -3012,6 +3010,8 @@ static const char *drive_name(int type, int drive)
|
|||
return "(null)";
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_FD_RAWCMD
|
||||
|
||||
/* raw commands */
|
||||
static void raw_cmd_done(int flag)
|
||||
{
|
||||
|
|
@ -3223,6 +3223,35 @@ static int raw_cmd_ioctl(int cmd, void __user *param)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int floppy_raw_cmd_ioctl(int type, int drive, int cmd,
|
||||
void __user *param)
|
||||
{
|
||||
int ret;
|
||||
|
||||
pr_warn_once("Note: FDRAWCMD is deprecated and will be removed from the kernel in the near future.\n");
|
||||
|
||||
if (type)
|
||||
return -EINVAL;
|
||||
if (lock_fdc(drive))
|
||||
return -EINTR;
|
||||
set_floppy(drive);
|
||||
ret = raw_cmd_ioctl(cmd, param);
|
||||
if (ret == -EINTR)
|
||||
return -EINTR;
|
||||
process_fd_request();
|
||||
return ret;
|
||||
}
|
||||
|
||||
#else /* CONFIG_BLK_DEV_FD_RAWCMD */
|
||||
|
||||
static int floppy_raw_cmd_ioctl(int type, int drive, int cmd,
|
||||
void __user *param)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static int invalidate_drive(struct block_device *bdev)
|
||||
{
|
||||
/* invalidate the buffer track to force a reread */
|
||||
|
|
@ -3410,7 +3439,6 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
|
|||
{
|
||||
int drive = (long)bdev->bd_disk->private_data;
|
||||
int type = ITYPE(UDRS->fd_device);
|
||||
int i;
|
||||
int ret;
|
||||
int size;
|
||||
union inparam {
|
||||
|
|
@ -3561,16 +3589,7 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode, unsigned int
|
|||
outparam = UDRWE;
|
||||
break;
|
||||
case FDRAWCMD:
|
||||
if (type)
|
||||
return -EINVAL;
|
||||
if (lock_fdc(drive))
|
||||
return -EINTR;
|
||||
set_floppy(drive);
|
||||
i = raw_cmd_ioctl(cmd, (void __user *)param);
|
||||
if (i == -EINTR)
|
||||
return -EINTR;
|
||||
process_fd_request();
|
||||
return i;
|
||||
return floppy_raw_cmd_ioctl(type, drive, cmd, (void __user *)param);
|
||||
case FDTWADDLE:
|
||||
if (lock_fdc(drive))
|
||||
return -EINTR;
|
||||
|
|
|
|||
Loading…
Reference in a new issue