Date: Sat, 17 Sep 2016 16:13:49 -0500 From: Larry Rosenman <ler@lerctr.org> To: Andriy Voskoboinyk <avos@freebsd.org> Cc: Freebsd wireless <freebsd-wireless@freebsd.org>, ivadasz@freebsd.org, Adrian Chadd <adrian@freebsd.org> Subject: Re: (IWM) 7260 AC Dual Band - Still No Connect Message-ID: <068abc6a7c5ec56a6bdc06655510bdb7@thebighonker.lerctr.org> In-Reply-To: <op.ynx5n6th4dikkl@localhost> References: <20160917024238.GA79497@pita.lerctr.org> <b11fd9bbe84bbf3fc161f5c9e1018216@thebighonker.lerctr.org> <op.ynxeueok4dikkl@localhost> <20160917145943.GA6303@pita.lerctr.org> <op.ynxwvdmiiew4ia@localhost> <20160917152147.GA56866@thebighonker.lerctr.org> <op.ynxxbewh4dikkl@localhost> <20160917153808.GA1425@pita.lerctr.org> <op.ynxx93uw4dikkl@localhost> <20160917163757.GA1426@pita.lerctr.org> <op.ynx0o7ew4dikkl@localhost> <66a0de815de953b5fa99424dfd624f4f@thebighonker.lerctr.org> <op.ynx1bjiciew4ia@localhost> <091e5dc8b68ef08086eadb4c8815aeda@thebighonker.lerctr.org> <e288e4c5f7f0503b11250f3c106b5c9e@thebighonker.lerctr.org> <802576473e12f090260587f62fba0d32@thebighonker.lerctr.org> <op.ynx5n6th4dikkl@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2016-09-17 13:29, Andriy Voskoboinyk wrote: > Sat, 17 Sep 2016 20:12:59 +0300 було написано Larry Rosenman > <ler@lerctr.org>: > > Ok, last try: > try to apply 'Comment out SF_CFG_CMD + revert changes for MAC_CONTEXT' > patch > from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=211885 ; > in case, if it will not help, try to revert all local changes > ( svn revert sys/dev/iwm/* ) + intel 8000 update > ( svn merge -c -304891,-304880,-303557,-303418,-303416,-303413,-303327 > . ) > when I do this on a fresh checkout from head: Checked out revision 305904. # svn revert sys/dev/iwm/* svn: E155007: '/usr/home/ler/sys/dev/iwm/*' is not a working copy # cd /usr/src # svn revert sys/dev/iwm/* # svn merge -c -304891,-304880,-303557,-303418,-303416,-303413,-303327 . --- Reverse-merging r304891 into '.': U sys/dev/iwm/if_iwmreg.h --- Recording mergeinfo for reverse merge of r304891 into '.': U . --- Reverse-merging r304880 into '.': U sys/dev/iwm/if_iwm.c --- Recording mergeinfo for reverse merge of r304880 into '.': U . --- Reverse-merging r303557 into '.': G sys/dev/iwm/if_iwm.c --- Recording mergeinfo for reverse merge of r303557 into '.': U . --- Reverse-merging r303418 into '.': G sys/dev/iwm/if_iwm.c --- Recording mergeinfo for reverse merge of r303418 into '.': U . --- Reverse-merging r303416 into '.': G sys/dev/iwm/if_iwm.c G sys/dev/iwm/if_iwmreg.h --- Recording mergeinfo for reverse merge of r303416 into '.': U . --- Reverse-merging r303413 into '.': G sys/dev/iwm/if_iwm.c --- Recording mergeinfo for reverse merge of r303413 into '.': U . --- Reverse-merging r303327 into '.': G sys/dev/iwm/if_iwm.c U sys/dev/iwm/if_iwmvar.h U sys/dev/iwm/if_iwm_util.c U sys/dev/iwm/if_iwm_phy_db.c U sys/dev/iwm/if_iwm_mac_ctxt.c C sys/dev/iwm/if_iwm_scan.c U sys/dev/iwm/if_iwm_pcie_trans.c U sys/dev/iwm/if_iwm_power.c C sys/dev/iwm/if_iwmreg.h U sys/dev/iwm/if_iwm_led.c U sys/dev/iwm/if_iwm_led.h U sys/dev/iwm/if_iwm_phy_ctxt.c U sys/dev/iwm/if_iwm_time_event.c U sys/dev/iwm/if_iwm_scan.h U sys/dev/iwm/if_iwm_util.h --- Recording mergeinfo for reverse merge of r303327 into '.': U . Summary of conflicts: Text conflicts: 2 Conflict discovered in file 'sys/dev/iwm/if_iwm_scan.c'. Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: p Conflict discovered in file 'sys/dev/iwm/if_iwmreg.h'. Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: p Summary of conflicts: Text conflicts: 2 # -- Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 17716 Limpia Crk, Round Rock, TX 78664-7281
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?068abc6a7c5ec56a6bdc06655510bdb7>