Re: [GIT PULL] platform-drivers-x86 for 4.17-1
On Tue, Apr 10, 2018 at 1:35 PM, Andy Shevchenko wrote: > > That's good news. > I'm using whatever is in Debian Unstable (old for less than month) and > what I tried was > > % git checkout -b test origin/master > % git merge for-next # our branch for you > > It complained to me that file was renamed / deleted and it didn't > resolve conflicts automatically. Hmm. I don't know what the difference might be. debian-unstable is usually not *so* ancient that I'd expect big git version differences (even if I personally tend to run very recent git trees, because it's the one thing in addition to the kernel that I build myself). Sometimes things like the git rename limits hit people. Your side didn't have a lot of file creation/deletion (which is when the default git rename limits can bite you), but my side did. Did you perhaps also get a message like "inexact rename detection was skipped due to too many files"? If you have lots of memory, it can be a good idea to just disable the rename limits: git config diff.renameLimit 0 git config merge.renameLimit 0 but it's also possible that some tweak to the diff algorithm triggered this, or just the fact that we tried merging at slightly different points. Not a big deal. Linus
Re: [GIT PULL] platform-drivers-x86 for 4.17-1
On Tue, Apr 10, 2018 at 10:22 PM, Linus Torvalds wrote: > On Tue, Apr 10, 2018 at 10:12 AM, Andy Shevchenko > wrote: >> >> This is first batch of Platform Drivers x86 for v4.17 cycle. Due to few >> duplication the merge will have conflicts which would be resolved by >> using `git merge -X no-renames ...` followed by choose of our version of >> two failed one-liner hunks situated in one file. > > I'm not sure what git version or flags you are using, but git merges > it cleanly for me using the standard recursive merge policy. That's good news. I'm using whatever is in Debian Unstable (old for less than month) and what I tried was % git checkout -b test origin/master % git merge for-next # our branch for you It complained to me that file was renamed / deleted and it didn't resolve conflicts automatically. -- With Best Regards, Andy Shevchenko
Re: [GIT PULL] platform-drivers-x86 for 4.17-1
On Tue, Apr 10, 2018 at 10:12 AM, Andy Shevchenko wrote: > > This is first batch of Platform Drivers x86 for v4.17 cycle. Due to few > duplication the merge will have conflicts which would be resolved by > using `git merge -X no-renames ...` followed by choose of our version of > two failed one-liner hunks situated in one file. I'm not sure what git version or flags you are using, but git merges it cleanly for me using the standard recursive merge policy. Linus
[GIT PULL] platform-drivers-x86 for 4.17-1
Hi Linus, This is first batch of Platform Drivers x86 for v4.17 cycle. Due to few duplication the merge will have conflicts which would be resolved by using `git merge -X no-renames ...` followed by choose of our version of two failed one-liner hunks situated in one file. Thanks, With Best Regards, Andy Shevchenko The following changes since commit c8ba9db2a790c0fcf2f6c4cafd45ff3a0751800e: platform/x86: dell-laptop: Removed duplicates in DMI whitelist (2018-02-15 12:18:33 +0200) are available in the Git repository at: git://git.infradead.org/linux-platform-drivers-x86.git tags/platform-drivers-x86-v4.17-1 for you to fetch changes up to a986c75a7df027d2c649a8f087be9417372cbfb3: platform/x86: thinkpad_acpi: Add 2nd Fan Support for Thinkpad P50 (2018-04-03 11:06:04 +0300) platform-drivers-x86 for v4.17-1 Dell SMBIOS driver fixed against memory leaks. The fujitsu-laptop driver is cleaned up and now supports hotkeys for Lifebook U7x7 models. Besides that the typo introduced by one of previous clean up series has been fixed. Specific to x86-based laptops HID device now supports KEY_ROTATE_LOCK_TOGGLE event which is emitted, for example, by Wacom MobileStudio Pro 13. Turbo MAX 3 technology is enabled for the rest of platforms that support Hardware-P-States feature which have core priority described by ACPI CPPC table. Mellanox on x86 gets better support of I2C bus in use including support of hotpluggable ones. Silead touchscreen is enabled on two tablet models, i.e Yours Y8W81 and I.T.Works TW701. >From now on the second fan on Thinkpad P50 is supported. The topstar-laptop driver is reworked to support new models, in particular Topstar U931. Some of the changes had been already applied during v4.16 cycle and thus have a duplication here: - 027d50ccd6a01c6ca8969b49e69f26d64a8f94b2 platform/x86: intel-vbtn: Only activate tablet mode switch on 2-in-1's - 250b044e1a584887c06e6ba79446e523ffa3cc9c platform/x86: intel-vbtn: Reset wakeup capable flag on removal - 356b57752c91cffb35356abe6647065bf0edcad1 platform/x86: intel-hid: Reset wakeup capable flag on removal - 501f7e52de8a7b910154740958ce8d902258bf72 platform/x86: wmi: Fix misuse of vsprintf extension %pULL - 98c76a3904261a7b7612821de8b99f0e3b41677c platform/x86: dell-smbios: Correct some style warnings - ec34fe385984b447f62ef6763638874e6fbd1f43 platform/x86: dell-smbios: Rename dell-smbios source to dell-smbios-bae - 41e36f2f85af758fd2f4be76112ebe649d07a801 platform/x86: dell-smbios: Link all dell-smbios-* modules together - c715e4345581bdb475ae4fb378a243aee72579ba platform/x86: Allow for SMBIOS backend defaults - cc69c88fbeb915447b87e5179378d899d1f61554 platform/x86: dell-smbios: Resolve dependency error on DCDBAS - 4716007c23abeb0e42015786794539454aff487b platform/x86: dell-smbios: Resolve dependency error on ACPI_WMI - 7129707ec2356ef9ef9cce469ad14eb37fbbe67e platform/x86: Fix dell driver init order The following is an automated git shortlog grouped by driver: dell-smbios: - Fix memory leaks in build_tokens_sysfs() - Fix dell driver init order - Resolve dependency error on ACPI_WMI - Resolve dependency error on DCDBAS - Allow for SMBIOS backend defaults - Link all dell-smbios-* modules together - Rename dell-smbios source to dell-smbios-base - Correct some style warnings fujitsu-laptop: - Support Lifebook U7x7 hotkeys - Revert UNSUPPORTED_CMD back to an int - Clean up constants - Define constants for backlight power control - Do not include linux/slab.h - Clearly distinguish module parameters - Simplify error paths - Defer input device registration - Unify local variable naming GPD pocket fan: - fix spelling mistake: "Mill-celcius" -> "millicelsius" intel-hid: - support KEY_ROTATE_LOCK_TOGGLE - clean up and sort header files - Reset wakeup capable flag on removal intel_turbo_max_3: - Remove restriction for HWP platforms intel-vbtn: - Reset wakeup capable flag on removal - Only activate tablet mode switch on 2-in-1's mlx-platform: - Add physical bus number auto detection - Add deffered bus functionality - Use define for the channel numbers platform/mellanox: - mlxreg-hotplug: Change input for device create routine silead_dmi: - Add entry for the Yours Y8W81 tablet - Add DMI match for the I.T.Works TW701 tablet thinkpad_acpi: - Add 2nd Fan Support for Thinkpad P50 topstar-laptop: - replace licence text with SPDX tag - update copyright and fix some comments - add Topstar U931/RVP7 WLAN LED workaround - add platform device - split ACPI events and input handling - use consistent naming scheme - revert "convert to module_acpi_driver()" wmi: - Fix misuse of vsprintf extension %pULL - Replace list_for_each() by list_for_each_entry() - Replace kmalloc + sprintf() with kasprintf() Alex Hung (2): intel-hi