# git rev-parse -q --verify 112450df61b7373529b0fe4c122ad13b89d80a8a^{commit} 112450df61b7373529b0fe4c122ad13b89d80a8a already have revision, skipping fetch # git checkout -q -f -B kisskb 112450df61b7373529b0fe4c122ad13b89d80a8a # git clean -qxdf # < git log -1 # commit 112450df61b7373529b0fe4c122ad13b89d80a8a # Merge: 3bad80dab94a bf3c39f5da43 # Author: Linus Torvalds # Date: Fri Jan 14 16:19:38 2022 +0100 # # Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux # # Pull i2c updates from Wolfram Sang: # "Mostly driver updates and refactorization. # # The removal of the XLR driver and the i801 refactoring stand out a # little. In the core, we enabled async suspend/resume for I2C # controllers and their clients. No issues were reported during the test # phase in -next. We will see how this goes for mainline" # # * 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (54 commits) # i2c: sh_mobile: remove unneeded semicolon # i2c: riic: Use platform_get_irq() to get the interrupt # i2c: sh_mobile: Use platform_get_irq_optional() to get the interrupt # i2c: bcm2835: Use platform_get_irq() to get the interrupt # i2c: aspeed: Remove unused includes # dt-bindings: i2c: aspeed: Drop stray '#interrupt-cells' # i2c: sh_mobile: update to new DMAENGINE API when terminating # i2c: rcar: update to new DMAENGINE API when terminating # i2c: exynos5: Fix getting the optional clock # i2c: designware-pci: Convert to use dev_err_probe() # i2c: designware-pci: use __maybe_unused for PM functions # i2c: designware-pci: Group MODULE_*() macros # i2c: designware-pci: Add a note about struct dw_scl_sda_cfg usage # i2c: designware-pci: Fix to change data types of hcnt and lcnt parameters # i2c: designware: Do not complete i2c read without RX_FULL interrupt # eeprom: at24: Add support for 24c1025 EEPROM # dt-bindings: at24: add at24c1025 # i2c: tegra: use i2c_timings for bus clock freq # dt-bindings: at24: Rework special case compatible handling # i2c: i801: Don't clear status flags twice in interrupt mode # ... # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 112450df61b7373529b0fe4c122ad13b89d80a8a # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:13474:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- /kisskb/src/arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" /kisskb/src/arch/mips/boot/dts/ingenic/jz4780.dtsi:513.33-515.6: Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x" In file included from /kisskb/src/sound/pci/ca0106/ca0106_main.c:156: /kisskb/src/sound/pci/ca0106/ca0106.h:62: error: "PTR" redefined [-Werror] #define PTR 0x00 /* Indexed register set pointer register */ In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/log2.h:12, from /kisskb/src/include/asm-generic/div64.h:55, from /kisskb/src/arch/mips/include/asm/div64.h:89, from /kisskb/src/include/linux/math.h:5, from /kisskb/src/include/linux/delay.h:22, from /kisskb/src/sound/pci/ca0106/ca0106_main.c:124: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:288: sound/pci/ca0106/ca0106_main.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci/ca0106] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:550: sound/pci] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/lib/test_printf.c:247: error: "PTR" redefined [-Werror] #define PTR ((void *)0x456789ab) In file included from /kisskb/src/arch/mips/include/asm/bitops.h:19, from /kisskb/src/include/linux/bitops.h:33, from /kisskb/src/include/linux/kernel.h:13, from /kisskb/src/lib/test_printf.c:9: /kisskb/src/arch/mips/include/asm/asm.h:288: note: this is the location of the previous definition #define PTR .word cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:288: lib/test_printf.o] Error 1 make[1]: *** [/kisskb/src/Makefile:1840: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: sound] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc8 # Build took: 0:24:23.959849