Changes in Makefile

ead5d1f4d877e92c051e1a1ade623d0d30e71619 - Merge branch 'master' into for-next

Tue, 01 Sep 2020 14:19:48 +0200

Merge branch 'master' into for-nextSync with Linus' branch in order to be able to apply fixupsof more recent patches. List of files: /linux/drivers/staging/octeon/Makefile

9e8238020c5beba64e7ffafbb7ea0fb02fe68270 - Merge branch 'next' into for-linus

Sat, 08 Aug 2020 01:41:01 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.9 merge window. List of files: /linux/drivers/staging/octeon/Makefile

9b031c86506cef9acae45e61339fcf9deaabb793 - Merge branch 'elan-i2c' into next

Wed, 22 Jul 2020 04:02:33 +0200

Merge branch 'elan-i2c' into nextBring in update to Elan touchpad driver to support newer touchpads withhigher resolution. List of files: /linux/drivers/staging/octeon/Makefile

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/drivers/staging/octeon/Makefile

1f422417945d08731e2915e0addb976f11b3a85a - Merge branch 'timers/drivers/timer-ti' into timers/drivers/next

Sat, 23 May 2020 00:01:13 +0200

Merge branch 'timers/drivers/timer-ti' into timers/drivers/next List of files: /linux/drivers/staging/octeon/Makefile

