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	…
ad7266.h	…
ad7291.h	…
ad7298.h	…
ad7303.h	…
ad7791.h	…
ad7793.h	…
ad7879.h	…
ad7887.h	…
adau17x1.h	…
adau1977.h	…
adp5588.h	…
adp8860.h	…
adp8870.h	…
ads1015.h	…
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	…
arm-ux500-pm.h	…
asoc-imx-ssi.h	…
asoc-kirkwood.h	…
asoc-mx27vis.h	…
asoc-palm27x.h	…
asoc-s3c.h	…
asoc-s3c24xx_simtec.h	…
asoc-ti-mcbsp.h	…
asoc-ux500-msp.h	…
at24.h	…
at91_adc.h	…
ata-pxa.h	…
ata-samsung_cf.h	…
atmel.h	…
b53.h	net: dsa: b53: Extend platform data to include DSA ports	2018-05-20 18:59:34 -04:00
bcmgenet.h	…
bd6107.h	…
bh1770glc.h	…
brcmfmac.h	…
clk-da8xx-cfgchip.h	…
clk-davinci-pll.h	…
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	…
crypto-ux500.h	…
cyttsp4.h	…
davinci_asp.h	…
db8500_thermal.h	…
dma-atmel.h	…
dma-coh901318.h	…
dma-dw.h	…
dma-ep93xx.h	dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction	2018-10-02 20:11:00 +05:30
dma-hsu.h	…
dma-imx-sdma.h	…
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	…
dma-mv_xor.h	…
dma-s3c24xx.h	…
dma-ste-dma40.h	…
dmtimer-omap.h	…
ds620.h	…
dwc3-omap.h	…
edma.h	…
efm32-spi.h	…
efm32-uart.h	…
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	…
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-omap.h	ARM: SoC platform updates for 4.20	2018-10-29 15:37:33 -07:00
gpio_backlight.h	…
gpmc-omap.h	…
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-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-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	…
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	…
invensense_mpu6050.h	…
iommu-omap.h	…
irda-pxaficp.h	…
irda-sa11x0.h	…
isl9305.h	…
itco_wdt.h	…
keyboard-pxa930_rotary.h	…
keyboard-spear.h	…
keypad-ep93xx.h	…
keypad-nomadik-ske.h	…
keypad-omap.h	…
keypad-pxa27x.h	…
keypad-w90p910.h	…
keyscan-davinci.h	…
lcd-mipid.h	…
leds-kirkwood-netxbig.h	…
leds-kirkwood-ns2.h	…
leds-lm355x.h	…
leds-lm3642.h	…
leds-lp55xx.h	…
leds-omap.h	…
leds-pca963x.h	…
leds-s3c24xx.h	…
lm3630a_bl.h	…
lm3639_bl.h	…
lm8323.h	…
lp855x.h	…
lp8727.h	…
lp8755.h	…
ltc4245.h	…
lv5207lp.h	…
macb.h	…
max197.h	…
max732x.h	…
max3421-hcd.h	…
max6639.h	…
max6697.h	…
mcs.h	…
mdio-bcm-unimac.h	…
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	…
mlxreg.h	platform_data/mlxreg: Document fixes for hotplug device	2018-05-12 15:38:40 -07:00
mmc-davinci.h	…
mmc-esdhc-imx.h	mmc: sdhci-esdhc-imx: get rid of support_vsel	2018-07-16 11:21:45 +02:00
mmc-mxcmmc.h	…
mmc-omap.h	…
mmc-pxamci.h	…
mmc-s3cmci.h	…
mmc-sdhci-s3c.h	…
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	…
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	…
mtd-nand-pxa3xx.h	…
mtd-nand-s3c2410.h	…
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	…
ntc_thermistor.h	…
nxp-nci.h	…
omap-twl4030.h	…
omap-wd-timer.h	…
omap1_bl.h	…
omapdss.h	…
pca953x.h	…
pca954x.h	…
pcf857x.h	…
pcmcia-pxa2xx_viper.h	…
phy-da8xx-usb.h	…
pinctrl-single.h	…
pixcir_i2c_ts.h	…
pm33xx.h	ARM: OMAP2+: sleep33/43xx: Add RTC-Mode support	2018-07-09 23:01:34 -07:00
pwm_omap_dmtimer.h	…
pxa2xx_udc.h	…
pxa_sdhci.h	mmc: sdhci: pxav3: Delete GPIO handling	2018-10-08 11:40:43 +02:00
regulator-haptic.h	…
remoteproc-omap.h	…
rtc-ds2404.h	…
rtc-v3020.h	…
s3c-hsotg.h	…
s3c-hsudc.h	…
sa11x0-serial.h	…
sc18is602.h	fix a series of Documentation/ broken file name references	2018-06-15 18:10:01 -03:00
sdhci-pic32.h	…
serial-imx.h	…
serial-omap.h	…
serial-sccnxp.h	…
shmob_drm.h	drm: shmobile: convert to SPDX identifiers	2018-09-14 13:54:02 +03:00
sht3x.h	…
shtc1.h	…
si5351.h	…
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	…
spi-imx.h	…
spi-mt65xx.h	…
spi-nuc900.h	…
spi-omap2-mcspi.h	…
spi-s3c64xx.h	…
ssm2518.h	…
st33zp24.h	…
st_sensors_pdata.h	…
syscon.h	…
tc35876x.h	…
tda9950.h	drm/i2c: tda9950: add CEC driver	2018-04-24 10:44:25 +01:00
ti-aemif.h	…
ti-sysc.h	bus: ti-sysc: Defer suspend as needed	2018-09-24 12:16:54 -07:00
touchscreen-s3c2410.h	…
tsc2007.h	…
tsl2563.h	…
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	…
usb-ehci-mxc.h	…
usb-ehci-orion.h	…
usb-musb-ux500.h	…
usb-mx2.h	…
usb-ohci-pxa27x.h	…
usb-ohci-s3c2410.h	…
usb-omap.h	…
usb-omap1.h	…
usb-pxa3xx-ulpi.h	…
usb-s3c2410_udc.h	…
usb3503.h	…
ux500_wdt.h	…
video-clcd-versatile.h	…
video-ep93xx.h	…
video-imxfb.h	…
video-mx3fb.h	…
video-nuc900fb.h	…
video-pxafb.h	…
video_s3c.h	…
voltage-omap.h	…
wiznet.h	…
wkup_m3.h	…
zforce_ts.h	…