Changes in Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/phy/allwinner/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/allwinner/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.6 merge window. List of files: /linux/drivers/phy/allwinner/Makefile

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/drivers/phy/allwinner/Makefile

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/phy/allwinner/Makefile

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/drivers/phy/allwinner/Makefile

2040cf9f59037aa8aec749363e69ead165b67b43 - Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Tue, 10 Dec 2019 10:11:00 +0100

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflictsSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/allwinner/Makefile

4f797f56c3786e2c6bc542b3f80e9a599b073976 - Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Sun, 08 Dec 2019 14:37:10 +0100

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/allwinner/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/drivers/phy/allwinner/Makefile

8f56e4ebe05c26c30e167519273843476e39e244 - Merge tag 'char-misc-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Wed, 27 Nov 2019 19:53:50 +0100

Merge tag 'char-misc-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-miscPull char/misc driver updates from Greg KH: "Here is the big set of char/misc and other driver patches for 5.5-rc1 Loads of different things in here, this feels like the catch-all of driver subsystems these days. Full details are in the shortlog, but nothing major overall, just lots of driver updates and additions. All of these have been in linux-next for a while with no reported issues"* tag 'char-misc-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (198 commits) char: Fix Kconfig indentation, continued habanalabs: add more protection of device during reset habanalabs: flush EQ workers in hard reset habanalabs: make the reset code more consistent habanalabs: expose reset counters via existing INFO IOCTL habanalabs: make code more concise habanalabs: use defines for F/W files habanalabs: remove prints on successful device initialization habanalabs: remove unnecessary checks habanalabs: invalidate MMU cache only once habanalabs: skip VA block list update in reset flow habanalabs: optimize MMU unmap habanalabs: prevent read/write from/to the device during hard reset habanalabs: split MMU properties to PCI/DRAM habanalabs: re-factor MMU masks and documentation habanalabs: type specific MMU cache invalidation habanalabs: re-factor memory module code habanalabs: export uapi defines to user-space habanalabs: don't print error when queues are full habanalabs: increase max jobs number to 512 ... List of files: /linux/drivers/phy/allwinner/Makefile

7383092c4d4c106e09caffaba5eb91f96f48a949 - Merge tag 'phy-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into char-misc-next

Thu, 07 Nov 2019 09:25:29 +0100

Merge tag 'phy-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into char-misc-nextKishon writes:phy: for 5.5 *) Add a new PHY driver for USB3 PHY on Allwinner H6 SoC *) Add a new PHY driver for Innosilicon Video Combo PHY(MIPI/LVDS/TTL) *) Add support in xusb-tegra210 PHY driver to get USB device mode functional in Tegra 210 *) Add support for SM8150 QMP UFS PHY in phy-qcom-qmp PHY driver *) Fix smatch warning (array off by one) in phy-rcar-gen2 PHY driver *) Enable mac tx internal delay for rgmii-rxid in phy-gmii-sel driver *) Fix phy-qcom-usb-hs from registering multiple extcon notifiers during PHY power cycle *) Use devm_platform_ioremap_resource() in phy-mvebu-a3700-utmi, phy-hisi-inno-usb2, phy-histb-combphy and regulator_bulk_set_supply_names() in xusb to simplify code *) Remove unused variable in xusb-tegra210 and phy-dm816x-usb *) Fix sparse warnings in phy-brcm-usb-initSigned-off-by: Kishon Vijay Abraham I * tag 'phy-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy: (28 commits) phy: phy-rockchip-inno-usb2: add phy description for px30 phy: qcom-usb-hs: Fix extcon double register after power cycle phy: renesas: phy-rcar-gen2: Fix the array off by one warning phy: lantiq: vrx200-pcie: fix error return code in ltq_vrx200_pcie_phy_power_on() dt-bindings: phy: add yaml binding for rockchip,px30-dsi-dphy phy/rockchip: Add support for Innosilicon MIPI/LVDS/TTL PHY phy: add PHY_MODE_LVDS phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoC dt-bindings: Add bindings for USB3 phy on Allwinner H6 phy: qcom-qmp: Add SM8150 QMP UFS PHY support dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy compatible string phy: ti: gmii-sel: fix mac tx internal delay for rgmii-rxid phy: tegra: use regulator_bulk_set_supply_names() phy: ti: dm816x: remove set but not used variable 'phy_data' phy: renesas: rcar-gen3-usb2: Fix sysfs interface of "role" phy: tegra: xusb: Add vbus override support on Tegra186 phy: tegra: xusb: Add vbus override support on Tegra210 phy: tegra: xusb: Add usb3 port fake support on Tegra210 phy: tegra: xusb: Add XUSB dual mode support on Tegra210 dt-bindings: rcar-gen3-phy-usb3: Add r8a774b1 support ... List of files: /linux/drivers/phy/allwinner/Makefile

