Changes in Makefile

f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 - Merge drm/drm-next into drm-misc-next

Tue, 16 Mar 2021 09:06:23 +0100

Merge drm/drm-next into drm-misc-nextNoralf needs some patches in 5.12-rc3, and we've been delaying the 5.12merge due to the swap issue so it looks like a good time.Signed-off-by: Maxime Ripard List of files: /linux/drivers/phy/ingenic/Makefile

35bb28ece90dfb7f72b77ba529f25f79323d9581 - Merge drm/drm-next into drm-intel-next

Thu, 11 Mar 2021 07:19:46 +0100

Merge drm/drm-next into drm-intel-nextSync up with upstream.Signed-off-by: Jani Nikula List of files: /linux/drivers/phy/ingenic/Makefile

cdd38c5f1ce4398ec58fec95904b75824daab7b5 - Merge remote-tracking branch 'net/master'

Wed, 24 Feb 2021 13:36:58 +0100

Merge remote-tracking branch 'net/master' List of files: /linux/drivers/phy/ingenic/Makefile

d6310078d9f8c416e85f641a631aecf58f9c97ff - Merge branch 'for-5.12/google' into for-linus

Tue, 23 Feb 2021 11:33:13 +0100

Merge branch 'for-5.12/google' into for-linus- User experience improvements for hid-google from Nicolas Boichat List of files: /linux/drivers/phy/ingenic/Makefile

cbecf716ca618fd44feda6bd9a64a8179d031fc5 - Merge branch 'next' into for-linus

Tue, 23 Feb 2021 06:35:15 +0100

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

415e915fdfc775ad0c6675fde1008f6f43dd6251 - Merge tag 'v5.11' into next

Tue, 23 Feb 2021 06:21:03 +0100

Merge tag 'v5.11' into nextMerge with mainline to get latest APIs and device tree bindings. List of files: /linux/drivers/phy/ingenic/Makefile

7289e26f395b583f68b676d4d12a0971e4f6f65c - Merge tag 'v5.11' into rdma.git for-next

Thu, 18 Feb 2021 16:17:24 +0100

Merge tag 'v5.11' into rdma.git for-nextLinux 5.11Merged to resolve conflicts with RDMA rc commits- drivers/infiniband/sw/rxe/rxe_net.c The final logic is to call rxe_get_dev_from_net() again with the master netdev if the packet was rx'd on a vlan. To keep the elimination of the local variables requires a trivial edit to the code in -rcLink: https://lore.kernel.org/r/20210210131542.215ea67c@canb.auug.org.auSigned-off-by: Jason Gunthorpe List of files: /linux/drivers/phy/ingenic/Makefile

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

Wed, 17 Feb 2021 21:16:27 +0100

Merge tag 'asoc-v5.12' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linusASoC: Updates for v5.12Another quiet release in terms of features, though several of thedrivers got quite a bit of work and there were a lot of general changesresulting from Morimoto-san's ongoing cleanup work. - As ever, lots of hard work by Morimoto-san cleaning up the code and making it more consistent. - Many improvements in the Intel drivers including a wide range of quirks and bug fixes. - A KUnit testsuite for the topology code. - Support for Ingenic JZ4760(B), Intel AlderLake-P, DT configured nVidia cards, Qualcomm lpass-rx-macro and lpass-tx-macro - Removal of obsolete SIRF prima/atlas, Txx9 and ZTE zx drivers. List of files: /linux/drivers/phy/ingenic/Makefile

ed3cd45f8ca873dd320ff7e6b4c1c8f83a65302c - Merge tag 'v5.11' into sched/core, to pick up fixes & refresh the branch

Wed, 17 Feb 2021 14:04:39 +0100

Merge tag 'v5.11' into sched/core, to pick up fixes & refresh the branchSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/ingenic/Makefile

acc3a645ef4bb301366a609730df3cd6a52154a1 - Merge branches 'pm-cpuidle' and 'pm-cpufreq'

Mon, 15 Feb 2021 17:00:22 +0100

Merge branches 'pm-cpuidle' and 'pm-cpufreq'* pm-cpuidle: MAINTAINERS: cpuidle: exynos: include header in file pattern intel_idle: remove definition of DEBUG* pm-cpufreq: cpufreq: Remove unused flag CPUFREQ_PM_NO_WARN cpufreq: Remove CPUFREQ_STICKY flag cpufreq: intel_pstate: Remove repeated word cpufreq: remove tango driver cpufreq: brcmstb-avs-cpufreq: Fix resource leaks in ->remove() cpufreq: brcmstb-avs-cpufreq: Free resources in error path cpufreq: qcom-hw: enable boost support cpufreq: tegra20: Use resource-managed API cpufreq: intel_pstate: Get per-CPU max freq via MSR_HWP_CAPABILITIES if available cpufreq: intel_pstate: Rename two functions cpufreq: intel_pstate: Change intel_pstate_get_hwp_max() argument cpufreq: intel_pstate: Always read hwp_cap_cached with READ_ONCE() List of files: /linux/drivers/phy/ingenic/Makefile

