AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 23:05:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
0fa74a4be4
linux_dsm_epyc7002/drivers/net/wireless/iwlwifi
History
David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-03-20 18:51:09 -04:00
..
dvm iwlwifi: mvm: new Alive / error table API 2015-03-01 16:55:12 +02:00
mvm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-20 18:51:09 -04:00
pcie iwlwifi: pcie: apply destination before releasing reset 2015-03-01 16:55:08 +02:00
iwl-1000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-02-25 10:39:19 +02:00
iwl-2000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-02-25 10:39:19 +02:00
iwl-5000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-02-25 10:39:19 +02:00
iwl-6000.c iwlwifi: fix max_ht_ampdu_exponent for older devices 2015-02-25 10:39:19 +02:00
iwl-7000.c iwlwifi: deprecate -9.ucode for 3160 / 7260 / 7265 2015-03-01 16:55:09 +02:00
iwl-8000.c iwlwifi: deprecate -9.ucode for 3160 / 7260 / 7265 2015-03-01 16:55:09 +02:00
iwl-agn-hw.h iwlwifi: mvm: fix bug with OTP memory size 2014-05-06 20:40:01 +03:00
iwl-config.h iwlwifi: allow to define the stuck queue timer per queue 2015-02-01 15:57:23 +02:00
iwl-csr.h iwlwifi: mvm: support family 8000 C step 2015-01-22 17:55:20 +02:00
iwl-debug.c iwlwifi: use dev_printk instead of dev_dbg for debug logs 2014-05-13 13:52:22 +03:00
iwl-debug.h iwlwifi: mvm: declare TDLS support 2014-11-24 08:30:19 +02:00
iwl-devtrace.c iwlwifi: don't export tracepoints unnecessarily 2014-09-03 22:49:03 +03:00
iwl-devtrace.h iwlwifi: mvm: new Alive / error table API 2015-03-01 16:55:12 +02:00
iwl-drv.c iwlwifi: mvm: add framework for triggers for fw dump 2015-03-02 08:20:28 +02:00
iwl-drv.h iwlwifi: remove MODULE_VERSION 2014-12-28 10:17:40 +02:00
iwl-eeprom-parse.c iwlwifi: change max HT and VHT A-MPDU exponent 2014-11-23 19:57:30 +02:00
iwl-eeprom-parse.h iwlwifi: mvm: new NVM format in family 8000 2014-02-13 13:49:37 +02:00
iwl-eeprom-read.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-eeprom-read.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-fh.h iwlwifi: pcie: limit fw chunk sizes given to fh 2014-12-14 10:20:30 +02:00
iwl-fw-error-dump.h iwlwifi: mvm: add trigger for firmware dump upon low RSSI 2015-03-02 08:20:32 +02:00
iwl-fw-file.h iwlwifi: mvm: add trigger for firmware dump upon low RSSI 2015-03-02 08:20:32 +02:00
iwl-fw.h iwlwifi: mvm: add framework for triggers for fw dump 2015-03-02 08:20:28 +02:00
iwl-io.c iwlwifi: correctly set the NMI register 2015-01-22 17:54:05 +02:00
iwl-io.h iwlwifi: update nmi register 2014-05-15 19:50:51 +03:00
iwl-modparams.h iwlwifi: mvm: enable watchdog on Tx queues for mvm 2015-02-01 15:57:22 +02:00
iwl-notif-wait.c iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-notif-wait.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-nvm-parse.c iwlwifi: mvm: support LnP 1x1 antenna configuration 2014-12-28 20:00:12 +02:00
iwl-nvm-parse.h iwlwifi: mvm: new NVM format in family 8000 2014-02-13 13:49:37 +02:00
iwl-op-mode.h iwlwifi: mvm/trans: abort d0i3_enter in case of held ref 2014-11-11 17:15:04 +02:00
iwl-phy-db.c iwlwifi: mvm: increase the number of PAPD channel groups to 9 2015-03-01 16:55:05 +02:00
iwl-phy-db.h iwlwifi: Update Copyright to 2014 2013-12-31 19:03:53 +02:00
iwl-prph.h iwlwifi: mvm: restart firmware recording when no configuration is set 2015-03-02 08:20:31 +02:00
iwl-scd.h iwlwifi: pcie: prepare the enablement of 31 TFD queues 2015-02-01 15:57:20 +02:00
iwl-trans.h iwlwifi: mvm: add framework for triggers for fw dump 2015-03-02 08:20:28 +02:00
Kconfig iwlwfifi: fix WANT_DEV_COREDUMP selection in Kconfig 2014-10-31 13:10:32 +02:00
Makefile iwlwifi: Add 8000 HW family support 2014-02-03 22:23:31 +02:00