a228890f94586c2f8417831c228ac8ed955ef856 - phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoC

Tue, 29 Oct 2019 21:17:39 +0100

phy: allwinner: add phy driver for USB3 PHY on Allwinner H6 SoCAllwinner H6 SoC contains a USB3 PHY (with USB2 DP/DM lines alsocontrolled).Add a driver for it.The register operations in this driver is mainly extracted from the BSPUSB3 driver.Signed-off-by: Ondrej Jirman Signed-off-by: Icenowy Zheng Reviewed-by: Chen-Yu Tsai Acked-by: Maxime Ripard Signed-off-by: Kishon Vijay Abraham I List of files: /linux/drivers/phy/allwinner/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/phy/allwinner/Makefile

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2 - Merge branch 'next' into for-linus

Sat, 20 Jul 2019 06:07:56 +0200

Merge branch 'next' into for-linusPrepare second round of input updates for 5.3 merge window. List of files: /linux/drivers/phy/allwinner/Makefile

ecb41832bd2a7a3f8ac93527cec5e51e3827daed - Merge tag 'v5.2' into next

Mon, 15 Jul 2019 18:42:32 +0200

Merge tag 'v5.2' into nextSync up with mainline to resolve conflicts in iforce driver. List of files: /linux/drivers/phy/allwinner/Makefile

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 08:24:10 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.3 merge window. List of files: /linux/drivers/phy/allwinner/Makefile

74acee309fb2a434dce215d44014e6f8e06975ae - Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus

Wed, 10 Jul 2019 01:39:57 +0200

Merge branches 'for-5.2/fixes', 'for-5.3/doc', 'for-5.3/ish', 'for-5.3/logitech' and 'for-5.3/wacom' into for-linus List of files: /linux/drivers/phy/allwinner/Makefile

3c53c6255d598db7084c5c3d7553d7200e857818 - Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

Mon, 08 Jul 2019 14:45:20 +0200

Merge tag 'asoc-v5.3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.3This is a very big update, mainly thanks to Morimoto-san's refactoringwork and some fairly large new drivers. - Lots more work on moving towards a component based framework from Morimoto-san. - Support for force disconnecting muxes from Jerome Brunet. - New drivers for Cirrus Logic CS47L35, CS47L85 and CS47L90, Conexant CX2072X, Realtek RT1011 and RT1308.Signed-off-by: Takashi Iwai List of files: /linux/drivers/phy/allwinner/Makefile

1d2af80d581d1bae81594e497cd57e345235b940 - Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/next

Sat, 06 Jul 2019 22:51:56 +0200

Merge tag 'nand/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux into mtd/nextNAND core changes:- use longest matching pattern in ->exec_op() default parser- export NAND operation tracer- add flag to indicate panic_write in MTD- use kzalloc() instead of kmalloc() and memset()Raw NAND controller drivers changes:- brcmnand: * fix BCH ECC layout for large page NAND parts * fallback to detected ecc-strength, ecc-step-size * when oops in progress use pio and interrupt polling * code refactor code to introduce helper functions * add support for v7.3 controller- FSMC: * use nand_op_trace for operation tracing- GPMI: * move all driver code into single file * various cleanups (including dmaengine changes) * use runtime PM to manage clocks * implement exec_op- MTK: * correct low level time calculation of r/w cycle * improve data sampling timing for read cycle * add validity check for CE# pin setting * fix wrongly assigned OOB buffer pointer issue * re-license MTK NAND driver as Dual MIT/GPL- STM32: * manage the get_irq error case * increase DMA completion timeoutsRaw NAND chips drivers changes:- Macronix: add read-retry supportOnenand driver changes:- add support for 8Gb datasize chips- avoid fall-through warningsSPI-NAND changes:- define macros for page-read ops with three-byte addresses- add support for two-byte device IDs and then for GigaDevice GD5F1GQ4UFxxG- add initial support for Paragon PN26G0xA- handle the case where the last page read has bitflips List of files: /linux/drivers/phy/allwinner/Makefile

371bb62158d53c1fc33e2fb9b6aeb9522caf6cf4 - Merge tag 'v5.2-rc6' into rdma.git for-next

Sat, 29 Jun 2019 02:18:23 +0200

Merge tag 'v5.2-rc6' into rdma.git for-nextFor dependencies in next patches.Resolve conflicts:- Use uverbs_get_cleared_udata() with new cq allocation flow- Continue to delete nes despite SPDX conflict- Resolve list appends in mlx5_command_str()- Use u16 for vport_rule stuff- Resolve list appends in struct ib_clientSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/phy/allwinner/Makefile