Changes in Makefile

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

Thu, 20 Feb 2020 08:23:37 +0000

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/w1/slaves/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 01:42:33 +0000

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

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

Fri, 10 Jan 2020 22:56:04 +0000

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

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

Mon, 06 Jan 2020 09:35:33 +0000

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/w1/slaves/Makefile

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

Mon, 30 Dec 2019 07:10:51 +0000

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/w1/slaves/Makefile

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

Wed, 11 Dec 2019 08:35:37 +0000

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/w1/slaves/Makefile

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

Tue, 10 Dec 2019 09:11:00 +0000

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

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

Sun, 08 Dec 2019 13:37:10 +0000

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

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 21:16:58 +0000

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/w1/slaves/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 18:53:50 +0000

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/w1/slaves/Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 21:26:56 +0000

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/drivers/w1/slaves/Makefile

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 08:00:45 +0000

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/w1/slaves/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 09:30:50 +0000

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/w1/slaves/Makefile

c6bf3842a34abe3ec2f5bc81754883689aea6c0d - w1: new driver. DS2430 chip

Sat, 19 Oct 2019 20:40:15 +0000

w1: new driver. DS2430 chipadd support for ds2430, 1 page, 256bit (32bytes) eeprom(family 0x14).Tests done:32 bytes dump:x@y:~# hexdump -C -n 32 /sys/bus/w1/devices/14-00000158556e/eeprom00000000 39 39 0a 00 00 36 0a ff ff ff ff ff ff ff ff ff00000010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff0000002034 bytes dump: 32 only displayedx@y:~# hexdump -C -n 34 /sys/bus/w1/devices/14-00000158556e/eeprom00000000 39 39 0a 00 00 36 0a ff ff ff ff ff ff ff ff ff00000010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff00000020pattern write:x@y:~# echo 123456789 > /sys/bus/w1/devices/14-00000158556e/eepromx@y:~# hexdump -C -n 54 /sys/bus/w1/devices/14-00000158556e/eeprom00000000 31 32 33 34 35 36 37 38 39 0a ff ff ff ff ff ff00000010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff00000020specific address 1-byte writex@y:~# dd if=/dev/zero of=/sys/bus/w1/devices/14-00000158556e/eeprom \ count=1 bs=1 seek=41+0 records in1+0 records outx@y:~# hexdump -C -n 54 /sys/bus/w1/devices/14-00000158556e/eeprom00000000 31 32 33 34 00 36 37 38 39 0a ff ff ff ff ff ff00000010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff00000020writing binary blockx@y:~# cat dump-128bytes.bin > /sys/bus/w1/devices/14-00000158556e/eepromcat: write error: File too largex@y:~# cat dump-32bytes.bin > /sys/bus/w1/devices/14-00000158556e/eepromx@y:~# hexdump -C -n 54 /sys/bus/w1/devices/14-00000158556e/eeprom00000000 10 0b 5b ff ff ff ff ff ff ff ff ff ff ff ff ff00000010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 4000000020Signed-off-by: Angelo Dureghello Link: https://lore.kernel.org/r/20191019204015.61474-1-angelo.dureghello@timesys.comSigned-off-by: Greg Kroah-Hartman List of files: /linux/drivers/w1/slaves/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 18:00:19 +0000

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/w1/slaves/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 17:30:49 +0000

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/w1/slaves/Makefile

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 08:18:26 +0000

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/w1/slaves/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 16:06:41 +0000

Merge tag 'fix-missing-panels' into fixes List of files: /linux/drivers/w1/slaves/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 14:38:50 +0000

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/drivers/w1/slaves/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 07:59:29 +0000

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/w1/slaves/Makefile