iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Doug Berger 0d314502bb net: bcmgenet: correct bad merge 
As noted in the net-next submission for GENETv5 support [1], there
were merge conflicts with an earlier net submission [2] that had not
yet found its way to the net-next repository.

Unfortunately, when the branches were merged the conflicts were not
correctly resolved.  This commit attempts to correct that.

[1] https://lkml.org/lkml/2017/3/13/1145
[2] https://lkml.org/lkml/2017/3/9/890

Fixes: 101c431492d2 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2017-10-26 10:14:54 +09:00
..
accessibility
…
acpi
ACPI: properties: Fix __acpi_node_get_property_reference() return codes
2017-10-11 21:16:37 +02:00
amba
…
android
Char/Misc driver fixes for 4.14-rc5
2017-10-15 07:50:38 -04:00
ata
ahci: don't ignore result code of ahci_reset_controller()
2017-10-02 12:21:30 -07:00
atm
atm: idt77252: Convert timers to use timer_setup()
2017-10-18 12:39:38 +01:00
auxdisplay
auxdisplay: charlcd: properly restore atomic counter on error path
2017-09-18 16:06:00 +02:00
base
mm: only display online cpus of the numa node
2017-10-13 16:18:32 -07:00
bcma
bcma: use bcma_debug and pr_cont in MIPS driver
2017-10-17 17:22:07 +03:00
block
nbd: don't set the device size until we're connected
2017-10-09 12:29:22 -06:00
bluetooth
Bluetooth: mark expected switch fall-throughs
2017-10-14 09:25:51 +02:00
bus
bus: mbus: fix window size calculation for 4GB windows
2017-10-12 15:01:30 +02:00
cdrom
…
char
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2017-09-24 11:34:28 -07:00
clk
clk: samsung: exynos4: Enable VPLL and EPLL clocks for suspend/resume cycle
2017-10-04 09:19:13 -07:00
clocksource
x86/numachip: Add const and __initconst to numachip2_clockevent
2017-09-25 09:36:15 +02:00
connector
drivers, connector: convert cn_callback_entry.refcnt from atomic_t to refcount_t
2017-10-22 02:22:39 +01:00
cpufreq
cpufreq: dt: Fix sysfs duplicate filename creation for platform-device
2017-09-26 01:10:08 +02:00
cpuidle
ARM: cpuidle: Avoid memleak if init fail
2017-09-19 23:10:51 +02:00
crypto
crypto: stm32 - Try to fix hash padding
2017-10-07 12:04:31 +08:00
dax
- Some request-based DM core and DM multipath fixes and cleanups
2017-09-14 13:43:16 -07:00
dca
…
devfreq
PM / devfreq: Fix memory leak when fail to register device
2017-08-28 10:31:08 +09:00
dio
…
dma
dmaengine: altera: Use IRQ-safe spinlock calls in the error paths as well
2017-10-20 11:51:10 +05:30
dma-buf
sync_file: Return consistent status in SYNC_IOC_FILE_INFO
2017-10-09 13:09:19 -03:00
edac
EDAC, mce_amd: Get rid of local var in amd_filter_mce()
2017-08-21 17:59:38 +02:00
eisa
…
extcon
extcon: max77693: Allow MHL attach notifier
2017-08-25 09:32:27 +09:00
firewire
…
firmware
dmi: Mark all struct dmi_system_id instances const
2017-09-14 11:59:30 +02:00
fmc
drivers/fmc: carrier can program FPGA on registration
2017-08-28 16:24:22 +02:00
fpga
fpga: altera-cvp: remove DRIVER_ATTR() usage
2017-09-19 09:20:33 +02:00
fsi
drivers/fsi/scom: Remove reset before every putscom
2017-08-28 17:15:16 +02:00
gpio
gpio: omap: Fix lost edge interrupts
2017-10-07 13:17:07 +02:00
gpu
Merge tag 'drm-intel-fixes-2017-10-18-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
2017-10-19 15:00:47 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2017-10-12 09:08:56 -07:00
hsi
…
hv
Drivers: hv: vmbus: Fix bugs in rescind handling
2017-10-04 11:25:09 +02:00
hwmon
hwmon: (xgene) Fix up error handling path mixup in 'xgene_hwmon_probe()'
2017-10-01 08:46:54 -07:00
hwspinlock
…
hwtracing
intel_th: pci: Add Lewisburg PCH support
2017-09-22 10:28:00 +02:00
i2c
i2c: omap: Fix error handling for clk_get()
2017-10-18 00:19:26 +02:00
ide
ide: fix IRQ assignment for PCI bus order probing
2017-10-03 14:03:31 -05:00
idle
Power management updates for v4.14-rc1
2017-09-05 12:19:08 -07:00
iio
First round of IIO fixes for the 4.14 cycle
2017-09-25 10:58:22 +02:00
infiniband
qed: Fix iWARP out of order flow
2017-10-19 12:46:43 +01:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2017-10-21 21:46:39 -04:00
iommu
iommu/amd: Finish TLB flush in amd_iommu_unmap()
2017-10-13 17:32:19 +02:00
ipack
…
irqchip
irqchip/mips-gic: Use effective affinity to unmask
2017-09-25 21:23:44 +02:00
isdn
isdn/gigaset: Provide cardstate context for bas timer callbacks
2017-10-23 01:30:11 +01:00
leds
as3645a: Unregister indicator LED on device unbind
2017-09-23 21:17:43 +02:00
lightnvm
…
macintosh
powerpc/macintosh: constify wf_sensor_ops structures
2017-09-01 16:42:54 +10:00
mailbox
Just behavorial changes to a controller driver:
2017-09-07 13:23:37 -07:00
mcb
Char/Misc drivers for 4.14-rc1
2017-09-05 11:08:17 -07:00
md
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2017-10-06 12:13:50 -07:00
media
media fixes for v4.14-rc6
2017-10-17 06:23:09 -04:00
memory
ARM: SoC driver updates for v4.14
2017-09-10 20:40:00 -07:00
memstick
…
message
scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough
2017-08-29 21:51:45 -04:00
mfd
dmi: Mark all struct dmi_system_id instances const
2017-09-14 11:59:30 +02:00
misc
Char/Misc driver fixes for 4.14-rc5
2017-10-15 07:50:38 -04:00
mmc
mmc: sdhci-pci: Fix default d3_retune for Intel host controllers
2017-10-10 08:40:04 +02:00
mtd
mtd: nand: atmel: fix buffer overflow in atmel_pmecc_user
2017-09-27 17:33:28 +02:00
mux
mux: make device_type const
2017-08-29 13:46:35 +02:00
net
net: bcmgenet: correct bad merge
2017-10-26 10:14:54 +09:00
nfc
…
ntb
…
nubus
…
nvdimm
libnvdimm, namespace: fix btt claim class crash
2017-09-18 17:29:01 -07:00
nvme
nvme-pci: Use PCI bus address for data/queues in CMB
2017-10-04 11:42:53 +02:00
nvmem
nvmem: add missing of_node_put() in of_nvmem_cell_get()
2017-09-18 16:12:26 +02:00
of
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-21 22:44:48 -04:00
oprofile
…
parisc
parisc: Fix up devices below a PCI-PCI MegaRAID controller bridge
2017-08-24 18:46:44 +02:00
parport
Char/Misc drivers for 4.14-rc1
2017-09-05 11:08:17 -07:00
pci
PCI: aardvark: Move to struct pci_host_bridge IRQ mapping functions
2017-10-10 21:17:43 -05:00
pcmcia
pcmcia/electra_cf: Convert timers to use timer_setup()
2017-10-18 12:39:37 +01:00
perf
drivers/perf: arm_pmu_acpi: Release memory obtained by kasprintf
2017-09-22 15:11:46 +01:00
phy
Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2017-09-15 20:43:33 -07:00
pinctrl
pinctrl: cherryview: fix issues caused by dynamic gpio irqs mapping
2017-10-08 02:32:59 +02:00
platform
platform/x86: fujitsu-laptop: Don't oops when FUJ02E3 is not presnt
2017-09-27 00:04:43 -07:00
pnp
dmi: Mark all struct dmi_system_id instances const
2017-09-14 11:59:30 +02:00
power
power supply and reset changes for the v4.14 series
2017-09-09 14:44:39 -07:00
powercap
…
pps
drivers/pps: use surrounding "if PPS" to remove numerous dependency checks
2017-09-08 18:26:51 -07:00
ps3
…
ptp
ptp: make ptp_clock_info const
2017-08-22 11:04:51 -07:00
pwm
pwm: Changes for v4.14-rc1
2017-09-11 13:04:32 -07:00
rapidio
rapidio: remove global irq spinlocks from the subsystem
2017-10-03 17:54:24 -07:00
ras
RAS/CEC: Use the right length for "cec_disable"
2017-10-05 14:23:06 +02:00
regulator
- New Drivers
2017-09-07 13:51:13 -07:00
remoteproc
remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
2017-10-11 10:47:47 -07:00
reset
reset: socfpga: fix for 64-bit compilation
2017-10-04 10:29:44 +02:00
rpmsg
rpmsg: glink: Fix memory leak in qcom_glink_alloc_intent()
2017-10-10 11:22:09 -07:00
rtc
RTC for 4.14
2017-09-13 10:56:00 -07:00
s390
s390/qeth: don't dump control cmd twice
2017-10-20 13:11:05 +01:00
sbus
…
scsi
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-22 13:39:14 +01:00
sfi
…
sh
…
sn
…
soc
Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2017-09-15 20:43:33 -07:00
spi
ACPI updates for v4.14-rc1
2017-09-05 12:45:03 -07:00
spmi
spmi: pmic-arb: Move the ownership check to irq_chip callback
2017-08-28 13:52:22 +02:00
ssb
…
staging
media fixes for v4.14-rc6
2017-10-17 06:23:09 -04:00
target
Merge branch 'work.set_fs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-09-14 18:13:32 -07:00
tc
…
tee
…
thermal
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'const-thermal-zone-structure' into next
2017-09-08 11:20:04 +08:00
thunderbolt
thunderbolt: Fix a couple right shifting to zero bugs
2017-10-19 13:04:32 +01:00
tty
tty: fall back to N_NULL if switching to N_TTY fails during hangup
2017-10-13 16:18:33 -07:00
uio
…
usb
USB: fixes for v4.14-rc5
2017-10-12 11:17:34 +02:00
uwb
uwb: properly check kthread_run return value
2017-09-18 11:28:23 +02:00
vfio
vfio: platform: constify amba_id
2017-08-30 14:03:42 -06:00
vhost
vhost_net: do not stall on zerocopy depletion
2017-10-09 20:46:39 -07:00
video
fbdev changes for v4.14:
2017-09-14 13:33:33 -07:00
virt
virt: Convert to using %pOF instead of full_name
2017-08-29 08:52:51 -05:00
virtio
SCSI misc on 20170907
2017-09-07 21:11:05 -07:00
vlynq
…
vme
…
w1
power supply and reset changes for the v4.14 series
2017-09-09 14:44:39 -07:00
watchdog
Merge branch '4.14-features' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2017-09-15 20:43:33 -07:00
xen
xen: fixes for 4.14-rc3
2017-09-29 12:24:28 -07:00
zorro
…
Kconfig
…
Makefile
x86/lguest: Remove lguest support
2017-08-24 09:57:28 +02:00