History

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

Pull char/misc driver updates from Greg KH: "Here is the large set of char and misc and other driver subsystem patches for 5.9-rc1. Lots of new driver submissions in here, and cleanups and features for existing drivers. Highlights are: - habanalabs driver updates - coresight driver updates - nvmem driver updates - huge number of "W=1" build warning cleanups from Lee Jones - dyndbg updates - virtbox driver fixes and updates - soundwire driver updates - mei driver updates - phy driver updates - fpga driver updates - lots of smaller individual misc/char driver cleanups and fixes Full details are in the shortlog. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (322 commits) habanalabs: remove unused but set variable 'ctx_asid' nvmem: qcom-spmi-sdam: Enable multiple devices dt-bindings: nvmem: SID: add binding for A100's SID controller nvmem: update Kconfig description nvmem: qfprom: Add fuse blowing support dt-bindings: nvmem: Add properties needed for blowing fuses dt-bindings: nvmem: qfprom: Convert to yaml nvmem: qfprom: use NVMEM_DEVID_AUTO for multiple instances nvmem: core: add support to auto devid nvmem: core: Add nvmem_cell_read_u8() nvmem: core: Grammar fixes for help text nvmem: sc27xx: add sc2730 efuse support nvmem: Enforce nvmem stride in the sysfs interface MAINTAINERS: Add git tree for NVMEM FRAMEWORK nvmem: sprd: Fix return value of sprd_efuse_probe() drivers: android: Fix the SPDX comment style drivers: android: Fix a variable declaration coding style issue drivers: android: Remove braces for a single statement if-else block drivers: android: Remove the use of else after return drivers: android: Fix a variable declaration coding style issue ...

Linus Torvalds committed 6 years ago

Commit 1785d112 parents 060a72a 22362aa291 files · +10369 −4128Browse files

Showing the changes to scripts (3 of 291 files). Show all

Unified · Split

3 files
  1. scripts/headers_install.sh +0 −1
  2. scripts/mod/devicetable-offsets.c +2 −0
  3. scripts/mod/file2alias.c +5 −1
scripts/headers_install.sh+0−1
@@ -90,7 +90,6 @@ include/uapi/linux/elfcore.h:CONFIG_BINFMT_ELF_FDPIC · 89 unmodified lines
9090 include/uapi/linux/eventpoll.h:CONFIG_PM_SLEEP
9191 include/uapi/linux/hw_breakpoint.h:CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
9292 include/uapi/linux/pktcdvd.h:CONFIG_CDROM_PKTCDVD_WCACHE
93−include/uapi/linux/raw.h:CONFIG_MAX_RAW_DEVS
9493 "
9594
9695 for c in $configs
scripts/mod/devicetable-offsets.c+2−0
@@ -216,6 +216,8 @@ int main(void) · 215 unmodified lines
216216 DEVID(sdw_device_id);
217217 DEVID_FIELD(sdw_device_id, mfg_id);
218218 DEVID_FIELD(sdw_device_id, part_id);
219+ DEVID_FIELD(sdw_device_id, sdw_version);
220+ DEVID_FIELD(sdw_device_id, class_id);
219221
220222 DEVID(fsl_mc_device_id);
221223 DEVID_FIELD(fsl_mc_device_id, vendor);
scripts/mod/file2alias.c+5−1
@@ -1258,15 +1258,19 @@ static int do_hda_entry(const char *filename, void *symval, char *alias) · 1257 unmodified lines
12581258 return 1;
12591259 }
12601260
1261−/* Looks like: sdw:mNpN */
1261+/* Looks like: sdw:mNpNvNcN */
12621262 static int do_sdw_entry(const char *filename, void *symval, char *alias)
12631263 {
12641264 DEF_FIELD(symval, sdw_device_id, mfg_id);
12651265 DEF_FIELD(symval, sdw_device_id, part_id);
1266+ DEF_FIELD(symval, sdw_device_id, sdw_version);
1267+ DEF_FIELD(symval, sdw_device_id, class_id);
12661268
12671269 strcpy(alias, "sdw:");
12681270 ADD(alias, "m", mfg_id != 0, mfg_id);
12691271 ADD(alias, "p", part_id != 0, part_id);
1272+ ADD(alias, "v", sdw_version != 0, sdw_version);
1273+ ADD(alias, "c", class_id != 0, class_id);
12701274
12711275 add_wildcard(alias);
12721276 return 1;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t