  * Fixed :djadmin:`loaddata` error when fixture file name contained any dots
    non related to file extensions (#21457).
  * Fixed display of inline instances in formsets when parent has 0 for primary
    key (#21472).
 
</s> remove         queryset = self.get_field_queryset(db, db_field, request)
        if queryset is not None:
            kwargs['queryset'] = queryset
 </s> add         if not 'queryset' in kwargs:
            queryset = self.get_field_queryset(db, db_field, request)
            if queryset is not None:
                kwargs['queryset'] = queryset </s> remove         queryset = self.get_field_queryset(db, db_field, request)
        if queryset is not None:
            kwargs['queryset'] = queryset
 </s> add         if not 'queryset' in kwargs:
            queryset = self.get_field_queryset(db, db_field, request)
            if queryset is not None:
                kwargs['queryset'] = queryset
* Fixed a regression where custom querysets for foreign keys were overwritten
  if ``ModelAdmin`` had ordering set (#21405).
  * Fixed :djadmin:`loaddata` error when fixture file name contained any dots
    non related to file extensions (#21457).
  * Fixed display of inline instances in formsets when parent has 0 for primary
    key (#21472).
* Fixed a regression where custom querysets for foreign keys were overwritten
  if ``ModelAdmin`` had ordering set (#21405).
keep keep keep add
 Fixed #21405 -- Prevented queryset overwrite in BaseModelAdmin

Thanks guido@20tab.com for the report and Tim Graham for the
analyze. 
docs/releases/1.6.1.txt