68f0f2690e183306b52671a9ad09fb31808b0500 - Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Mon, 11 May 2020 22:54:30 +0200

Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcuPull RCU updates from Paul McKenney: 1. Miscellaneous fixes. 2. kfree_rcu() updates. 3. Remove scheduler locking restriction 4. RCU-tasks update, including addition of RCU Tasks Trace for BPF use and RCU Tasks Rude. (This branch is on top of #3 due to overlap of changed code.) 5. RCU CPU stall warning updates. 6. Torture-test updates. List of files: /linux/drivers/staging/octeon/Makefile

4353dd3b70783ebbc83fcf12d9c0af3fbab0223b - Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core

Sat, 25 Apr 2020 10:25:02 +0200

Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/corePull EFI changes for v5.8 from Ard Biesheuvel:"- preliminary changes for RISC-V - add support for setting the resolution on the EFI framebuffer - simplify kernel image loading for arm64 - Move .bss into .data via the linker script instead of relying on symbol annotations. - Get rid of __pure getters to access global variables - Clean up the config table matching arrays"Signed-off-by: Ingo Molnar List of files: /linux/drivers/staging/octeon/Makefile

36dbae9945322e660795e73ffc8ed8ae4f25d13d - Merge branch 'topic/nhlt' into for-next

Fri, 24 Apr 2020 08:22:16 +0200

Merge branch 'topic/nhlt' into for-nextMerge NHLT init cleanup.Signed-off-by: Takashi Iwai List of files: /linux/drivers/staging/octeon/Makefile

41d91ec3de8a90167159275bde7ed65768723556 - Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7

Wed, 22 Apr 2020 09:51:44 +0200

Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into asoc-5.7ASoC: tegra: Fixes for v5.7-rc3This contains a couple of fixes that are needed to properly reconfigurethe audio clocks on older Tegra devices. List of files: /linux/drivers/staging/octeon/Makefile

175ae3ad59ab3459652bd2ae3bbc1785aeba1bf3 - Merge branch 'fixes-v5.7' into fixes

Tue, 21 Apr 2020 18:36:03 +0200

Merge branch 'fixes-v5.7' into fixes List of files: /linux/drivers/staging/octeon/Makefile

08d99b2c23dfa84ca5b5e5c194062a0550888b71 - Merge drm/drm-next into drm-misc-next

Fri, 17 Apr 2020 08:12:22 +0200

Merge drm/drm-next into drm-misc-nextBackmerging required to pull topic/phy-compliance.Signed-off-by: Thomas Zimmermann List of files: /linux/drivers/staging/octeon/Makefile

2b703bbda2713fd2a7d98029ea6c44f9c3159f34 - Merge drm/drm-next into drm-intel-next-queued

Thu, 16 Apr 2020 13:35:16 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging in order to pull "topic/phy-compliance".Signed-off-by: Joonas Lahtinen List of files: /linux/drivers/staging/octeon/Makefile

a4721ced760684d1776bf31f7925aa41bb3f4846 - Merge v5.7-rc1 into drm-misc-fixes

Tue, 14 Apr 2020 09:19:50 +0200

Merge v5.7-rc1 into drm-misc-fixesStart the new drm-misc-fixes cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/staging/octeon/Makefile

3b02a051d25d9600e9d403ad3043aed7de00160e - Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Mon, 13 Apr 2020 09:44:39 +0200

Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refreshResolve these conflicts: arch/x86/Kconfig arch/x86/kernel/MakefileDo a minor "evil merge" to move the KCSAN entry up a bit by a few linesin the Kconfig to reduce the probability of future conflicts.Signed-off-by: Ingo Molnar List of files: /linux/drivers/staging/octeon/Makefile

4c6ef3b156c67e8867e04668cb2af902d44e4086 - Merge tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Mon, 30 Mar 2020 23:20:41 +0200

Merge tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/stagingPull staging and IIO driver updates from Greg KH: "Here is the big staging and IIO driver pull request for 5.7-rc1. We again end up deleting more code than we added here, thanks to finally getting rid of the old and obsolete wireless USB stuff, and the exfat code (which is coming in again through the vfs tree in a much cleaner version). But some code does come back, with the octeon drivers being found to actually be used in the wild, so those deletions are now reverted. Other than those major things, just loads and loads of tiny checkpatch cleanups all over the place, along with new IIO drivers and fixes. All have been in linux-next with no reported issues"[ Stephen Rothwell points out some reported issues due to merge conflicts ]* tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (415 commits) staging: vt6656: Use DIV_ROUND_UP macro instead of specific code staging: remove hp100 driver staging: wilc1000: Use crc7 in lib/ rather than a private copy Staging: rtl8192u: ieee80211: Use netdev_alert(). Staging: rtl8192u: ieee80211: Use netdev_info() with network devices. Staging: rtl8192u: ieee80211: Use netdev_warn() for network devices. Staging: rtl8192u: ieee80211: Use netdev_dbg() for debug messages. staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback staging: rtl8723bs: hal: Remove NULL check before kfree staging: rtl8723bs: hal: Correct typos in comments staging: rtl8723bs: os_dep: Correct typos in comments staging: rtl8723bs: core: Correct typos in comments staging: rtl8723bs: hal: Remove unnecessary cast on void pointer staging: rtl8188eu: cleanup long line in odm.c staging: rtl8723bs: hal: Compress return logic staging: rtl8723bs: rtw_cmd: Compress lines for immediate return staging: rtl8723bs: rtw_efuse: Compress lines for immediate return staging: wilc1000: remove label from examples in DT binding documentation staging: rtl8723bs: Remove blank line before '}' brace Staging: rtl8188eu: hal: Add space around operators ... List of files: /linux/drivers/staging/octeon/Makefile

422d97b8b05ed38cc5f67522ddb821868ea272a7 - Revert "staging: octeon: delete driver"

Wed, 05 Feb 2020 01:11:12 +0100

Revert "staging: octeon: delete driver"This reverts commit 710d7fbe21ee2ceab121f1f84a20edf68f9f9742.Re-instate the code so subsequent commits can clean it up and get itbuilding properly.Signed-off-by: Chris Packham Link: https://lore.kernel.org/r/20200205001116.14096-3-chris.packham@alliedtelesis.co.nzSigned-off-by: Greg Kroah-Hartman List of files: /linux/drivers/staging/octeon/Makefile

552c69b36ebd966186573b9c7a286b390935cce1 - Merge tag 'v4.17-rc3' into apparmor-next

Wed, 02 May 2018 09:38:52 +0200

Merge tag 'v4.17-rc3' into apparmor-nextLinux v4.17-rc3Merge in v4.17 for LSM updatesSigned-off-by: John Johansen List of files: /linux/drivers/staging/octeon/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.17 merge window. List of files: /linux/drivers/staging/octeon/Makefile

c6380ecd8e9bee7aba3d9a5a94b58168244c4a61 - Merge tag 'v4.16-rc4' into next

Thu, 08 Mar 2018 20:07:30 +0100

Merge tag 'v4.16-rc4' into nextSync up with mainline to bring in RAVE MFD device core. List of files: /linux/drivers/staging/octeon/Makefile

5fe9cfbe44b6892e17f803125c4761221b0175c6 - Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Wed, 07 Mar 2018 13:57:24 +0100

Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.16-rc4 List of files: /linux/drivers/staging/octeon/Makefile