* [GIT PULL] Driver core patches for 5.3-rc1 @ 2019-07-12 7:36 Greg KH 2019-07-12 7:36 ` Greg KH ` (3 more replies) 0 siblings, 4 replies; 10+ messages in thread From: Greg KH @ 2019-07-12 7:36 UTC (permalink / raw) To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, Stephen Rothwell The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) ---------------------------------------------------------------- Driver Core and debugfs changes for 5.3-rc1 Here is the "big" driver core and debugfs changes for 5.3-rc1 It's a lot of different patches, all across the tree due to some api changes and lots of debugfs cleanups. Because of this, there is going to be some merge issues with your tree at the moment, I'll follow up with the expected resolutions to make it easier for you. Other than the debugfs cleanups, in this set of changes we have: - bus iteration function cleanups (will cause build warnings with s390 and coresight drivers in your tree) - scripts/get_abi.pl tool to display and parse Documentation/ABI entries in a simple way - cleanups to Documenatation/ABI/ entries to make them parse easier due to typos and other minor things - default_attrs use for some ktype users - driver model documentation file conversions to .rst - compressed firmware file loading - deferred probe fixes All of these have been in linux-next for a while, with a bunch of merge issues that Stephen has been patient with me for. Other than the merge issues, functionality is working properly in linux-next :) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---------------------------------------------------------------- Anders Roxell (1): mm/zsmalloc.c: remove unused variable Arnd Bergmann (1): ARM: omap1: remove unused variable Colin Ian King (1): lkdtm: remove redundant initialization of ret Geert Uytterhoeven (2): tools/firmware: Add missing newline at end of file arch_topology: Remove error messages on out-of-memory conditions Greg Kroah-Hartman (53): zswap: ignore debugfs_create_dir() return value trace: no need to check return value of debugfs_create functions blktrace: no need to check return value of debugfs_create functions zsmalloc: no need to check return value of debugfs_create functions mm: kmemleak: no need to check return value of debugfs_create functions hwpoison-inject: no need to check return value of debugfs_create functions sh: no need to check return value of debugfs_create functions fail_function: no need to check return value of debugfs_create functions kprobes: no need to check return value of debugfs_create functions mm: cleancache: no need to check return value of debugfs_create functions backing-dev: no need to check return value of debugfs_create functions x86: xen: no need to check return value of debugfs_create functions arm: omap1: no need to check return value of debugfs_create functions arm: omap2: no need to check return value of debugfs_create functions arm: dump: no need to check return value of debugfs_create functions x86: mm: no need to check return value of debugfs_create functions x86: platform: no need to check return value of debugfs_create functions x86: kdebugfs: no need to check return value of debugfs_create functions gcov: no need to check return value of debugfs_create functions mailbox: no need to check return value of debugfs_create functions btrfs: no need to check return value of debugfs_create functions debugfs: make debugfs_create_u32_array() return void vmw_balloon: no need to check return value of debugfs_create functions lkdtm: no need to check return value of debugfs_create functions ti-st: no need to check return value of debugfs_create functions thermal: intel: no need to check return value of debugfs_create functions thermal: intel_powerclamp: no need to check return value of debugfs_create functions thermal: tegra: no need to check return value of debugfs_create functions cxl: no need to check return value of debugfs_create functions lib: dynamic_debug: no need to check return value of debugfs_create functions fault-inject: clean up debugfs file creation logic mic: no need to check return value of debugfs_create functions genwq: no need to check return value of debugfs_create functions mei: no need to check return value of debugfs_create functions coresight: cpu-debug: no need to check return value of debugfs_create functions watchdog: mei_wdt: no need to check return value of debugfs_create functions watchdog: bcm_kona_wdt: no need to check return value of debugfs_create functions 6lowpan: no need to check return value of debugfs_create functions power: avs: smartreflex: no need to check return value of debugfs_create functions thermal: bcm2835: no need to check return value of debugfs_create functions debugfs: log errors when something goes wrong debugfs: provide pr_fmt() macro lib: 842: no need to check return value of debugfs_create functions nfsd: no need to check return value of debugfs_create functions orangefs: no need to check return value of debugfs_create functions ubifs: no need to check return value of debugfs_create functions sunrpc: no need to check return value of debugfs_create functions ceph: no need to check return value of debugfs_create functions swiotlb: no need to check return value of debugfs_create functions lib: notifier-error-inject: no need to check return value of debugfs_create functions ubifs: fix build warning after debugfs cleanup patch orangefs: fix build warning from debugfs cleanup patch debugfs: make error message a bit more verbose James Morse (1): drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT Kimberly Brown (5): gfs2: replace ktype default_attrs with default_groups ext4: replace ktype default_attrs with default_groups dlm: Replace default_attrs in dlm_ktype with default_groups f2fs: replace ktype default_attrs with default_groups btrfs: sysfs: Replace default_attrs in ktypes with groups Lin Yi (1): lib : kobject: fix refcount imblance on kobject_rename Mauro Carvalho Chehab (20): ABI: fix some syntax issues at the ABI database ABI: sysfs-driver-hid: the "What" field doesn't parse fine ABI: sysfs-class-uwb_rc: remove a duplicated incomplete entry ABI: better identificate tables ABI: sysfs-bus-pci-devices-aer_stats uses an invalid tag ABI: Fix KernelVersion tags drivers: base/node.c: fixes a kernel-doc markups docs: driver-model: convert docs to ReST and rename to *.rst scripts: add an script to parse the ABI files scripts/get_abi.pl: parse files with text at beginning scripts/get_abi.pl: avoid use literal blocks when not needed scripts/get_abi.pl: split label naming from xref logic scripts/get_abi.pl: add support for searching for ABI symbols scripts/get_abi.pl: represent what in tables scripts/get_abi.pl: fix parse issues with some files scripts/get_abi.pl: avoid creating duplicate names scripts/get_abi.pl: add a handler for invalid "where" tag scripts/get_abi.pl: add a validate command doc: ABI scripts: add a SPDX header file ABI: sysfs-driver-mlxreg-io: fix the what fields Nishad Kamdar (2): firmware: ti_sci: Use the correct style for SPDX License Identifier firmware: arm_scmi: Use the correct style for SPDX License Identifier Suzuki K Poulose (7): staging: most-core: Use bus_find_device_by_name mfd: Remove unused helper syscon_regmap_lookup_by_pdevname acpi: utils: Cleanup acpi_dev_match_cb bus_find_device: Unify the match callback with class_find_device driver_find_device: Unify the match function with class_find_device() drivers: Add generic helper to match by of_node drivers: s390/cio: Fix compilation warning about const qualifiers Sven Van Asbroeck (1): firmware: improve LSM/IMA security behaviour Takashi Iwai (6): firmware: Free temporary page table after vmapping firmware: Unify the paged buffer release helper firmware: Use kvmalloc for page tables firmware: Factor out the paged buffer handling code firmware: Add support for loading compressed files selftests: firmware: Add compressed firmware tests Thierry Reding (1): driver: core: Allow subsystems to continue deferring probe .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 2 +- Documentation/ABI/stable/sysfs-driver-mlxreg-io | 45 +- Documentation/ABI/testing/pstore | 4 +- .../testing/sysfs-bus-event_source-devices-format | 4 +- .../ABI/testing/sysfs-bus-i2c-devices-hm6352 | 12 +- .../ABI/testing/sysfs-bus-iio-distance-srf08 | 4 +- .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 4 +- .../ABI/testing/sysfs-bus-pci-devices-aer_stats | 24 +- .../ABI/testing/sysfs-bus-pci-devices-cciss | 44 +- .../ABI/testing/sysfs-bus-usb-devices-usbsevseg | 22 +- .../testing/sysfs-class-backlight-driver-lm3533 | 6 +- Documentation/ABI/testing/sysfs-class-cxl | 6 +- Documentation/ABI/testing/sysfs-class-devfreq | 2 +- .../ABI/testing/sysfs-class-led-driver-lm3533 | 8 +- Documentation/ABI/testing/sysfs-class-leds-gt683r | 4 +- Documentation/ABI/testing/sysfs-class-powercap | 2 +- Documentation/ABI/testing/sysfs-class-uwb_rc | 6 - Documentation/ABI/testing/sysfs-driver-altera-cvp | 2 +- Documentation/ABI/testing/sysfs-driver-hid | 12 +- .../ABI/testing/sysfs-driver-hid-roccat-kone | 2 +- Documentation/ABI/testing/sysfs-driver-ppi | 2 +- Documentation/ABI/testing/sysfs-driver-st | 2 +- Documentation/ABI/testing/sysfs-driver-wacom | 2 +- Documentation/ABI/testing/sysfs-kernel-fscaps | 2 +- Documentation/ABI/testing/sysfs-kernel-vmcoreinfo | 2 +- Documentation/driver-api/gpio/driver.rst | 2 +- .../driver-model/{binding.txt => binding.rst} | 20 +- Documentation/driver-model/{bus.txt => bus.rst} | 69 +-- .../driver-model/{class.txt => class.rst} | 74 ++-- .../{design-patterns.txt => design-patterns.rst} | 106 ++--- .../driver-model/{device.txt => device.rst} | 57 +-- .../driver-model/{devres.txt => devres.rst} | 50 +-- .../driver-model/{driver.txt => driver.rst} | 114 ++--- Documentation/driver-model/index.rst | 26 ++ .../driver-model/{overview.txt => overview.rst} | 37 +- .../driver-model/{platform.txt => platform.rst} | 30 +- .../driver-model/{porting.txt => porting.rst} | 335 +++++++-------- Documentation/eisa.txt | 4 +- Documentation/filesystems/debugfs.txt | 2 +- Documentation/hwmon/submitting-patches.rst | 2 +- arch/arm/include/asm/ptdump.h | 9 +- arch/arm/mach-omap1/clock.c | 64 +-- arch/arm/mach-omap1/pm.c | 7 +- arch/arm/mach-omap2/pm-debug.c | 15 +- arch/arm/mm/dump.c | 4 +- arch/arm/mm/ptdump_debugfs.c | 8 +- arch/powerpc/platforms/pseries/ibmebus.c | 4 +- arch/sh/kernel/kdebugfs.c | 3 - arch/sh/mm/asids-debugfs.c | 11 +- arch/sh/mm/cache-debugfs.c | 20 +- arch/sh/mm/pmb.c | 9 +- arch/sh/mm/tlb-debugfs.c | 20 +- arch/x86/kernel/kdebugfs.c | 60 +-- arch/x86/mm/debug_pagetables.c | 35 +- arch/x86/platform/atom/punit_atom_debug.c | 23 +- arch/x86/platform/intel-quark/imr.c | 14 +- arch/x86/platform/intel/iosf_mbi.c | 21 +- arch/x86/platform/uv/tlb_uv.c | 15 +- arch/x86/xen/debugfs.c | 7 +- arch/x86/xen/p2m.c | 3 - drivers/acpi/acpi_lpss.c | 4 +- drivers/acpi/sleep.c | 2 +- drivers/acpi/utils.c | 11 +- drivers/amba/tegra-ahb.c | 4 +- drivers/base/arch_topology.c | 5 +- drivers/base/bus.c | 6 +- drivers/base/cacheinfo.c | 3 +- drivers/base/core.c | 6 + drivers/base/dd.c | 55 ++- drivers/base/devcon.c | 2 +- drivers/base/driver.c | 4 +- drivers/base/firmware_loader/Kconfig | 18 + drivers/base/firmware_loader/fallback.c | 65 +-- drivers/base/firmware_loader/firmware.h | 16 +- drivers/base/firmware_loader/main.c | 224 +++++++++- drivers/base/node.c | 5 +- drivers/base/platform.c | 2 +- drivers/char/ipmi/ipmi_msghandler.c | 8 +- drivers/char/ipmi/ipmi_si_platform.c | 2 +- drivers/firmware/arm_scmi/common.h | 2 +- drivers/firmware/efi/dev-path-parser.c | 4 +- drivers/firmware/ti_sci.h | 2 +- drivers/fpga/of-fpga-region.c | 7 +- drivers/gpio/gpio-cs5535.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 2 +- drivers/gpu/drm/tegra/dc.c | 4 +- drivers/hwtracing/coresight/coresight-cpu-debug.c | 15 +- drivers/hwtracing/coresight/coresight.c | 6 +- drivers/hwtracing/coresight/of_coresight.c | 2 +- drivers/hwtracing/intel_th/core.c | 5 +- drivers/i2c/busses/i2c-amd-mp2-pci.c | 2 +- drivers/i2c/i2c-core-acpi.c | 4 +- drivers/i2c/i2c-core-of.c | 4 +- drivers/iio/inkern.c | 2 +- drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- drivers/iommu/arm-smmu-v3.c | 2 +- drivers/iommu/arm-smmu.c | 2 +- drivers/mailbox/bcm-flexrm-mailbox.c | 28 +- drivers/mailbox/bcm-pdc-mailbox.c | 8 +- drivers/mfd/altera-sysmgr.c | 4 +- drivers/mfd/syscon.c | 21 - drivers/misc/cxl/cxl.h | 15 +- drivers/misc/cxl/debugfs.c | 36 +- drivers/misc/genwqe/card_base.c | 5 - drivers/misc/genwqe/card_base.h | 2 +- drivers/misc/genwqe/card_debugfs.c | 165 ++------ drivers/misc/genwqe/card_dev.c | 6 +- drivers/misc/lkdtm/core.c | 15 +- drivers/misc/mei/debugfs.c | 47 +-- drivers/misc/mei/main.c | 8 +- drivers/misc/mei/mei_dev.h | 7 +- drivers/misc/mic/card/mic_debugfs.c | 18 +- drivers/misc/mic/cosm/cosm_debugfs.c | 4 - drivers/misc/mic/host/mic_debugfs.c | 4 - drivers/misc/mic/scif/scif_debugfs.c | 5 - drivers/misc/mic/vop/vop_debugfs.c | 4 - drivers/misc/ti-st/st_kim.c | 4 - drivers/misc/vmw_balloon.c | 19 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- drivers/net/ethernet/ti/cpsw-phy-sel.c | 4 +- drivers/net/ethernet/ti/davinci_emac.c | 2 +- drivers/net/ethernet/toshiba/tc35815.c | 4 +- drivers/nvmem/core.c | 2 +- drivers/of/of_mdio.c | 2 +- drivers/of/platform.c | 2 +- drivers/pci/probe.c | 2 +- drivers/pci/search.c | 4 +- drivers/pinctrl/devicetree.c | 7 +- drivers/power/avs/smartreflex.c | 41 +- drivers/s390/cio/ccwgroup.c | 6 +- drivers/s390/cio/chsc_sch.c | 2 +- drivers/s390/cio/css.c | 4 +- drivers/s390/cio/device.c | 10 +- drivers/s390/cio/scm.c | 4 +- drivers/s390/crypto/ap_bus.c | 8 +- drivers/scsi/scsi_proc.c | 2 +- drivers/spi/spi.c | 4 +- drivers/staging/most/core.c | 9 +- drivers/thermal/broadcom/bcm2835_thermal.c | 2 - drivers/thermal/intel/intel_powerclamp.c | 12 +- drivers/thermal/intel/x86_pkg_temp_thermal.c | 25 +- drivers/thermal/tegra/soctherm.c | 14 +- drivers/thunderbolt/switch.c | 4 +- drivers/usb/core/devio.c | 4 +- drivers/usb/core/usb.c | 4 +- drivers/usb/phy/phy-am335x-control.c | 4 +- drivers/usb/phy/phy-isp1301.c | 4 +- drivers/visorbus/visorbus_main.c | 4 +- drivers/watchdog/bcm_kona_wdt.c | 14 +- drivers/watchdog/mei_wdt.c | 30 +- fs/btrfs/sysfs.c | 18 +- fs/ceph/debugfs.c | 24 +- fs/ceph/super.c | 4 +- fs/ceph/super.h | 2 +- fs/debugfs/file.c | 14 +- fs/debugfs/inode.c | 34 +- fs/dlm/lockspace.c | 3 +- fs/ext4/sysfs.c | 6 +- fs/f2fs/sysfs.c | 6 +- fs/gfs2/sys.c | 3 +- fs/nfsd/fault_inject.c | 12 +- fs/nfsd/nfsctl.c | 5 +- fs/nfsd/state.h | 4 +- fs/orangefs/orangefs-debugfs.c | 54 +-- fs/orangefs/orangefs-debugfs.h | 2 +- fs/orangefs/orangefs-mod.c | 6 +- fs/ubifs/debug.c | 169 ++------ fs/ubifs/debug.h | 4 +- fs/ubifs/super.c | 9 +- include/linux/backing-dev-defs.h | 1 - include/linux/ceph/debugfs.h | 4 +- include/linux/cpuhotplug.h | 1 + include/linux/debugfs.h | 12 +- include/linux/device.h | 11 +- include/linux/mfd/syscon.h | 6 - kernel/dma/swiotlb.c | 25 +- kernel/fail_function.c | 23 +- kernel/gcov/fs.c | 24 +- kernel/kprobes.c | 25 +- kernel/trace/blktrace.c | 6 - kernel/trace/trace.c | 4 - lib/842/842_debugfs.h | 5 +- lib/dynamic_debug.c | 12 +- lib/fault-inject.c | 73 ++-- lib/kobject.c | 4 +- lib/notifier-error-inject.c | 13 +- mm/backing-dev.c | 24 +- mm/cleancache.c | 3 +- mm/hwpoison-inject.c | 67 +-- mm/kmemleak.c | 7 +- mm/zsmalloc.c | 24 +- mm/zswap.c | 2 - net/6lowpan/6lowpan_i.h | 16 +- net/6lowpan/core.c | 8 +- net/6lowpan/debugfs.c | 97 ++--- net/ceph/ceph_common.c | 5 +- net/ceph/debugfs.c | 33 +- net/sunrpc/debugfs.c | 66 +-- scripts/coccinelle/free/devm_free.cocci | 2 +- scripts/get_abi.pl | 468 +++++++++++++++++++++ sound/soc/rockchip/rk3399_gru_sound.c | 2 +- tools/firmware/Makefile | 2 +- tools/testing/selftests/firmware/fw_filesystem.sh | 73 +++- tools/testing/selftests/firmware/fw_lib.sh | 7 + tools/testing/selftests/firmware/fw_run_tests.sh | 1 + 206 files changed, 1985 insertions(+), 2235 deletions(-) rename Documentation/driver-model/{binding.txt => binding.rst} (92%) rename Documentation/driver-model/{bus.txt => bus.rst} (76%) rename Documentation/driver-model/{class.txt => class.rst} (75%) rename Documentation/driver-model/{design-patterns.txt => design-patterns.rst} (59%) rename Documentation/driver-model/{device.txt => device.rst} (71%) rename Documentation/driver-model/{devres.txt => devres.rst} (93%) rename Documentation/driver-model/{driver.txt => driver.rst} (75%) create mode 100644 Documentation/driver-model/index.rst rename Documentation/driver-model/{overview.txt => overview.rst} (90%) rename Documentation/driver-model/{platform.txt => platform.rst} (95%) rename Documentation/driver-model/{porting.txt => porting.rst} (62%) create mode 100755 scripts/get_abi.pl ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 7:36 [GIT PULL] Driver core patches for 5.3-rc1 Greg KH @ 2019-07-12 7:36 ` Greg KH 2019-07-12 7:38 ` Greg KH ` (2 subsequent siblings) 3 siblings, 0 replies; 10+ messages in thread From: Greg KH @ 2019-07-12 7:36 UTC (permalink / raw) To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, Stephen Rothwell On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > ---------------------------------------------------------------- > Driver Core and debugfs changes for 5.3-rc1 > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > It's a lot of different patches, all across the tree due to some api > changes and lots of debugfs cleanups. Because of this, there is going > to be some merge issues with your tree at the moment, I'll follow up > with the expected resolutions to make it easier for you. Here's the merge resolution patch that worked for me: diff --cc drivers/acpi/sleep.c index fcf4386ecc78,f0fe7c15d657..000000000000 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c diff --cc drivers/misc/mei/debugfs.c index df6bf8b81936,47cfd5005e1b..000000000000 --- a/drivers/misc/mei/debugfs.c +++ b/drivers/misc/mei/debugfs.c @@@ -233,22 -154,46 +154,21 @@@ void mei_dbgfs_deregister(struct mei_de * * @dev: the mei device structure * @name: the mei device name - * - * Return: 0 on success, <0 on failure. */ -int mei_dbgfs_register(struct mei_device *dev, const char *name) +void mei_dbgfs_register(struct mei_device *dev, const char *name) { - struct dentry *dir, *f; + struct dentry *dir; dir = debugfs_create_dir(name, NULL); - if (!dir) - return -ENOMEM; - dev->dbgfs_dir = dir; - f = debugfs_create_file("meclients", S_IRUSR, dir, - dev, &mei_dbgfs_meclients_fops); - if (!f) { - dev_err(dev->dev, "meclients: registration failed\n"); - goto err; - } - f = debugfs_create_file("active", S_IRUSR, dir, - dev, &mei_dbgfs_active_fops); - if (!f) { - dev_err(dev->dev, "active: registration failed\n"); - goto err; - } - f = debugfs_create_file("devstate", S_IRUSR, dir, - dev, &mei_dbgfs_devstate_fops); - if (!f) { - dev_err(dev->dev, "devstate: registration failed\n"); - goto err; - } - f = debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir, - &dev->allow_fixed_address, - &mei_dbgfs_allow_fa_fops); - if (!f) { - dev_err(dev->dev, "allow_fixed_address: registration failed\n"); - goto err; - } - return 0; -err: - mei_dbgfs_deregister(dev); - return -ENODEV; + debugfs_create_file("meclients", S_IRUSR, dir, dev, - &mei_dbgfs_fops_meclients); ++ &mei_dbgfs_meclients_fops); + debugfs_create_file("active", S_IRUSR, dir, dev, - &mei_dbgfs_fops_active); ++ &mei_dbgfs_active_fops); + debugfs_create_file("devstate", S_IRUSR, dir, dev, - &mei_dbgfs_fops_devstate); ++ &mei_dbgfs_devstate_fops); + debugfs_create_file("allow_fixed_address", S_IRUSR | S_IWUSR, dir, + &dev->allow_fixed_address, - &mei_dbgfs_fops_allow_fa); ++ &mei_dbgfs_allow_fa_fops); } - diff --cc drivers/misc/vmw_balloon.c index fdf5ad757226,043eed845246..000000000000 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@@ -1553,15 -1942,26 +1932,24 @@@ static int __init vmballoon_init(void if (x86_hyper_type != X86_HYPER_VMWARE) return -ENODEV; - for (page_size = VMW_BALLOON_4K_PAGE; - page_size <= VMW_BALLOON_LAST_SIZE; page_size++) - INIT_LIST_HEAD(&balloon.page_sizes[page_size].pages); - - INIT_DELAYED_WORK(&balloon.dwork, vmballoon_work); + error = vmballoon_register_shrinker(&balloon); + if (error) + goto fail; + - error = vmballoon_debugfs_init(&balloon); - if (error) - goto fail; + vmballoon_debugfs_init(&balloon); + /* + * Initialization of compaction must be done after the call to + * balloon_devinfo_init() . + */ + balloon_devinfo_init(&balloon.b_dev_info); + error = vmballoon_compaction_init(&balloon); + if (error) + goto fail; + + INIT_LIST_HEAD(&balloon.huge_pages); spin_lock_init(&balloon.comm_lock); init_rwsem(&balloon.conf_sem); balloon.vmci_doorbell = VMCI_INVALID_HANDLE; * Unmerged path drivers/hwtracing/coresight/of_coresight.c ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 7:36 [GIT PULL] Driver core patches for 5.3-rc1 Greg KH 2019-07-12 7:36 ` Greg KH @ 2019-07-12 7:38 ` Greg KH 2019-07-12 7:40 ` Greg KH 2019-07-12 19:45 ` pr-tracker-bot 3 siblings, 0 replies; 10+ messages in thread From: Greg KH @ 2019-07-12 7:38 UTC (permalink / raw) To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, Stephen Rothwell [-- Attachment #1: Type: text/plain, Size: 1210 bytes --] On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > ---------------------------------------------------------------- > Driver Core and debugfs changes for 5.3-rc1 > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > It's a lot of different patches, all across the tree due to some api > changes and lots of debugfs cleanups. Because of this, there is going > to be some merge issues with your tree at the moment, I'll follow up > with the expected resolutions to make it easier for you. > > Other than the debugfs cleanups, in this set of changes we have: > - bus iteration function cleanups (will cause build warnings > with s390 and coresight drivers in your tree) Here's the s390 patch that was sent previously to resolve this issue. [-- Attachment #2: s390-fixup.patch --] [-- Type: text/plain, Size: 1009 bytes --] From: Christian Borntraeger <borntraeger@de.ibm.com> commit 92ce7e83b4e5 ("driver_find_device: Unify the match function with class_find_device()") changed the prototype of driver_find_device to use a const void pointer. Change match_apqn accordingly. Fixes: ec89b55e3bce ("s390: ap: implement PAPQ AQIC interception in kernel") Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> --- drivers/s390/crypto/vfio_ap_ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c index 2c9fb1423a39..7e85ba7c6ef0 100644 --- a/drivers/s390/crypto/vfio_ap_ops.c +++ b/drivers/s390/crypto/vfio_ap_ops.c @@ -26,7 +26,7 @@ static int vfio_ap_mdev_reset_queues(struct mdev_device *mdev); -static int match_apqn(struct device *dev, void *data) +static int match_apqn(struct device *dev, const void *data) { struct vfio_ap_queue *q = dev_get_drvdata(dev); -- 2.21.0 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 7:36 [GIT PULL] Driver core patches for 5.3-rc1 Greg KH 2019-07-12 7:36 ` Greg KH 2019-07-12 7:38 ` Greg KH @ 2019-07-12 7:40 ` Greg KH 2019-07-12 21:09 ` Nathan Chancellor 2019-07-12 19:45 ` pr-tracker-bot 3 siblings, 1 reply; 10+ messages in thread From: Greg KH @ 2019-07-12 7:40 UTC (permalink / raw) To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, Stephen Rothwell [-- Attachment #1: Type: text/plain, Size: 1207 bytes --] On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > ---------------------------------------------------------------- > Driver Core and debugfs changes for 5.3-rc1 > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > It's a lot of different patches, all across the tree due to some api > changes and lots of debugfs cleanups. Because of this, there is going > to be some merge issues with your tree at the moment, I'll follow up > with the expected resolutions to make it easier for you. > > Other than the debugfs cleanups, in this set of changes we have: > - bus iteration function cleanups (will cause build warnings > with s390 and coresight drivers in your tree) And here is the patch that should resolve the coresight build issue. [-- Attachment #2: coresight.patch --] [-- Type: text/plain, Size: 1558 bytes --] From: Nathan Chancellor <natechancellor@gmail.com> Date: Mon, 1 Jul 2019 11:28:08 -0700 Subject: [PATCH] coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer types passing 'int (struct device *, void *)' to parameter of type 'int (*)(struct device *, const void *)' [-Werror,-Wincompatible-pointer-types] coresight_device_fwnode_match); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/device.h:173:17: note: passing argument to parameter 'match' here int (*match)(struct device *dev, const void *data)); ^ 1 error generated. Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/hwtracing/coresight/coresight-priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 8b07fe55395a..7d401790dd7e 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -202,6 +202,6 @@ static inline void *coresight_get_uci_data(const struct amba_id *id) void coresight_release_platform_data(struct coresight_platform_data *pdata); -int coresight_device_fwnode_match(struct device *dev, void *fwnode); +int coresight_device_fwnode_match(struct device *dev, const void *fwnode); #endif -- 2.22.0 -- Cheers, Stephen Rothwell ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 7:40 ` Greg KH @ 2019-07-12 21:09 ` Nathan Chancellor 2019-07-12 21:37 ` Linus Torvalds 0 siblings, 1 reply; 10+ messages in thread From: Nathan Chancellor @ 2019-07-12 21:09 UTC (permalink / raw) To: Greg KH; +Cc: Linus Torvalds, Andrew Morton, linux-kernel, Stephen Rothwell On Fri, Jul 12, 2019 at 09:40:23AM +0200, Greg KH wrote: > On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 > > > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > > > ---------------------------------------------------------------- > > Driver Core and debugfs changes for 5.3-rc1 > > > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > > > It's a lot of different patches, all across the tree due to some api > > changes and lots of debugfs cleanups. Because of this, there is going > > to be some merge issues with your tree at the moment, I'll follow up > > with the expected resolutions to make it easier for you. > > > > Other than the debugfs cleanups, in this set of changes we have: > > - bus iteration function cleanups (will cause build warnings > > with s390 and coresight drivers in your tree) > > And here is the patch that should resolve the coresight build issue. > > From: Nathan Chancellor <natechancellor@gmail.com> > Date: Mon, 1 Jul 2019 11:28:08 -0700 > Subject: [PATCH] coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const > > drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer types passing 'int (struct device *, void *)' to parameter of type 'int (*)(struct device *, const void *)' [-Werror,-Wincompatible-pointer-types] > coresight_device_fwnode_match); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > include/linux/device.h:173:17: note: passing argument to parameter 'match' here > int (*match)(struct device *dev, const void *data)); > ^ > 1 error generated. > > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > --- > drivers/hwtracing/coresight/coresight-priv.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h > index 8b07fe55395a..7d401790dd7e 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -202,6 +202,6 @@ static inline void *coresight_get_uci_data(const struct amba_id *id) > > void coresight_release_platform_data(struct coresight_platform_data *pdata); > > -int coresight_device_fwnode_match(struct device *dev, void *fwnode); > +int coresight_device_fwnode_match(struct device *dev, const void *fwnode); > > #endif > -- > 2.22.0 > Doesn't look like this made it into the merge, as I currently see that same error with arm64 allyesconfig. Cheers, Nathan ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 21:09 ` Nathan Chancellor @ 2019-07-12 21:37 ` Linus Torvalds 2019-07-12 21:43 ` Linus Torvalds 0 siblings, 1 reply; 10+ messages in thread From: Linus Torvalds @ 2019-07-12 21:37 UTC (permalink / raw) To: Nathan Chancellor Cc: Greg KH, Andrew Morton, Linux List Kernel Mailing, Stephen Rothwell On Fri, Jul 12, 2019 at 2:09 PM Nathan Chancellor <natechancellor@gmail.com> wrote: > > Doesn't look like this made it into the merge, as I currently see that > same error with arm64 allyesconfig. Duh. Because I had fixed up the actual definition of that function during the merge, I thought I had handled it all correctly. ... and entirely missed that the patch was for the declaration in the header file. My bad. Will apply the fix properly. Linus ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 21:37 ` Linus Torvalds @ 2019-07-12 21:43 ` Linus Torvalds 2019-07-12 21:45 ` Nathan Chancellor 2019-07-13 15:23 ` Greg KH 0 siblings, 2 replies; 10+ messages in thread From: Linus Torvalds @ 2019-07-12 21:43 UTC (permalink / raw) To: Nathan Chancellor Cc: Greg KH, Andrew Morton, Linux List Kernel Mailing, Stephen Rothwell On Fri, Jul 12, 2019 at 2:37 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > My bad. Will apply the fix properly. Ok, _now_ your fix is finally in my tree. D'oh. Linus ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 21:43 ` Linus Torvalds @ 2019-07-12 21:45 ` Nathan Chancellor 2019-07-13 15:23 ` Greg KH 1 sibling, 0 replies; 10+ messages in thread From: Nathan Chancellor @ 2019-07-12 21:45 UTC (permalink / raw) To: Linus Torvalds Cc: Greg KH, Andrew Morton, Linux List Kernel Mailing, Stephen Rothwell On Fri, Jul 12, 2019 at 02:43:28PM -0700, Linus Torvalds wrote: > On Fri, Jul 12, 2019 at 2:37 PM Linus Torvalds > <torvalds@linux-foundation.org> wrote: > > > > My bad. Will apply the fix properly. > > Ok, _now_ your fix is finally in my tree. D'oh. > > Linus Great, thank you for the quick response! :) Nathan ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 21:43 ` Linus Torvalds 2019-07-12 21:45 ` Nathan Chancellor @ 2019-07-13 15:23 ` Greg KH 1 sibling, 0 replies; 10+ messages in thread From: Greg KH @ 2019-07-13 15:23 UTC (permalink / raw) To: Linus Torvalds Cc: Nathan Chancellor, Andrew Morton, Linux List Kernel Mailing, Stephen Rothwell On Fri, Jul 12, 2019 at 02:43:28PM -0700, Linus Torvalds wrote: > On Fri, Jul 12, 2019 at 2:37 PM Linus Torvalds > <torvalds@linux-foundation.org> wrote: > > > > My bad. Will apply the fix properly. > > Ok, _now_ your fix is finally in my tree. D'oh. Thanks for fixing this up, sorry for the pain, this was a tough merge for some reason... greg k-h ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [GIT PULL] Driver core patches for 5.3-rc1 2019-07-12 7:36 [GIT PULL] Driver core patches for 5.3-rc1 Greg KH ` (2 preceding siblings ...) 2019-07-12 7:40 ` Greg KH @ 2019-07-12 19:45 ` pr-tracker-bot 3 siblings, 0 replies; 10+ messages in thread From: pr-tracker-bot @ 2019-07-12 19:45 UTC (permalink / raw) To: Greg KH; +Cc: Linus Torvalds, Andrew Morton, linux-kernel, Stephen Rothwell The pull request you sent on Fri, 12 Jul 2019 09:36:23 +0200: > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/driver-core-5.3-rc1 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/f632a8170a6b667ee4e3f552087588f0fe13c4bb Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-07-13 15:23 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-12 7:36 [GIT PULL] Driver core patches for 5.3-rc1 Greg KH 2019-07-12 7:36 ` Greg KH 2019-07-12 7:38 ` Greg KH 2019-07-12 7:40 ` Greg KH 2019-07-12 21:09 ` Nathan Chancellor 2019-07-12 21:37 ` Linus Torvalds 2019-07-12 21:43 ` Linus Torvalds 2019-07-12 21:45 ` Nathan Chancellor 2019-07-13 15:23 ` Greg KH 2019-07-12 19:45 ` pr-tracker-bot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).