857de6fe2f86b009df620f7cdb07c262cc17070d - Merge branch 'fixes-v5.11' into fixes

Mon, 15 Feb 2021 05:41:56 +0100

Merge branch 'fixes-v5.11' into fixes List of files: /linux/drivers/phy/ingenic/Makefile

a3251c1a36f595046bea03935ebe37a1e1f1f1d7 - Merge branch 'x86/paravirt' into x86/entry

Fri, 12 Feb 2021 13:36:43 +0100

Merge branch 'x86/paravirt' into x86/entryMerge in the recent paravirt changes to resolve conflicts causedby objtool annotations.Conflicts: arch/x86/xen/xen-asm.SSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/ingenic/Makefile

62137364e3e8afcc745846c5c67cacf943149073 - Merge branch 'linus' into locking/core, to pick up upstream fixes

Fri, 12 Feb 2021 12:54:51 +0100

Merge branch 'linus' into locking/core, to pick up upstream fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/phy/ingenic/Makefile

9d4d8572a539ef807e21c196f145aa365fd52f0e - Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable

Tue, 02 Feb 2021 15:37:25 +0100

Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stableTag for adaptions to struct amba_driver::remove changing prototype List of files: /linux/drivers/phy/ingenic/Makefile

0b9112a58836ad6a7e84eebec06a2de9778b7573 - Merge tag 'v5.11-rc6' into patchwork

Mon, 01 Feb 2021 10:03:45 +0100

Merge tag 'v5.11-rc6' into patchworkLinux 5.11-rc6* tag 'v5.11-rc6': (1466 commits) Linux 5.11-rc6 leds: rt8515: Add Richtek RT8515 LED driver dt-bindings: leds: Add DT binding for Richtek RT8515 leds: trigger: fix potential deadlock with libata leds: leds-ariel: convert comma to semicolon leds: leds-lm3533: convert comma to semicolon dt-bindings: Cleanup standard unit properties soc: litex: Properly depend on HAS_IOMEM tty: avoid using vfs_iocb_iter_write() for redirected console writes null_blk: cleanup zoned mode initialization cifs: fix dfs domain referrals drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors drm/nouveau/kms/nv50-: Report max cursor size to userspace drivers/nouveau/kms/nv50-: Reject format modifiers for cursor planes drm/nouveau/svm: fail NOUVEAU_SVM_INIT ioctl on unsupported devices drm/nouveau/dispnv50: Restore pushing of all data. io_uring: reinforce cancel on flush during exit cifs: returning mount parm processing errors correctly rxrpc: Fix memory leak in rxrpc_lookup_local mlxsw: spectrum_span: Do not overwrite policer configuration ... List of files: /linux/drivers/phy/ingenic/Makefile

c358f95205ff472fb3960a5659304774983ec1c5 - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Fri, 29 Jan 2021 02:09:31 +0100

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netdrivers/net/can/dev.c b552766c872f ("can: dev: prevent potential information leak in can_fill_info()") 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir") 0a042c6ec991 ("can: dev: move netlink related code into seperate file") Code move.drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c 57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when the interface is down") 214baf22870c ("net/mlx5e: Support HTB offload") Adjacent code changesnet/switchdev/switchdev.c 20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP") ffb68fc58e96 ("net: switchdev: remove the transaction structure from port object notifiers") bae33f2b5afe ("net: switchdev: remove the transaction structure from port attributes") Transaction parameter gets dropped otherwise keep the fix.Signed-off-by: Jakub Kicinski List of files: /linux/drivers/phy/ingenic/Makefile

2e7f3db5d886701c2a31219530845f642fe700d9 - Merge tag 'v5.11-rc5' into i2c/for-5.12

Thu, 28 Jan 2021 10:03:25 +0100

Merge tag 'v5.11-rc5' into i2c/for-5.12Linux 5.11-rc5 List of files: /linux/drivers/phy/ingenic/Makefile

70f0ba9f2435c1f8693a6d958d8f9cf95e80d94e - Merge remote-tracking branch 'torvalds/master' into perf/core

Wed, 27 Jan 2021 20:48:04 +0100

Merge remote-tracking branch 'torvalds/master' into perf/coreTo pick up fixes.Signed-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/phy/ingenic/Makefile

1d6a81519d9d27b99bca638d14eca63c31111afd - Merge v5.11-rc5 into usb-next

Mon, 25 Jan 2021 11:23:27 +0100

Merge v5.11-rc5 into usb-nextWe need the fixes in here and this resolves a merge issue withdrivers/usb/gadget/udc/bdc/Kconfig.Signed-off-by: Greg Kroah-Hartman List of files: /linux/drivers/phy/ingenic/Makefile

0f8b29fabacbcf0e617896c7ea832b7ea2ef2406 - Merge 5.11-rc5 into tty-next

Mon, 25 Jan 2021 11:19:46 +0100

Merge 5.11-rc5 into tty-nextWe need the fixes in here and this resolves a merge issue indrivers/tty/tty_io.cSigned-off-by: Greg Kroah-Hartman List of files: /linux/drivers/phy/ingenic/Makefile