redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity
alistair23-linux/include/linux/platform_data
History
David S. Miller 4cc1feeb6f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Several conflicts, seemingly all over the place.

I used Stephen Rothwell's sample resolutions for many of these, if not
just to double check my own work, so definitely the credit largely
goes to him.

The NFP conflict consisted of a bug fix (moving operations
past the rhashtable operation) while chaning the initial
argument in the function call in the moved code.

The net/dsa/master.c conflict had to do with a bug fix intermixing of
making dsa_master_set_mtu() static with the fixing of the tagging
attribute location.

cls_flower had a conflict because the dup reject fix from Or
overlapped with the addition of port range classifiction.

__set_phy_supported()'s conflict was relatively easy to resolve
because Andrew fixed it in both trees, so it was just a matter
of taking the net-next copy.  Or at least I think it was :-)

Joe Stringer's fix to the handling of netns id 0 in bpf_sk_lookup()
intermixed with changes on how the sdif and caller_net are calculated
in these code paths in net-next.

The remaining BPF conflicts were largely about the addition of the
__bpf_md_ptr stuff in 'net' overlapping with adjustments and additions
to the relevant data structure where the MD pointer macros are used.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2018-12-09 21:43:31 -08:00
..
jz4740 MIPS: jz4740: Move jz4740_nand.h header to include/linux/platform_data/jz4740 2018-07-18 10:10:23 +02:00
media media: sii9234: remove unused header 2018-07-30 08:38:06 -04:00
txx9 MIPS: txx9: Move the ndfc.h header to include/linux/platform_data/txx9 2018-07-18 10:10:23 +02:00
x86 platform/x86: asus-wmi: export function for evaluating WMI methods 2018-10-31 16:11:40 +02:00
ad5449.h
…
ad5755.h
…
ad5761.h iio: add ad5761 DAC driver 2016-01-24 14:46:21 +00:00
ad7266.h
…
ad7291.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ad7298.h
…
ad7303.h
…
ad7791.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ad7793.h
…
ad7879.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ad7887.h
…
adau17x1.h ASoC: adau17x1: Correct typos in file headers 2016-02-24 13:14:05 +09:00
adau1977.h
…
adp5588.h gpio: adp5588: move header file out of I2C realm 2017-05-29 13:36:45 +02:00
adp8860.h backlight: adp8860: Move header file out of I2C realm 2017-07-06 08:56:08 +01:00
adp8870.h video: adp8870: move header file out of I2C realm 2017-07-06 08:58:39 +01:00
ads1015.h hwmon: (ads1015) move header file out of I2C realm 2017-06-11 17:08:19 -07:00
ads7828.h
…
ams-delta-fiq.h Input: ams_delta_serio: Get FIQ buffer from platform_data 2018-07-02 23:05:14 -07:00
apds990x.h misc: apds990x: move header file out of I2C realm 2017-05-25 18:25:00 +02:00
arm-ux500-pm.h
…
asoc-imx-ssi.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
asoc-kirkwood.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
asoc-mx27vis.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
asoc-palm27x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
asoc-s3c.h ASoC: samsung: Remove tests of member address 2016-12-15 11:42:42 +00:00
asoc-s3c24xx_simtec.h
…
asoc-ti-mcbsp.h ARM: OMAP2+: Cleanup omap_mcbsp_dev_attr and other legacy data 2018-02-14 10:28:13 -08:00
asoc-ux500-msp.h
…
at24.h eeprom: at24: fix a whitespace error in platform data 2018-01-01 19:40:50 +01:00
at91_adc.h
…
ata-pxa.h
…
ata-samsung_cf.h
…
atmel.h ARM: SoC platform updates 2017-07-04 14:34:51 -07:00
b53.h net: dsa: b53: Extend platform data to include DSA ports 2018-05-20 18:59:34 -04:00
bcmgenet.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
bd6107.h
…
bh1770glc.h misc: bh1770glc: move header file out of I2C realm 2017-05-25 18:25:00 +02:00
brcmfmac.h brcmfmac: switch to new platform data 2016-03-07 14:15:50 +02:00
clk-da8xx-cfgchip.h clk: davinci: New driver for TI DA8XX CFGCHIP clocks 2018-03-20 10:16:26 -07:00
clk-davinci-pll.h clk: davinci: New driver for davinci PLL clocks 2018-03-20 10:16:26 -07:00
clk-integrator.h
…
clk-lpss.h
…
clk-st.h clk: x86: Add ST oscout platform clock 2018-05-17 12:44:06 +02:00
clk-u300.h
…
cpuidle-exynos.h
…
crypto-atmel.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
crypto-ux500.h
…
cyttsp4.h
…
davinci_asp.h
…
db8500_thermal.h
…
dma-atmel.h
…
dma-coh901318.h
…
dma-dw.h dmaengine: dw: add support of iDMA 32-bit hardware 2017-01-25 11:51:40 +05:30
dma-ep93xx.h dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction 2018-10-02 20:11:00 +05:30
dma-hsu.h dmaengine: hsu: remove platform data 2015-10-17 21:22:08 -07:00
dma-imx-sdma.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
dma-imx.h
…
dma-mcf-edma.h dmaengine: fsl-edma: add ColdFire mcf5441x edma support 2018-09-11 12:06:39 +05:30
dma-mmp_tdma.h dmaengine: mmp_tdma: enable COMPILE_TEST 2016-09-26 22:31:04 +05:30
dma-mv_xor.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
dma-s3c24xx.h dmaengine: s3c24xx: Add dma_slave_map for s3c2440 devices 2016-09-26 23:13:04 +05:30
dma-ste-dma40.h
…
dmtimer-omap.h clocksource: timer-ti-dm: Add timer ops to the platform data structure 2018-02-22 10:53:59 -08:00
ds620.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
dwc3-omap.h
…
edma.h dmaengine updates for 4.5-rc1 2016-01-13 10:59:52 -08:00
efm32-spi.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
efm32-uart.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ehci-sh.h usb: ehci-sh: convert to SPDX identifiers 2018-09-10 19:58:49 +02:00
elm.h
…
emif_plat.h
…
eth-netx.h
…
fsa9480.h
…
g762.h
…
gpio-ath79.h MIPS: ath79: Add OF support to the GPIO driver 2015-06-21 21:54:09 +02:00
gpio-davinci.h gpio: davinci: restore a way to manually specify the GPIO base 2018-11-26 16:45:10 +05:30
gpio-dwapb.h gpio: dwapb: Fix rework support for 1 interrupt per port A GPIO 2018-05-28 09:45:27 +02:00
gpio-htc-egpio.h gpio: htc-gpio: Include the right header 2018-03-19 01:50:28 +01:00
gpio-omap.h ARM: SoC platform updates for 4.20 2018-10-29 15:37:33 -07:00
gpio_backlight.h backlight: gpio_backlight: Delete pdata inversion 2017-08-07 17:11:28 +01:00
gpmc-omap.h ARM: OMAP2+: gpmc: Add gpmc timings and settings to platform data 2016-04-15 11:51:02 +03:00
hsmmc-omap.h mmc: omap_hsmmc: Delete platform data GPIO CD and WP 2018-10-08 11:40:43 +02:00
hwmon-s3c.h
…
i2c-cbus-gpio.h
…
i2c-davinci.h i2c/ARM: davinci: Deep refactoring of I2C recovery 2017-12-31 00:09:39 +01:00
i2c-designware.h
…
i2c-gpio.h i2c: gpio: move header to platform_data 2018-05-17 16:27:09 +02:00
i2c-hid.h HID: i2c-hid: Add vddl regulator control 2018-06-25 15:12:42 +02:00
i2c-imx.h
…
i2c-mux-gpio.h i2c: mux: gpio: move header to platform_data 2018-05-17 16:27:52 +02:00
i2c-mux-reg.h i2c: mux: Add register-based mux i2c-mux-reg 2015-08-24 14:05:18 +02:00
i2c-ocores.h i2c: ocores: update my email address 2018-08-24 14:46:43 +02:00
i2c-omap.h i2c: omap: move header to platform_data 2018-05-17 16:27:58 +02:00
i2c-pca-platform.h i2c: pca-platform: move header to platform_data 2018-05-17 16:27:58 +02:00
i2c-pxa.h ARM: pxa: move header file out of I2C realm 2017-11-28 22:49:30 +01:00
i2c-s3c2410.h
…
i2c-xiic.h i2c: xiic: move header to platform_data 2018-05-17 16:27:59 +02:00
ina2xx.h hwmon: (ina2xx) fix sysfs shunt resistor read access 2018-08-26 17:45:25 -07:00
intel-mid_wdt.h
…
intel-spi.h spi-nor: Add support for Intel SPI serial flash controller 2017-01-03 17:33:36 +00:00
invensense_mpu6050.h iio:imu:mpu6050: enhance mounting matrix support 2016-04-23 22:16:01 +01:00
iommu-omap.h iommu/omap: Move data structures to omap-iommu.h 2017-04-20 16:33:58 +02:00
irda-pxaficp.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
irda-sa11x0.h
…
isl9305.h regulator: isl9305: fix array size 2017-04-10 17:31:17 +01:00
itco_wdt.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
keyboard-pxa930_rotary.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
keyboard-spear.h Input: update email-id of Rajeev Kumar 2015-05-22 10:59:55 -07:00
keypad-ep93xx.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
keypad-nomadik-ske.h
…
keypad-omap.h
…
keypad-pxa27x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
keypad-w90p910.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
keyscan-davinci.h
…
lcd-mipid.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
leds-kirkwood-netxbig.h leds: netxbig: add device tree binding 2015-11-03 08:59:25 +01:00
leds-kirkwood-ns2.h leds: leds-ns2: move LED modes mapping outside of the driver 2015-08-28 14:06:06 +02:00
leds-lm355x.h
…
leds-lm3642.h
…
leds-lp55xx.h
…
leds-omap.h
…
leds-pca963x.h leds: pca963x: Add bindings to invert polarity 2017-05-14 13:01:29 +02:00
leds-s3c24xx.h
…
lm3630a_bl.h
…
lm3639_bl.h
…
lm8323.h Input: lm8323 - move header file out of I2C realm 2017-05-22 17:23:46 -07:00
lp855x.h backlight: lp855x: Use private data for regulator control 2015-08-25 08:40:44 +01:00
lp8727.h
…
lp8755.h
…
ltc4245.h hwmon: (ltc4245) move header file out of I2C realm 2017-06-11 17:08:19 -07:00
lv5207lp.h
…
macb.h net: macb: Added PCI wrapper for Platform Driver. 2016-12-17 10:24:33 -05:00
max197.h
…
max732x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
max3421-hcd.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
max6639.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
max6697.h
…
mcs.h Input: mcs - move header file out of I2C realm 2017-05-22 17:26:57 -07:00
mdio-bcm-unimac.h net: phy: mdio-bcm-unimac: Allow specifying platform data 2017-07-31 14:40:58 -07:00
mdio-gpio.h net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data 2018-12-08 21:33:30 -08:00
mfd-mcp-sa11x0.h
…
microchip-ksz.h dsa: add DSA switch driver for Microchip KSZ9477 2017-05-31 20:56:31 -04:00
mlxreg.h platform_data/mlxreg: Document fixes for hotplug device 2018-05-12 15:38:40 -07:00
mmc-davinci.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mmc-esdhc-imx.h mmc: sdhci-esdhc-imx: get rid of support_vsel 2018-07-16 11:21:45 +02:00
mmc-mxcmmc.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mmc-omap.h
…
mmc-pxamci.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mmc-s3cmci.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mmc-sdhci-s3c.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mmp_audio.h
…
mmp_dma.h dmaengine: pxa: use a dma slave map 2018-06-18 21:28:44 +02:00
mouse-pxa930_trkball.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mtd-davinci-aemif.h ARM: davinci: unduplicate aemif support 2018-07-10 15:39:27 +05:30
mtd-davinci.h mtd: rawnand: davinci: store the core chipselect number in platform data 2018-05-02 14:58:30 +05:30
mtd-mxc_nand.h
…
mtd-nand-omap2.h This pull request contains the following core changes: 2017-11-22 20:46:06 -10:00
mtd-nand-pxa3xx.h mtd: nand: remove useless fields from pxa3xx NAND platform data 2018-03-02 21:51:41 +01:00
mtd-nand-s3c2410.h mtd: nand: Rename nand.h into rawnand.h 2017-08-13 10:11:49 +02:00
mtd-orion_nand.h mtd: rawnand: orion_nand: Kill orion_nand_data.dev_ready() 2018-07-18 10:10:12 +02:00
mv88e6xxx.h net: dsa: mv88e6xxx: Add support for EEPROM via platform data 2018-05-20 18:58:27 -04:00
mv_usb.h USB: EHCI: ehci-mv: remove private_init 2018-09-20 13:07:55 +02:00
net-cw1200.h
…
nfcmrvl.h NFC: nfcmrvl: allow gpio 0 for reset signalling 2017-06-18 23:58:00 +02:00
ntc_thermistor.h hwmon: (ntc_thermistor) Add support for ncpXXxh103 2016-03-05 06:25:34 -08:00
nxp-nci.h
…
omap-twl4030.h
…
omap-wd-timer.h
…
omap1_bl.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
omapdss.h drm: omapdrm: Remove unused default display name support 2017-06-02 10:57:10 +03:00
pca953x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pca954x.h i2c: mux: pca954x: move header file out of I2C realm 2017-08-14 11:54:03 +02:00
pcf857x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pcmcia-pxa2xx_viper.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
phy-da8xx-usb.h ARM: da8xx: use platform data for CFGCHIP syscon regmap 2018-02-19 16:19:25 +05:30
pinctrl-single.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pixcir_i2c_ts.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pm33xx.h ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support 2018-07-09 23:01:34 -07:00
pwm_omap_dmtimer.h ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51 2016-04-28 14:26:32 -07:00
pxa2xx_udc.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pxa_sdhci.h mmc: sdhci: pxav3: Delete GPIO handling 2018-10-08 11:40:43 +02:00
regulator-haptic.h
…
remoteproc-omap.h remoteproc/omap: fix various code formatting issues 2016-08-12 21:27:50 -07:00
rtc-ds2404.h rtc: ds2404: move rtc-ds2404.h to platform_data 2016-06-27 10:48:28 +02:00
rtc-v3020.h rtc: v3020: move rtc-v3020.h to platform_data 2016-07-09 10:24:21 +02:00
s3c-hsotg.h usb: dwc2: rename all s3c_* to dwc2_* 2015-09-27 10:54:31 -05:00
s3c-hsudc.h
…
sa11x0-serial.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
sc18is602.h fix a series of Documentation/ broken file name references 2018-06-15 18:10:01 -03:00
sdhci-pic32.h MIPS: Add support for PIC32MZDA platform 2016-01-24 02:53:28 +01:00
serial-imx.h
…
serial-omap.h ARM: OMAP: serial: Rename DRIVER_NAME 2016-02-06 23:13:30 -08:00
serial-sccnxp.h
…
shmob_drm.h drm: shmobile: convert to SPDX identifiers 2018-09-14 13:54:02 +03:00
sht3x.h hwmon: add support for Sensirion SHT3x sensors 2016-06-27 18:58:03 -07:00
shtc1.h
…
si5351.h clk: si5351: Add DT property to enable PLL reset 2017-12-21 18:09:18 -08:00
simplefb.h
…
sky81452-backlight.h
…
spi-clps711x.h
…
spi-davinci.h spi: davinci: Remove chip select GPIO pdata 2018-09-11 17:37:15 +01:00
spi-ep93xx.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
spi-imx.h ARM: imx: Update spi_imx platform data to reflect current state 2018-04-18 11:11:23 +08:00
spi-mt65xx.h spi: mediatek: adjust register to enhance time accuracy 2017-06-13 19:42:31 +01:00
spi-nuc900.h
…
spi-omap2-mcspi.h ARM: OMAP2+: Cleanup omap2_spi_dev_attr and other legacy data 2018-02-14 10:28:12 -08:00
spi-s3c64xx.h spi: s3c64xx: add SPDX identifier 2018-01-08 15:38:06 +00:00
ssm2518.h
…
st33zp24.h tpm/st33zp24: Extend Copyright headers 2016-06-25 17:21:42 +03:00
st_sensors_pdata.h iio: accel: st_accel: add SPI-3wire support 2017-07-06 19:32:29 +01:00
syscon.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
tc35876x.h gpu: drm: tc35876x: move header file out of I2C realm 2017-08-13 16:07:17 +02:00
tda9950.h drm/i2c: tda9950: add CEC driver 2018-04-24 10:44:25 +01:00
ti-aemif.h memory: aemif: add support for board files 2018-04-20 10:14:27 -07:00
ti-sysc.h bus: ti-sysc: Defer suspend as needed 2018-09-24 12:16:54 -07:00
touchscreen-s3c2410.h ARM: s3c64xx: use new adc/touchscreen driver 2015-12-01 21:50:25 +01:00
tsc2007.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
tsl2563.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
tsl2772.h staging: iio: tsl2x7x/tsl2772: move out of staging 2018-05-12 12:40:04 +01:00
uio_dmem_genirq.h
…
uio_pruss.h
…
usb-davinci.h ARM: davinci: da8xx: Remove duplicated defines 2016-10-31 16:51:56 +05:30
usb-ehci-mxc.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
usb-ehci-orion.h
…
usb-musb-ux500.h
…
usb-mx2.h
…
usb-ohci-pxa27x.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
usb-ohci-s3c2410.h ARM: samsung: usb-ohci: move inline before return type 2017-07-12 16:26:05 -07:00
usb-omap.h
…
usb-omap1.h
…
usb-pxa3xx-ulpi.h
…
usb-s3c2410_udc.h
…
usb3503.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ux500_wdt.h
…
video-clcd-versatile.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
video-ep93xx.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
video-imxfb.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
video-mx3fb.h
…
video-nuc900fb.h
…
video-pxafb.h
…
video_s3c.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
voltage-omap.h
…
wiznet.h
…
wkup_m3.h remoteproc/wkup_m3: add a remoteproc driver for TI Wakeup M3 2015-06-17 09:58:08 +03:00
zforce_ts.h Input: zforce_ts - convert to use the gpiod interface 2015-07-08 21:50:57 -07:00