AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 03:25:28 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
32b23550ad
linux_dsm_epyc7002/drivers/net/wireless/rtlwifi
History
David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Four minor merge conflicts:

1) qca_spi.c renamed the local variable used for the SPI device
   from spi_device to spi, meanwhile the spi_set_drvdata() call
   got moved further up in the probe function.

2) Two changes were both adding new members to codel params
   structure, and thus we had overlapping changes to the
   initializer function.

3) 'net' was making a fix to sk_release_kernel() which is
   completely removed in 'net-next'.

4) In net_namespace.c, the rtnl_net_fill() call for GET operations
   had the command value fixed, meanwhile 'net-next' adjusted the
   argument signature a bit.

This also matches example merge resolutions posted by Stephen
Rothwell over the past two days.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 14:31:43 -04:00
..
btcoexist rtlwifi: btcoexist: Fix Smatch warning 2014-09-26 17:22:27 -04:00
rtl8188ee rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192c rtlwifi: rtl8192c-common: Convert driver to use common DM table initialization 2015-01-09 15:48:12 +02:00
rtl8192ce rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +02:00
rtl8192cu rtlwifi: rtl8192cu: Add new device ID 2015-03-30 11:38:25 +03:00
rtl8192de rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192ee rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192se rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8723ae rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8723be Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
rtl8723com rtlwifi: rtl8723be: Update driver to match Realtek release of 06/28/14 2014-09-30 13:17:15 -04:00
rtl8821ae Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
base.c rtlwifi: Add encryption argument in rtl_is_special_data for checking DHCP packet. 2015-04-07 20:09:04 +03:00
base.h rtlwifi: Add encryption argument in rtl_is_special_data for checking DHCP packet. 2015-04-07 20:09:04 +03:00
cam.c rtlwifi: Modify cam.{c,h} and efuse.{c,h} for new drivers 2014-09-26 17:22:28 -04:00
cam.h rtlwifi: Remove unused defines from cam.h 2015-03-03 15:30:05 +02:00
core.c wireless: Use eth_<foo>_addr instead of memset 2015-03-03 17:01:36 -05:00
core.h mac80211: remove support for IFF_PROMISC 2015-04-24 11:14:13 +02:00
debug.c rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
debug.h rtlwifi: rtl8821ae: Move driver from staging to regular tree 2014-09-26 17:22:28 -04:00
efuse.c rtlwifi: rtl8188ee: rtl8723ae: rtl8821ae: Initialize some variables 2014-09-30 13:17:38 -04:00
efuse.h rtlwifi: Remove unused defines from efuse.h 2015-03-03 15:30:08 +02:00
Kconfig rtlwifi: Fix Kconfig for RTL8192EE 2014-10-02 14:26:32 -04:00
Makefile rtlwifi: rtl8192ee: Move driver from staging to the regular tree 2014-09-30 13:17:14 -04:00
pci.c rtlwifi: Add encryption argument in rtl_is_special_data for checking DHCP packet. 2015-04-07 20:09:04 +03:00
pci.h rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO 2015-02-06 08:36:08 +02:00
ps.c rtlwifi: Update power-save routines for 062814 driver 2014-09-26 17:22:28 -04:00
ps.h rtlwifi: Update power-save routines for 062814 driver 2014-09-26 17:22:28 -04:00
pwrseqcmd.h rtlwifi: rtl8821ae: Move driver from staging to regular tree 2014-09-26 17:22:28 -04:00
rc.c rtlwifi: Add encryption argument in rtl_is_special_data for checking DHCP packet. 2015-04-07 20:09:04 +03:00
rc.h rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
regd.c rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
regd.h rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
stats.c rtlwifi: No need to export rtl_evm_dbm_jaguar anymore 2015-03-16 17:55:41 +02:00
stats.h rtlwifi: No need to export rtl_evm_dbm_jaguar anymore 2015-03-16 17:55:41 +02:00
usb.c rtlwifi: rtl8192cu: Fix kernel deadlock 2015-04-28 13:55:28 +03:00
usb.h rtlwifi: usb: defer rx processing to tasklet 2013-03-25 16:42:22 -04:00
wifi.h rtlwifi: rtl8192ee: Fix handling of new style descriptors 2015-02-06 08:36:00 +02:00